Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rehome remaining ecr public images #747

Merged
merged 2 commits into from
Nov 22, 2023
Merged

Rehome remaining ecr public images #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7adae8f
Rehome remaining ecr public images
Nov 22, 2023
c7b995b
Merge branch 'master' into ben-rehome
bendu Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions test/e2e/fishapp/dynamic_stack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,22 @@ const (
connectivityCheckUniformDistributionSL = 0.001 // Significance level that traffic to targets are uniform distributed.
AppContainerPort = 9080
HttpProxyContainerPort = 8899
defaultAppImage = "public.ecr.aws/e6v3k1j4/colorteller:v1"
defaultHTTPProxyImage = "abhinavsingh/proxy.py:latest"
caCertScript = "certs/ca_certs.sh"
nodeCertScript = "certs/node_certs.sh"
genericNodeCertCfgFile = "certs/node_cert.cfg"
certsBasePath = "certs/"
certsCfgFileSuffix = "_cert.cfg"
certChainSuffix = "_cert_chain.pem"
certKeySuffix = "_key.pem"
caCertFile = "ca_cert.pem"
envoyCACertPath = "/certs/ca_cert.pem"
certCleanupScript = "certs/cleanup.sh"
sdsDeployScript = "certs/sds_provider.sh"
registerAgentIdentity = "certs/register_agent_entry.sh"
registerWorkloadIdentity = "certs/register_workload_entry.sh"
// From https://github.com/aws/aws-app-mesh-examples/tree/main/examples/apps/colorapp/src/colorteller
defaultAppImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:colorteller"
defaultHTTPProxyImage = "abhinavsingh/proxy.py:latest"
caCertScript = "certs/ca_certs.sh"
nodeCertScript = "certs/node_certs.sh"
genericNodeCertCfgFile = "certs/node_cert.cfg"
certsBasePath = "certs/"
certsCfgFileSuffix = "_cert.cfg"
certChainSuffix = "_cert_chain.pem"
certKeySuffix = "_key.pem"
caCertFile = "ca_cert.pem"
envoyCACertPath = "/certs/ca_cert.pem"
certCleanupScript = "certs/cleanup.sh"
sdsDeployScript = "certs/sds_provider.sh"
registerAgentIdentity = "certs/register_agent_entry.sh"
registerWorkloadIdentity = "certs/register_workload_entry.sh"
)

var (
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/fishapp/load/dynamic_stack_load_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ const (
connectivityCheckUniformDistributionSL = 0.001 // Significance level that traffic to targets are uniform distributed.
AppContainerPort = 9080
HttpProxyContainerPort = 8899
//defaultAppImage = "public.ecr.aws/e6v3k1j4/colorteller:v1"
// From https://github.com/aws/aws-app-mesh-examples/tree/main/examples/apps/colorapp/src/colorteller
//defaultAppImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:colorteller"
defaultAppImage = "python:3.9"
defaultHTTPProxyImage = "abhinavsingh/proxy.py:latest"
caCertScript = "certs/ca_certs.sh"
Expand Down
1 change: 1 addition & 0 deletions test/integration/sidecar-v1.22/sidecar_stack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
)

const (
// From https://github.com/aws/aws-app-mesh-controller-for-k8s/tree/master/test/integration/test_app/sidecar-backend
defaultImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:color-be-app"
)

Expand Down
5 changes: 4 additions & 1 deletion test/integration/sidecar/sidecar_stack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ import (
)

const (
// From https://github.com/aws/aws-app-mesh-controller-for-k8s/tree/master/test/integration/test_app/sidecar-frontend
defaultFrontendImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:color-fe-app"
defaultBackendImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:color-be-app"

// From https://github.com/aws/aws-app-mesh-controller-for-k8s/tree/master/test/integration/test_app/sidecar-backend
defaultBackendImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:color-be-app"
)

type SidecarStack struct {
Expand Down
8 changes: 6 additions & 2 deletions test/integration/timeout/timeout_stack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,12 @@ import (
const (
//If you're not able to access below images, try to build them based on the app code under "timeout_app"
//directory and push it to any accessible ECR repo and update the below values
defaultFrontEndImage = "public.ecr.aws/e6v3k1j4/appmesh-test-feapp:v1"
defaultBackEndImage = "public.ecr.aws/e6v3k1j4/appmesh-test-beapp:v1"

// From https://github.com/aws/aws-app-mesh-controller-for-k8s/tree/master/test/integration/test_app/frontend
defaultFrontEndImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:testapp-frontend"

// From https://github.com/aws/aws-app-mesh-controller-for-k8s/tree/master/test/integration/test_app/backend
defaultBackEndImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:testapp-backend"

timeoutTest = "timeout-e2e"
AppContainerPort = 8080
Expand Down
8 changes: 6 additions & 2 deletions test/integration/tls/tls_stack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,12 @@ import (
const (
//If you're not able to access below images, try to build them based on the app code under "timeout_app"
//directory and push it to any accessible ECR repo and update the below values
defaultFrontEndImage = "public.ecr.aws/e6v3k1j4/appmesh-test-feapp:v1"
defaultBackEndImage = "public.ecr.aws/e6v3k1j4/appmesh-test-beapp:v1"

// From https://github.com/aws/aws-app-mesh-controller-for-k8s/tree/master/test/integration/test_app/frontend
defaultFrontEndImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:testapp-frontend"

// From https://github.com/aws/aws-app-mesh-controller-for-k8s/tree/master/test/integration/test_app/backend
defaultBackEndImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:testapp-backend"

tlsTest = "tls-e2e"
AppContainerPort = 8080
Expand Down
8 changes: 5 additions & 3 deletions test/integration/virtualnode/virtualnode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ package virtualnode_test
import (
"context"
"fmt"
"sync"
"time"

appmeshk8s "github.com/aws/aws-app-mesh-controller-for-k8s/pkg/k8s"
"github.com/aws/aws-app-mesh-controller-for-k8s/test/framework/k8s"
"github.com/aws/aws-sdk-go/aws"
Expand All @@ -15,8 +18,6 @@ import (
apierrs "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes"
"sync"
"time"

appmesh "github.com/aws/aws-app-mesh-controller-for-k8s/apis/appmesh/v1beta2"
"github.com/aws/aws-app-mesh-controller-for-k8s/pkg/algorithm"
Expand All @@ -31,7 +32,8 @@ import (
)

const (
defaultAppImage = "public.ecr.aws/e6v3k1j4/colorteller:v1"
// From https://github.com/aws/aws-app-mesh-examples/tree/main/examples/apps/colorapp/src/colorteller
defaultAppImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:colorteller"
AppContainerPort = 8080
)

Expand Down
Loading