Skip to content

Commit 363f5d7

Browse files
BennettJamesBennett Sala
BennettJames
and
Bennett Sala
authored
Increment init proxy to v7 (#685)
Co-authored-by: Bennett Sala <[email protected]>
1 parent b58dc2a commit 363f5d7

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

‎config/helm/appmesh-controller/test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ sidecar:
4848
init:
4949
image:
5050
repository: 840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager
51-
tag: v6-prod
51+
tag: v7-prod
5252

5353
xray:
5454
image:

‎config/helm/appmesh-controller/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ sidecar:
4949
init:
5050
image:
5151
repository: 840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager
52-
tag: v6-prod
52+
tag: v7-prod
5353

5454
xray:
5555
image:

‎pkg/inject/init_proxy_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func Test_initProxyMutator_mutate(t *testing.T) {
3232
name: "normal case",
3333
fields: fields{
3434
mutatorConfig: initProxyMutatorConfig{
35-
containerImage: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v6-prod",
35+
containerImage: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v7-prod",
3636
cpuRequests: cpuRequests.String(),
3737
memoryRequests: memoryRequests.String(),
3838
cpuLimits: cpuLimits.String(),
@@ -59,7 +59,7 @@ func Test_initProxyMutator_mutate(t *testing.T) {
5959
InitContainers: []corev1.Container{
6060
{
6161
Name: "proxyinit",
62-
Image: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v6-prod",
62+
Image: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v7-prod",
6363
SecurityContext: &corev1.SecurityContext{
6464
Capabilities: &corev1.Capabilities{
6565
Add: []corev1.Capability{
@@ -120,7 +120,7 @@ func Test_initProxyMutator_mutate(t *testing.T) {
120120
name: "normal case without resource limits",
121121
fields: fields{
122122
mutatorConfig: initProxyMutatorConfig{
123-
containerImage: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v6-prod",
123+
containerImage: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v7-prod",
124124
cpuRequests: cpuRequests.String(),
125125
memoryRequests: memoryRequests.String(),
126126
},
@@ -145,7 +145,7 @@ func Test_initProxyMutator_mutate(t *testing.T) {
145145
InitContainers: []corev1.Container{
146146
{
147147
Name: "proxyinit",
148-
Image: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v6-prod",
148+
Image: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v7-prod",
149149
SecurityContext: &corev1.SecurityContext{
150150
Capabilities: &corev1.Capabilities{
151151
Add: []corev1.Capability{
@@ -202,7 +202,7 @@ func Test_initProxyMutator_mutate(t *testing.T) {
202202
name: "normal case + exists other init container",
203203
fields: fields{
204204
mutatorConfig: initProxyMutatorConfig{
205-
containerImage: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v6-prod",
205+
containerImage: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v7-prod",
206206
cpuRequests: cpuRequests.String(),
207207
memoryRequests: memoryRequests.String(),
208208
},
@@ -236,7 +236,7 @@ func Test_initProxyMutator_mutate(t *testing.T) {
236236
},
237237
{
238238
Name: "proxyinit",
239-
Image: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v6-prod",
239+
Image: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v7-prod",
240240
SecurityContext: &corev1.SecurityContext{
241241
Capabilities: &corev1.Capabilities{
242242
Add: []corev1.Capability{
@@ -293,7 +293,7 @@ func Test_initProxyMutator_mutate(t *testing.T) {
293293
name: "no-op when already contains proxyInit container",
294294
fields: fields{
295295
mutatorConfig: initProxyMutatorConfig{
296-
containerImage: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v6-prod",
296+
containerImage: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v7-prod",
297297
cpuRequests: cpuRequests.String(),
298298
memoryRequests: memoryRequests.String(),
299299
},

‎pkg/inject/inject_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func getConfig(fp func(Config) Config) Config {
2525
Preview: false,
2626
SidecarImageRepository: "public.ecr.aws/appmesh/aws-appmesh-envoy",
2727
SidecarImageTag: "v1.25.1.0-prod",
28-
InitImage: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v6-prod",
28+
InitImage: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v7-prod",
2929
SidecarMemoryRequests: "32Mi",
3030
SidecarCpuRequests: "10m",
3131
EnableIAMForServiceAccounts: true,

‎pkg/inject/proxy_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func Test_proxyMutator_mutate(t *testing.T) {
3737
}
3838
mutatorConfig := proxyMutatorConfig{
3939
initProxyMutatorConfig: initProxyMutatorConfig{
40-
containerImage: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v6-prod",
40+
containerImage: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v7-prod",
4141
cpuRequests: cpuRequests.String(),
4242
memoryRequests: memoryRequests.String(),
4343
},
@@ -71,7 +71,7 @@ func Test_proxyMutator_mutate(t *testing.T) {
7171
InitContainers: []corev1.Container{
7272
{
7373
Name: "proxyinit",
74-
Image: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v6-prod",
74+
Image: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v7-prod",
7575
SecurityContext: &corev1.SecurityContext{
7676
Capabilities: &corev1.Capabilities{
7777
Add: []corev1.Capability{
@@ -138,7 +138,7 @@ func Test_proxyMutator_mutate(t *testing.T) {
138138
InitContainers: []corev1.Container{
139139
{
140140
Name: "proxyinit",
141-
Image: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v6-prod",
141+
Image: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v7-prod",
142142
SecurityContext: &corev1.SecurityContext{
143143
Capabilities: &corev1.Capabilities{
144144
Add: []corev1.Capability{
@@ -216,7 +216,7 @@ func Test_proxyMutator_mutate(t *testing.T) {
216216
InitContainers: []corev1.Container{
217217
{
218218
Name: "proxyinit",
219-
Image: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v6-prod",
219+
Image: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v7-prod",
220220
SecurityContext: &corev1.SecurityContext{
221221
Capabilities: &corev1.Capabilities{
222222
Add: []corev1.Capability{

‎scripts/test-with-kind.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ ENVOY_LATEST_TAG="v1.25.1.0-prod"
8787
ENVOY_1_22_TAG="v1.22.2.0-prod"
8888

8989
PROXY_ROUTE_IMAGE="$IMAGE_HOST/aws-appmesh-proxy-route-manager"
90-
PROXY_ROUTE_TAG="v6-prod"
90+
PROXY_ROUTE_TAG="v7-prod"
9191

9292
function install_crds {
9393
echo "installing CRDs ... "

0 commit comments

Comments
 (0)