Skip to content

Commit

Permalink
Revert "Bump envoy image version to v1.29.4.0-prod (#773)" (#775)
Browse files Browse the repository at this point in the history
This reverts commit 5a0339d.

Co-authored-by: Fei Liu <liubnu@users.noreply.github.com>
  • Loading branch information
liubnu and liubnu committed May 8, 2024
1 parent 5a0339d commit ac9bf5f
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ IMAGE ?= $(REPO):$(VERSION)
PREVIEW=false
ENABLE_BACKEND_GROUPS?=false
WAIT_PROXY_READY=false
SIDECAR_IMAGE_TAG=v1.29.4.0-prod
SIDECAR_IMAGE_TAG=v1.27.3.0-prod

# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
CRD_OPTIONS ?= "crd:trivialVersions=true,crdVersions=v1"
Expand Down
2 changes: 1 addition & 1 deletion config/helm/appmesh-controller/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ image:
sidecar:
image:
repository: 840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-envoy
tag: v1.29.4.0-prod
tag: v1.27.3.0-prod
# sidecar.logLevel: Envoy log level can be info, warn, error or debug
logLevel: info
envoyAdminAccessPort: 9901
Expand Down
2 changes: 1 addition & 1 deletion config/helm/appmesh-controller/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ image:
sidecar:
image:
repository: 840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-envoy
tag: v1.29.4.0-prod
tag: v1.27.3.0-prod
# sidecar.logLevel: Envoy log level can be info, warn, error or debug
logLevel: info
envoyAdminAccessPort: 9901
Expand Down
2 changes: 1 addition & 1 deletion pkg/inject/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,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.4.0-prod", "Envoy sidecar container image tag.")
fs.StringVar(&cfg.SidecarImageTag, flagSidecarImageTag, "v1.27.3.0-prod", "Envoy sidecar container image tag.")
fs.StringVar(&cfg.SidecarCpuRequests, flagSidecarCpuRequests, "10m",
"Sidecar CPU resources requests.")
fs.StringVar(&cfg.SidecarMemoryRequests, flagSidecarMemoryRequests, "32Mi",
Expand Down
2 changes: 1 addition & 1 deletion pkg/inject/inject_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.0-prod",
SidecarImageTag: "v1.27.3.0-prod",
InitImage: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v7-prod",
SidecarMemoryRequests: "32Mi",
SidecarCpuRequests: "10m",
Expand Down
2 changes: 1 addition & 1 deletion scripts/test-with-kind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.29.4.0-prod"
ENVOY_LATEST_TAG="v1.27.3.0-prod"
ENVOY_1_22_TAG="v1.22.2.0-prod"

PROXY_ROUTE_IMAGE="$IMAGE_HOST/aws-appmesh-proxy-route-manager"
Expand Down

0 comments on commit ac9bf5f

Please sign in to comment.