Rehome remaining ecr public images (#747)

aws · Nov 22, 2023 · e8ce998 · e8ce998
1 parent 5a8bba5
commit e8ce998
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 24 deletions.
diff --git a/test/e2e/fishapp/dynamic_stack.go b/test/e2e/fishapp/dynamic_stack.go
@@ -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 (

diff --git a/test/e2e/fishapp/load/dynamic_stack_load_test.go b/test/e2e/fishapp/load/dynamic_stack_load_test.go
@@ -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"

diff --git a/test/integration/sidecar-v1.22/sidecar_stack.go b/test/integration/sidecar-v1.22/sidecar_stack.go
@@ -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"
 )
 

diff --git a/test/integration/sidecar/sidecar_stack.go b/test/integration/sidecar/sidecar_stack.go
@@ -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 {

diff --git a/test/integration/timeout/timeout_stack.go b/test/integration/timeout/timeout_stack.go
@@ -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

diff --git a/test/integration/tls/tls_stack.go b/test/integration/tls/tls_stack.go
@@ -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

diff --git a/test/integration/virtualnode/virtualnode_test.go b/test/integration/virtualnode/virtualnode_test.go
@@ -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"
@@ -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"
@@ -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
 )