From 5fc3432b19151f78d0d764db37982d507d527630 Mon Sep 17 00:00:00 2001 From: Gal Ovadia Date: Mon, 4 May 2026 17:01:44 -0400 Subject: [PATCH] fixes Govadia/my publishing --- .../controlplane/server/EnvoyContainer.java | 2 +- tools/API_SHAS | 8 ++--- tools/envoy_release | 2 +- tools/update-sha.sh | 30 ++++++++++--------- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java b/server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java index 476a11435..7968bf930 100644 --- a/server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java +++ b/server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java @@ -24,7 +24,7 @@ class EnvoyContainer extends GenericContainer { EnvoyContainer(String config, Supplier controlPlanePortSupplier) { // this version is changed automatically by /tools/update-sha.sh:57 // if you change it make sure to reflect changes there - super("envoyproxy/envoy:v1.37.2"); + super("envoyproxy/envoy:v1.38.0"); this.config = config; this.controlPlanePortSupplier = controlPlanePortSupplier; } diff --git a/tools/API_SHAS b/tools/API_SHAS index 81a1e0d46..1b055d616 100644 --- a/tools/API_SHAS +++ b/tools/API_SHAS @@ -1,12 +1,12 @@ # Update the versions here and run update-api.sh # envoy (source: SHA from https://github.com/envoyproxy/envoy) -ENVOY_SHA="5afe27fb338b16d5bb06b3a7198bcd581b4e3dee" +ENVOY_SHA="f1dd21b16c244bda00edfb5ffce577e12d0d2ec2" -# dependencies (source: https://github.com/envoyproxy/envoy/blob/5afe27fb338b16d5bb06b3a7198bcd581b4e3dee/api/bazel/repository_locations.bzl) +# dependencies (source: https://github.com/envoyproxy/envoy/blob/f1dd21b16c244bda00edfb5ffce577e12d0d2ec2/api/bazel/repository_locations.bzl) GOOGLEAPIS_SHA="fd52b5754b2b268bc3a22a10f29844f206abb327" # 2024-09-16 -PGV_VERSION="1.3.0" # 2025-12-04 +PGV_VERSION="1.3.3" # 2026-02-18 PROMETHEUS_SHA="0.6.2" # 2025-04-11 -OPENTELEMETRY_VERSION="1.9.0" # 2025-10-31 +OPENTELEMETRY_VERSION="1.10.0" # 2026-03-09 CEL_VERSION="0.25.1" # 2025-11-10 XDS_SHA="8bfbf64dc13ee1a570be4fbdcfccbdd8532463f0" # 2025-11-10 diff --git a/tools/envoy_release b/tools/envoy_release index e55d33a12..553ed7204 100644 --- a/tools/envoy_release +++ b/tools/envoy_release @@ -1 +1 @@ -v1.37.2 +v1.38.0 diff --git a/tools/update-sha.sh b/tools/update-sha.sh index 290ad8719..970e076ba 100755 --- a/tools/update-sha.sh +++ b/tools/update-sha.sh @@ -14,7 +14,7 @@ function find_sha() { function find_date() { local CONTENT=$1 local DEPENDENCY=$2 - echo "$CONTENT" | grep "$DEPENDENCY" -A 11 | grep -m 1 "release_date =" | awk '{ print $3 }' | tr -d '"' | tr -d "," + echo "$CONTENT" | grep "$DEPENDENCY" -A 5 | grep -m 1 "release_date:" | awk '{ print $2 }' | tr -d '"' } function find_envoy_sha_from_tag() { @@ -25,25 +25,27 @@ function find_envoy_sha_from_tag() { CURRENT_ENVOY_RELEASE=$(cat envoy_release) ENVOY_VERSION=$(find_envoy_sha_from_tag "$1") -CURL_OUTPUT=$(curl -s "https://raw.githubusercontent.com/envoyproxy/envoy/$ENVOY_VERSION/api/bazel/repository_locations.bzl") +LOCATIONS=$(curl -s "https://raw.githubusercontent.com/envoyproxy/envoy/$ENVOY_VERSION/api/bazel/repository_locations.bzl") +DEPS_YAML=$(curl -s "https://raw.githubusercontent.com/envoyproxy/envoy/$ENVOY_VERSION/api/bazel/deps.yaml") -GOOGLEAPIS_SHA=$(find_sha "$CURL_OUTPUT" com_google_googleapis) -GOOGLEAPIS_DATE=$(find_date "$CURL_OUTPUT" com_google_googleapis) +GOOGLEAPIS_SHA=$(find_sha "$LOCATIONS" com_google_googleapis) +GOOGLEAPIS_DATE=$(find_date "$DEPS_YAML" com_google_googleapis) -PGV_GIT_SHA=$(find_sha "$CURL_OUTPUT" com_envoyproxy_protoc_gen_validate) -PGV_GIT_DATE=$(find_date "$CURL_OUTPUT" com_envoyproxy_protoc_gen_validate) +PGV_GIT_SHA=$(find_sha "$LOCATIONS" com_envoyproxy_protoc_gen_validate) +PGV_GIT_DATE=$(find_date "$DEPS_YAML" com_envoyproxy_protoc_gen_validate) -PROMETHEUS_SHA=$(find_sha "$CURL_OUTPUT" prometheus_metrics_model) -PROMETHEUS_DATE=$(find_date "$CURL_OUTPUT" prometheus_metrics_model) +PROMETHEUS_SHA=$(find_sha "$LOCATIONS" prometheus_metrics_model) +PROMETHEUS_DATE=$(find_date "$DEPS_YAML" prometheus_metrics_model) -XDS_SHA=$(find_sha "$CURL_OUTPUT" com_github_cncf_xds) -XDS_DATE=$(find_date "$CURL_OUTPUT" com_github_cncf_xds) +# renamed from com_github_cncf_xds to xds in envoy 1.38+ +XDS_SHA=$(find_sha "$LOCATIONS" "xds = dict") +XDS_DATE=$(find_date "$DEPS_YAML" "^xds:") -OPENTELEMETRY_SHA=$(find_sha "$CURL_OUTPUT" opentelemetry_proto) -OPENTELEMETRY_DATE=$(find_date "$CURL_OUTPUT" opentelemetry_proto) +OPENTELEMETRY_SHA=$(find_sha "$LOCATIONS" opentelemetry_proto) +OPENTELEMETRY_DATE=$(find_date "$DEPS_YAML" opentelemetry_proto) -CEL_SHA=$(find_sha "$CURL_OUTPUT" dev_cel) -CEL_DATE=$(find_date "$CURL_OUTPUT" dev_cel) +CEL_SHA=$(find_sha "$LOCATIONS" dev_cel) +CEL_DATE=$(find_date "$DEPS_YAML" dev_cel) echo -n "# Update the versions here and run update-api.sh