From 03d60d6a1edbc6192b721381728d28cc305d9afe Mon Sep 17 00:00:00 2001 From: Fei Liu Date: Thu, 11 Jul 2024 14:23:39 +0000 Subject: [PATCH] Bump envoy image version to v1.29.6.0-prod --- Makefile | 2 +- config/helm/appmesh-controller/test.yaml | 2 +- config/helm/appmesh-controller/values.yaml | 2 +- pkg/inject/config.go | 2 +- pkg/inject/inject_test.go | 2 +- scripts/test-with-kind.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 7d832105..50fdd808 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ IMAGE ?= $(REPO):$(VERSION) PREVIEW=false ENABLE_BACKEND_GROUPS?=false WAIT_PROXY_READY=false -SIDECAR_IMAGE_TAG=v1.29.5.0-prod +SIDECAR_IMAGE_TAG=v1.29.6.0-prod # Produce CRDs that work back to Kubernetes 1.11 (no version conversion) CRD_OPTIONS ?= "crd:trivialVersions=true,crdVersions=v1" diff --git a/config/helm/appmesh-controller/test.yaml b/config/helm/appmesh-controller/test.yaml index cefcc227..7a41d5fc 100644 --- a/config/helm/appmesh-controller/test.yaml +++ b/config/helm/appmesh-controller/test.yaml @@ -18,7 +18,7 @@ image: sidecar: image: repository: 840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-envoy - tag: v1.29.5.0-prod + tag: v1.29.6.0-prod # sidecar.logLevel: Envoy log level can be info, warn, error or debug logLevel: info envoyAdminAccessPort: 9901 diff --git a/config/helm/appmesh-controller/values.yaml b/config/helm/appmesh-controller/values.yaml index 32c7bf90..14627d42 100644 --- a/config/helm/appmesh-controller/values.yaml +++ b/config/helm/appmesh-controller/values.yaml @@ -19,7 +19,7 @@ image: sidecar: image: repository: 840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-envoy - tag: v1.29.5.0-prod + tag: v1.29.6.0-prod # sidecar.logLevel: Envoy log level can be info, warn, error or debug logLevel: info envoyAdminAccessPort: 9901 diff --git a/pkg/inject/config.go b/pkg/inject/config.go index 3a1eeb68..7fb95844 100644 --- a/pkg/inject/config.go +++ b/pkg/inject/config.go @@ -154,7 +154,7 @@ func (cfg *Config) BindFlags(fs *pflag.FlagSet) { fs.BoolVar(&cfg.EnableBackendGroups, flagEnableBackendGroups, false, "If enabled, experimental Backend Groups feature will be enabled.") fs.StringVar(&cfg.SidecarImageRepository, flagSidecarImageRepository, "public.ecr.aws/appmesh/aws-appmesh-envoy", "Envoy sidecar container image repository.") - fs.StringVar(&cfg.SidecarImageTag, flagSidecarImageTag, "v1.29.5.0-prod", "Envoy sidecar container image tag.") + fs.StringVar(&cfg.SidecarImageTag, flagSidecarImageTag, "v1.29.6.0-prod", "Envoy sidecar container image tag.") fs.StringVar(&cfg.SidecarCpuRequests, flagSidecarCpuRequests, "10m", "Sidecar CPU resources requests.") fs.StringVar(&cfg.SidecarMemoryRequests, flagSidecarMemoryRequests, "32Mi", diff --git a/pkg/inject/inject_test.go b/pkg/inject/inject_test.go index d0adea31..f48bc324 100644 --- a/pkg/inject/inject_test.go +++ b/pkg/inject/inject_test.go @@ -24,7 +24,7 @@ func getConfig(fp func(Config) Config) Config { LogLevel: "debug", Preview: false, SidecarImageRepository: "public.ecr.aws/appmesh/aws-appmesh-envoy", - SidecarImageTag: "v1.29.5.0-prod", + SidecarImageTag: "v1.29.6.0-prod", InitImage: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v7-prod", SidecarMemoryRequests: "32Mi", SidecarCpuRequests: "10m", diff --git a/scripts/test-with-kind.sh b/scripts/test-with-kind.sh index 3a46190f..65150e12 100755 --- a/scripts/test-with-kind.sh +++ b/scripts/test-with-kind.sh @@ -83,7 +83,7 @@ CONTROLLER_TAG="local" IMAGE_HOST="840364872350.dkr.ecr.us-west-2.amazonaws.com" ENVOY_IMAGE="$IMAGE_HOST/aws-appmesh-envoy" -ENVOY_LATEST_TAG="v1.27.3.0-prod" +ENVOY_LATEST_TAG="v1.29.6.0-prod" ENVOY_1_22_TAG="v1.22.2.0-prod" PROXY_ROUTE_IMAGE="$IMAGE_HOST/aws-appmesh-proxy-route-manager"