From a23c8f0433efc188563d0d05ae8cf1bf59de49d2 Mon Sep 17 00:00:00 2001 From: thomashoffman Date: Fri, 20 Oct 2023 14:42:05 -0700 Subject: [PATCH 1/3] Bump envoy image version to v1.27.0.0-prod. (#731) Co-authored-by: thomashoffman --- 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 b717c928..e045129f 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.26.4.0-prod +SIDECAR_IMAGE_TAG=v1.27.0.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 843c0afa..9d87feee 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.26.4.0-prod + tag: v1.27.0.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 6444e251..86edbfdd 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.26.4.0-prod + tag: v1.27.0.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 0cf38a09..7afdb532 100644 --- a/pkg/inject/config.go +++ b/pkg/inject/config.go @@ -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.26.4.0-prod", "Envoy sidecar container image tag.") + fs.StringVar(&cfg.SidecarImageTag, flagSidecarImageTag, "v1.27.0.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 b02b3259..c4c4039c 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.26.4.0-prod", + SidecarImageTag: "v1.27.0.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 194c1ef7..7c73cfef 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.26.4.0-prod" +ENVOY_LATEST_TAG="v1.27.0.0-prod" ENVOY_1_22_TAG="v1.22.2.0-prod" PROXY_ROUTE_IMAGE="$IMAGE_HOST/aws-appmesh-proxy-route-manager" From 8a775674321311975d204cb9975cf6f5a79eb472 Mon Sep 17 00:00:00 2001 From: Srinivas <68226496+srinivas-kini@users.noreply.github.com> Date: Thu, 26 Oct 2023 13:21:42 -0700 Subject: [PATCH 2/3] Bump envoy to v1.27.2.0-prod (#734) Co-authored-by: Srinivas Kini --- 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 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e045129f..13e86bd9 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.27.0.0-prod +SIDECAR_IMAGE_TAG=v1.27.2.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 9d87feee..d753d5bf 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.27.0.0-prod + tag: v1.27.2.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 86edbfdd..4e7c009f 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.27.0.0-prod + tag: v1.27.2.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 7afdb532..db423fea 100644 --- a/pkg/inject/config.go +++ b/pkg/inject/config.go @@ -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.27.0.0-prod", "Envoy sidecar container image tag.") + fs.StringVar(&cfg.SidecarImageTag, flagSidecarImageTag, "v1.27.2.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 c4c4039c..8225d52e 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.27.0.0-prod", + SidecarImageTag: "v1.27.2.0-prod", InitImage: "840364872350.dkr.ecr.us-west-2.amazonaws.com/aws-appmesh-proxy-route-manager:v7-prod", SidecarMemoryRequests: "32Mi", SidecarCpuRequests: "10m", From 2df8657d3e72e8fde88668ad260dd8fab1db702a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 13:40:27 -0700 Subject: [PATCH 3/3] Bump golang.org/x/net in /test/integration/test_app/sidecar-frontend (#729) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.7.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.7.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../integration/test_app/sidecar-frontend/go.mod | 8 ++++---- .../integration/test_app/sidecar-frontend/go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/integration/test_app/sidecar-frontend/go.mod b/test/integration/test_app/sidecar-frontend/go.mod index 270ecfe2..eac966e2 100644 --- a/test/integration/test_app/sidecar-frontend/go.mod +++ b/test/integration/test_app/sidecar-frontend/go.mod @@ -26,11 +26,11 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - golang.org/x/net v0.7.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/term v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.28.0 // indirect diff --git a/test/integration/test_app/sidecar-frontend/go.sum b/test/integration/test_app/sidecar-frontend/go.sum index c2727ece..438b15c2 100644 --- a/test/integration/test_app/sidecar-frontend/go.sum +++ b/test/integration/test_app/sidecar-frontend/go.sum @@ -243,8 +243,8 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -287,17 +287,17 @@ golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=