Skip to content

1.38 fixed #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ovadiagal wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −20
Draft

1.38 fixed #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class EnvoyContainer extends GenericContainer<EnvoyContainer> {
EnvoyContainer(String config, Supplier<Integer> 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;
}
Expand Down
8 changes: 4 additions & 4 deletions tools/API_SHAS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tools/envoy_release
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.37.2
v1.38.0
30 changes: 16 additions & 14 deletions tools/update-sha.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 '"'
Comment on lines 16 to +17
Copy link
Copy Markdown
Contributor Author

@ovadiagal ovadiagal May 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

adjusted to account for the new format of deps.yaml

}

function find_envoy_sha_from_tag() {
Expand All @@ -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")

Comment on lines 27 to 30
Copy link
Copy Markdown
Contributor Author

@ovadiagal ovadiagal May 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As part of envoyproxy/envoy#43048, dependency metadata (release_date, project_name, etc.) was moved out of repository_locations.bzl into a separate deps.yaml file. Versions and SHAs remain in repository_locations.bzl.

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

Expand Down
Loading