From 9da601c6a0a60b071c84d173ee3403bf84c11d3c Mon Sep 17 00:00:00 2001 From: jacob-delgado Date: Sat, 1 Apr 2023 20:11:31 -0600 Subject: [PATCH 1/4] [release-1.15] 2023 04 04 release 115 (#71) * Update envoy sha for security release for release-1.15 * fix ENVOY_SHA * Fix build compilation * Fix testdata --- Makefile.core.mk | 1 - WORKSPACE | 8 ++++---- .../stackdriver/utf8_client_access_log_entry.yaml.tmpl | 1 - .../stackdriver/utf8_server_access_log_entry.yaml.tmpl | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile.core.mk b/Makefile.core.mk index d43dc814662..d5447c78358 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -151,7 +151,6 @@ check: lint: lint-copyright-banner format-go lint-go tidy-go lint-scripts @scripts/check-repository.sh @scripts/check-style.sh - @scripts/verify-last-flag-matches-upstream.sh protoc = protoc -I common-protos -I extensions protoc_gen_docs_plugin := --docs_out=camel_case_fields=false,warnings=true,per_file=true,mode=html_fragment_with_front_matter:$(repo_dir)/ diff --git a/WORKSPACE b/WORKSPACE index 833ce0a3798..c274d768d75 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -38,12 +38,12 @@ bind( # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed. # # Note: this is needed by release builder to resolve envoy dep sha to tag. -# Commit date: 2023-03-24 -ENVOY_SHA = "a9c5a1936186da647b30b997183e58daf0e16c7a" +# Commit date: 2023-03-28 +ENVOY_SHA = "87bbee939d9691d20c72936a03dd38457368babd" -ENVOY_SHA256 = "a5a203ef11d20ee4bc4818dc70e798f6fbe2b9eeaac8f0dc97deffbb43565155" +ENVOY_SHA256 = "6359991c3c7f6a52820d82416a8bba8788488cc3e0d9de59d61787c31a69906f" -ENVOY_ORG = "envoyproxy" +ENVOY_ORG = "istio" ENVOY_REPO = "envoy" diff --git a/testdata/stackdriver/utf8_client_access_log_entry.yaml.tmpl b/testdata/stackdriver/utf8_client_access_log_entry.yaml.tmpl index f55ce86bb08..b57dd612fce 100644 --- a/testdata/stackdriver/utf8_client_access_log_entry.yaml.tmpl +++ b/testdata/stackdriver/utf8_client_access_log_entry.yaml.tmpl @@ -25,6 +25,5 @@ labels: upstream_cluster: "server-outbound-cluster" route_name: client_route response_details: "via_upstream" - x-envoy-original-path: va lue x-envoy-original-dst-host: va lue severity: INFO diff --git a/testdata/stackdriver/utf8_server_access_log_entry.yaml.tmpl b/testdata/stackdriver/utf8_server_access_log_entry.yaml.tmpl index 883a5931ea4..9f989fc5317 100644 --- a/testdata/stackdriver/utf8_server_access_log_entry.yaml.tmpl +++ b/testdata/stackdriver/utf8_server_access_log_entry.yaml.tmpl @@ -24,6 +24,5 @@ labels: upstream_cluster: "server-inbound-cluster" response_details: "via_upstream" route_name: server_route - x-envoy-original-path: va lue x-envoy-original-dst-host: va lue severity: INFO From 3886e6fc2f0b8de3d0335adfd73be1d9aa9b10d4 Mon Sep 17 00:00:00 2001 From: istio-testing Date: Wed, 5 Apr 2023 03:02:07 +0000 Subject: [PATCH 2/4] Automator: update envoy@ in istio/proxy@release-1.15 --- WORKSPACE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index c274d768d75..1f6facc522d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -38,12 +38,12 @@ bind( # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed. # # Note: this is needed by release builder to resolve envoy dep sha to tag. -# Commit date: 2023-03-28 -ENVOY_SHA = "87bbee939d9691d20c72936a03dd38457368babd" +# Commit date: 2023-04-04 +ENVOY_SHA = "0865d3a1ec82b7f55de60f02a668ab2b2b3e3427" -ENVOY_SHA256 = "6359991c3c7f6a52820d82416a8bba8788488cc3e0d9de59d61787c31a69906f" +ENVOY_SHA256 = "e8796bfa8e763ae01421f25a468f8253b27ef7ef5cacd80a49b5abe8852093f2" -ENVOY_ORG = "istio" +ENVOY_ORG = "envoyproxy/envoy" ENVOY_REPO = "envoy" From 278290274a8ae5c1efbb05b284dde52c88cffde0 Mon Sep 17 00:00:00 2001 From: Jacob Delgado Date: Thu, 6 Apr 2023 00:48:57 +0000 Subject: [PATCH 3/4] Revert Makefile.core.mk --- Makefile.core.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.core.mk b/Makefile.core.mk index d5447c78358..d43dc814662 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -151,6 +151,7 @@ check: lint: lint-copyright-banner format-go lint-go tidy-go lint-scripts @scripts/check-repository.sh @scripts/check-style.sh + @scripts/verify-last-flag-matches-upstream.sh protoc = protoc -I common-protos -I extensions protoc_gen_docs_plugin := --docs_out=camel_case_fields=false,warnings=true,per_file=true,mode=html_fragment_with_front_matter:$(repo_dir)/ From 60a2348773208f173a40be93dcb0fcef80dc8f5d Mon Sep 17 00:00:00 2001 From: Jacob Delgado Date: Thu, 6 Apr 2023 00:49:36 +0000 Subject: [PATCH 4/4] Fix org --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index 1f6facc522d..d9cb8329296 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -43,7 +43,7 @@ ENVOY_SHA = "0865d3a1ec82b7f55de60f02a668ab2b2b3e3427" ENVOY_SHA256 = "e8796bfa8e763ae01421f25a468f8253b27ef7ef5cacd80a49b5abe8852093f2" -ENVOY_ORG = "envoyproxy/envoy" +ENVOY_ORG = "envoyproxy" ENVOY_REPO = "envoy"