Skip to content

Commit e8ce998

Browse files
authored
Rehome remaining ecr public images (#747)
1 parent 5a8bba5 commit e8ce998

File tree

7 files changed

+40
-24
lines changed

7 files changed

+40
-24
lines changed

test/e2e/fishapp/dynamic_stack.go

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,22 @@ const (
4242
connectivityCheckUniformDistributionSL = 0.001 // Significance level that traffic to targets are uniform distributed.
4343
AppContainerPort = 9080
4444
HttpProxyContainerPort = 8899
45-
defaultAppImage = "public.ecr.aws/e6v3k1j4/colorteller:v1"
46-
defaultHTTPProxyImage = "abhinavsingh/proxy.py:latest"
47-
caCertScript = "certs/ca_certs.sh"
48-
nodeCertScript = "certs/node_certs.sh"
49-
genericNodeCertCfgFile = "certs/node_cert.cfg"
50-
certsBasePath = "certs/"
51-
certsCfgFileSuffix = "_cert.cfg"
52-
certChainSuffix = "_cert_chain.pem"
53-
certKeySuffix = "_key.pem"
54-
caCertFile = "ca_cert.pem"
55-
envoyCACertPath = "/certs/ca_cert.pem"
56-
certCleanupScript = "certs/cleanup.sh"
57-
sdsDeployScript = "certs/sds_provider.sh"
58-
registerAgentIdentity = "certs/register_agent_entry.sh"
59-
registerWorkloadIdentity = "certs/register_workload_entry.sh"
45+
// From https://github.com/aws/aws-app-mesh-examples/tree/main/examples/apps/colorapp/src/colorteller
46+
defaultAppImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:colorteller"
47+
defaultHTTPProxyImage = "abhinavsingh/proxy.py:latest"
48+
caCertScript = "certs/ca_certs.sh"
49+
nodeCertScript = "certs/node_certs.sh"
50+
genericNodeCertCfgFile = "certs/node_cert.cfg"
51+
certsBasePath = "certs/"
52+
certsCfgFileSuffix = "_cert.cfg"
53+
certChainSuffix = "_cert_chain.pem"
54+
certKeySuffix = "_key.pem"
55+
caCertFile = "ca_cert.pem"
56+
envoyCACertPath = "/certs/ca_cert.pem"
57+
certCleanupScript = "certs/cleanup.sh"
58+
sdsDeployScript = "certs/sds_provider.sh"
59+
registerAgentIdentity = "certs/register_agent_entry.sh"
60+
registerWorkloadIdentity = "certs/register_workload_entry.sh"
6061
)
6162

6263
var (

test/e2e/fishapp/load/dynamic_stack_load_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ const (
4545
connectivityCheckUniformDistributionSL = 0.001 // Significance level that traffic to targets are uniform distributed.
4646
AppContainerPort = 9080
4747
HttpProxyContainerPort = 8899
48-
//defaultAppImage = "public.ecr.aws/e6v3k1j4/colorteller:v1"
48+
// From https://github.com/aws/aws-app-mesh-examples/tree/main/examples/apps/colorapp/src/colorteller
49+
//defaultAppImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:colorteller"
4950
defaultAppImage = "python:3.9"
5051
defaultHTTPProxyImage = "abhinavsingh/proxy.py:latest"
5152
caCertScript = "certs/ca_certs.sh"

test/integration/sidecar-v1.22/sidecar_stack.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
)
1919

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

test/integration/sidecar/sidecar_stack.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@ import (
2323
)
2424

2525
const (
26+
// From https://github.com/aws/aws-app-mesh-controller-for-k8s/tree/master/test/integration/test_app/sidecar-frontend
2627
defaultFrontendImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:color-fe-app"
27-
defaultBackendImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:color-be-app"
28+
29+
// From https://github.com/aws/aws-app-mesh-controller-for-k8s/tree/master/test/integration/test_app/sidecar-backend
30+
defaultBackendImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:color-be-app"
2831
)
2932

3033
type SidecarStack struct {

test/integration/timeout/timeout_stack.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@ import (
2828
const (
2929
//If you're not able to access below images, try to build them based on the app code under "timeout_app"
3030
//directory and push it to any accessible ECR repo and update the below values
31-
defaultFrontEndImage = "public.ecr.aws/e6v3k1j4/appmesh-test-feapp:v1"
32-
defaultBackEndImage = "public.ecr.aws/e6v3k1j4/appmesh-test-beapp:v1"
31+
32+
// From https://github.com/aws/aws-app-mesh-controller-for-k8s/tree/master/test/integration/test_app/frontend
33+
defaultFrontEndImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:testapp-frontend"
34+
35+
// From https://github.com/aws/aws-app-mesh-controller-for-k8s/tree/master/test/integration/test_app/backend
36+
defaultBackEndImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:testapp-backend"
3337

3438
timeoutTest = "timeout-e2e"
3539
AppContainerPort = 8080

test/integration/tls/tls_stack.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,12 @@ import (
3131
const (
3232
//If you're not able to access below images, try to build them based on the app code under "timeout_app"
3333
//directory and push it to any accessible ECR repo and update the below values
34-
defaultFrontEndImage = "public.ecr.aws/e6v3k1j4/appmesh-test-feapp:v1"
35-
defaultBackEndImage = "public.ecr.aws/e6v3k1j4/appmesh-test-beapp:v1"
34+
35+
// From https://github.com/aws/aws-app-mesh-controller-for-k8s/tree/master/test/integration/test_app/frontend
36+
defaultFrontEndImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:testapp-frontend"
37+
38+
// From https://github.com/aws/aws-app-mesh-controller-for-k8s/tree/master/test/integration/test_app/backend
39+
defaultBackEndImage = "public.ecr.aws/e4i4k4a4/appmesh-k8s-test:testapp-backend"
3640

3741
tlsTest = "tls-e2e"
3842
AppContainerPort = 8080

test/integration/virtualnode/virtualnode_test.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ package virtualnode_test
33
import (
44
"context"
55
"fmt"
6+
"sync"
7+
"time"
8+
69
appmeshk8s "github.com/aws/aws-app-mesh-controller-for-k8s/pkg/k8s"
710
"github.com/aws/aws-app-mesh-controller-for-k8s/test/framework/k8s"
811
"github.com/aws/aws-sdk-go/aws"
@@ -15,8 +18,6 @@ import (
1518
apierrs "k8s.io/apimachinery/pkg/api/errors"
1619
"k8s.io/apimachinery/pkg/types"
1720
"k8s.io/client-go/kubernetes"
18-
"sync"
19-
"time"
2021

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

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

0 commit comments

Comments
 (0)