Bump envoy-gloo to v1.34.x

Makefile

@@ -54,7 +54,7 @@ SOURCES := $(shell find . -name "*.go" | grep -v test.go)
 # for more information, see https://github.com/solo-io/gloo/pull/9633
 # and
 # https://soloio.slab.com/posts/extended-http-methods-design-doc-40j7pjeu
-ENVOY_GLOO_IMAGE ?= quay.io/solo-io/envoy-gloo:1.33.2-patch2
+ENVOY_GLOO_IMAGE ?= quay.io/solo-io/envoy-gloo:1.34.1-patch2
 LDFLAGS := "-X github.com/solo-io/gloo/pkg/version.Version=$(VERSION)"
 GCFLAGS ?=
 

changelog/v1.20.0-beta5/envoy-gloo-1.34-bump.yaml

@@ -0,0 +1,13 @@
+changelog:
+  - type: DEPENDENCY_BUMP
+    issueLink: https://github.com/solo-io/solo-projects/issues/8103
+    resolvesIssue: false
+    dependencyOwner: solo-io
+    dependencyRepo: envoy-gloo
+    dependencyTag: 1.34.1-patch2
+  - type: DEPENDENCY_BUMP
+    issueLink:
+    resolvesIssue: false
+    dependencyOwner: envoyproxy
+    dependencyRepo: go-control-plane
+    dependencyTag: v0.13.5-0.20250507123352-93990c5ec02f

devel/tools/changelog.sh

@@ -1,6 +1,16 @@
 #!/bin/bash
 
-set -e
+# Create a changelog file. This script automatically creates a file in the
+# correct changelog directory. You can also pass the `-e` flag if you want to
+# edit the file after creation. You can also use `-t` to specify which kind of
+# changelog entry you would like to create (`-t FIX` or `-t DEPENDENCY_BUMP`
+# for example). This script can be called multiple times, and it will
+# automatically append additional changelog entries to the changelog file in
+# question. So you could run `devel/tools/changelog.sh -t FIX` and then after
+# that you could run `devel/tools/changelog.sh -t DEPENDENCY_BUMP` and both of
+# those entries would appear in the file.
+
+set -euo pipefail
 
 CURRENT_VERSION=$(git describe --tags --always --abbrev=0)
 OLD_VERSION=$(echo -n $CURRENT_VERSION | sed -E 's/.*[^0-9]([0-9]+)$/\1/')
@@ -14,24 +24,87 @@ mkdir -p "$CHANGELOG_DIR"
 
 CHANGELOG_FILE="$CHANGELOG_DIR/$BRANCH_NAME.yaml"
 
-if [[ ! -f $CHANGELOG_FILE ]]; then
-    echo "Creating $CHANGELOG_FILE"
+##################################################
+# OPTION FLAGS
+OPT_EDIT=false # should we open the changelog file in $EDITOR?
+OPT_CHANGELOG_TYPE="" # NEW_FEATURE, DEPENDENCY_BUMP, ENVOY_DEPENDENCY_BUMP, NON_USER_FACING
+
+##################################################
+# OPTION PARSING
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -e|--edit)
+      OPT_EDIT=true
+      shift
+      ;;
+    --no-edit)
+      OPT_EDIT=false
+      shift
+      ;;
+    -t|--type)
+      OPT_CHANGELOG_TYPE="$2"
+      shift
+      shift
+      ;;
+  esac
+done
+##################################################
+# if the file does not exist, create it by adding the initial "changelog": line
+test -f "${CHANGELOG_FILE}" || echo "changelog:" >> "${CHANGELOG_FILE}"
 
-    cat << EOF > "$CHANGELOG_FILE"
-changelog:
+##################################################
+# process the -t flag to add the templated changelog entries
+case "$OPT_CHANGELOG_TYPE" in
+  FIX)
+    echo "creating FIX changelog"
+    # make sure to append to the file so we don't delete existing entries!!
+    cat << EOF >> "${CHANGELOG_FILE}"
   - type: FIX
     issueLink:
     resolvesIssue: false
     description: >-
       "${DESCRIPTION}"
 EOF
+    ;;
+  NEW_FEATURE)
+    echo "creating NEW_FEATURE changelog"
+    # make sure to append to the file so we don't delete existing entries!!
+    cat << EOF >> "${CHANGELOG_FILE}"
+  - type: NEW_FEATURE
+    issueLink:
+    resolvesIssue: false
+    description: >-
+      "${DESCRIPTION}"
+EOF
+    ;;
+  DEPENDENCY_BUMP)
+    echo "creating DEPENDENCY_BUMP changelog"
+    # make sure to append to the file so we don't delete existing entries!!
+    cat << EOF >> "${CHANGELOG_FILE}"
+  - type: DEPENDENCY_BUMP
+    issueLink:
+    resolvesIssue: false
+    dependencyOwner: # solo-io
+    dependencyRepo: # gloo
+    dependencyTag: # v0.7.0
+EOF
+    ;;
+  ENVOY_DEPENDENCY_BUMP)
+    echo "creating ENVOY DEPENDENCY_BUMP changelog"
+    # make sure to append to the file so we don't delete existing entries!!
+    cat << EOF >> "${CHANGELOG_FILE}"
+  - type: DEPENDENCY_BUMP
+    issueLink:
+    resolvesIssue: false
+    dependencyOwner: solo-io
+    dependencyRepo: envoy-gloo
+    dependencyTag: # 1.33.0-patch3
+EOF
+    ;;
+esac
 
-echo "Wrote to $CHANGELOG_FILE"
-fi
-
-# TODO this is a quick hack to avoid args parsing. If this script grows in complexity,
-# parsing args will be more appropriate than this check.
-if [[ $# > 0 ]] && [[ "$1" == "edit" ]]; then
-    echo "Editing..."
-    "$EDITOR" "$CHANGELOG_FILE"
+##################################################
+# Edit the file if `-e` was provided
+if $OPT_EDIT ; then
+  exec "$EDITOR" "${CHANGELOG_FILE}"
 fi

docs/content/static/content/osa_provided.md

@@ -8,10 +8,10 @@ Name|Version|License
 [aws/aws-sdk-go](https://github.com/aws/aws-sdk-go)|v1.34.9|Apache License 2.0
 [xds/go](https://github.com/cncf/xds)|v0.0.0-20250121191232-2f005788dc42|Apache License 2.0
 [cratonica/2goarray](https://github.com/cratonica/2goarray)|v0.0.0-20190331194516-514510793eaa|MIT License
-[envoyproxy/go-control-plane](https://github.com/envoyproxy/go-control-plane)|v0.13.5-0.20250123154839-2a6715911fec|Apache License 2.0
-[go-control-plane/contrib](https://github.com/envoyproxy/go-control-plane)|v1.32.5-0.20250207140015-90270e3c85fd|Apache License 2.0
-[go-control-plane/envoy](https://github.com/envoyproxy/go-control-plane)|v1.32.5-0.20250211152746-ef139ef8ea6b|Apache License 2.0
-[go-control-plane/ratelimit](https://github.com/envoyproxy/go-control-plane)|v0.1.0|Apache License 2.0
+[envoyproxy/go-control-plane](https://github.com/envoyproxy/go-control-plane)|v0.13.5-0.20250507123352-93990c5ec02f|Apache License 2.0
+[go-control-plane/contrib](https://github.com/envoyproxy/go-control-plane)|v1.32.5-0.20250507123352-93990c5ec02f|Apache License 2.0
+[go-control-plane/envoy](https://github.com/envoyproxy/go-control-plane)|v1.32.5-0.20250507123352-93990c5ec02f|Apache License 2.0
+[go-control-plane/ratelimit](https://github.com/envoyproxy/go-control-plane)|v0.1.1-0.20250507123352-93990c5ec02f|Apache License 2.0
 [envoyproxy/protoc-gen-validate](https://github.com/envoyproxy/protoc-gen-validate)|v1.2.1|Apache License 2.0
 [form3tech-oss/jwt-go](https://github.com/form3tech-oss/jwt-go)|v3.2.5+incompatible|MIT License
 [fsnotify/fsnotify](https://github.com/fsnotify/fsnotify)|v1.7.0|BSD 3-clause "New" or "Revised" License
@@ -43,7 +43,7 @@ Name|Version|License
 [pkg/browser](https://github.com/pkg/browser)|v0.0.0-20180916011732-0a3d74bf9ce4|BSD 2-clause "Simplified" License
 [pkg/errors](https://github.com/pkg/errors)|v0.9.1|BSD 2-clause "Simplified" License
 [prometheus/client_golang](https://github.com/prometheus/client_golang)|v1.20.5|Apache License 2.0
-[prometheus/client_model](https://github.com/prometheus/client_model)|v0.6.1|Apache License 2.0
+[prometheus/client_model](https://github.com/prometheus/client_model)|v0.6.2|Apache License 2.0
 [prometheus/common](https://github.com/prometheus/common)|v0.62.0|Apache License 2.0
 [go-ruleguard/dsl](https://github.com/quasilyte/go-ruleguard)|v0.3.22|BSD 3-clause "New" or "Revised" License
 [rotisserie/eris](https://github.com/rotisserie/eris)|v0.5.4|MIT License
@@ -56,7 +56,7 @@ Name|Version|License
 [stoewer/go-strcase](https://github.com/stoewer/go-strcase)|v1.3.0|MIT License
 [stretchr/testify](https://github.com/stretchr/testify)|v1.10.0|MIT License
 [go.opencensus.io](https://go.opencensus.io)|v0.24.0|Apache License 2.0
-[proto/otlp](https://go.opentelemetry.io/proto/otlp)|v1.5.0|Apache License 2.0
+[proto/otlp](https://go.opentelemetry.io/proto/otlp)|v1.6.0|Apache License 2.0
 [go.uber.org/goleak](https://go.uber.org/goleak)|v1.3.0|MIT License
 [go.uber.org/multierr](https://go.uber.org/multierr)|v1.11.0|MIT License
 [go.uber.org/zap](https://go.uber.org/zap)|v1.27.0|MIT License
@@ -65,9 +65,9 @@ Name|Version|License
 [x/mod](https://golang.org/x/mod)|v0.23.0|BSD 3-clause "New" or "Revised" License
 [x/sync](https://golang.org/x/sync)|v0.13.0|BSD 3-clause "New" or "Revised" License
 [x/tools](https://golang.org/x/tools)|v0.30.0|BSD 3-clause "New" or "Revised" License
-[googleapis/api](https://google.golang.org/genproto/googleapis/api)|v0.0.0-20250122153221-138b5a5a4fd4|Apache License 2.0
-[googleapis/rpc](https://google.golang.org/genproto/googleapis/rpc)|v0.0.0-20250122153221-138b5a5a4fd4|Apache License 2.0
-[google.golang.org/grpc](https://google.golang.org/grpc)|v1.71.1|Apache License 2.0
+[googleapis/api](https://google.golang.org/genproto/googleapis/api)|v0.0.0-20250428153025-10db94c68c34|Apache License 2.0
+[googleapis/rpc](https://google.golang.org/genproto/googleapis/rpc)|v0.0.0-20250428153025-10db94c68c34|Apache License 2.0
+[google.golang.org/grpc](https://google.golang.org/grpc)|v1.72.0|Apache License 2.0
 [google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.36.6|BSD 3-clause "New" or "Revised" License
 [AlecAivazis/survey.v1](https://gopkg.in/AlecAivazis/survey.v1)|v1.8.7|MIT License
 [helm/v3](https://helm.sh/helm/v3)|v3.17.0|Apache License 2.0

go.mod

@@ -12,9 +12,10 @@ require (
 	github.com/aws/aws-sdk-go v1.34.9
 	github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42
 	github.com/cratonica/2goarray v0.0.0-20190331194516-514510793eaa
-	github.com/envoyproxy/go-control-plane/contrib v1.32.5-0.20250207140015-90270e3c85fd
-	github.com/envoyproxy/go-control-plane/envoy v1.32.5-0.20250211152746-ef139ef8ea6b
-	github.com/envoyproxy/go-control-plane/ratelimit v0.1.0
+	github.com/envoyproxy/go-control-plane v0.13.5-0.20250507123352-93990c5ec02f
+	github.com/envoyproxy/go-control-plane/contrib v1.32.5-0.20250507123352-93990c5ec02f
+	github.com/envoyproxy/go-control-plane/envoy v1.32.5-0.20250507123352-93990c5ec02f
+	github.com/envoyproxy/go-control-plane/ratelimit v0.1.1-0.20250507123352-93990c5ec02f
 	github.com/envoyproxy/protoc-gen-validate v1.2.1
 	github.com/form3tech-oss/jwt-go v3.2.5+incompatible
 	github.com/fsnotify/fsnotify v1.8.0
@@ -71,7 +72,7 @@ require (
 	golang.org/x/crypto v0.37.0
 	golang.org/x/sync v0.13.0
 	golang.org/x/tools v0.30.0
-	google.golang.org/grpc v1.71.1
+	google.golang.org/grpc v1.72.0
 	google.golang.org/protobuf v1.36.6
 	gopkg.in/AlecAivazis/survey.v1 v1.8.7
 	helm.sh/helm/v3 v3.17.0
@@ -93,25 +94,24 @@ require (
 require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.3.1-0.20240214155107-6cf1ede4da61
 	github.com/avast/retry-go/v4 v4.3.3
-	github.com/envoyproxy/go-control-plane v0.13.5-0.20250123154839-2a6715911fec
 	github.com/go-logr/zapr v1.3.0
 	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/golang/mock v1.6.0
 	github.com/google/go-cmp v0.7.0
 	github.com/google/uuid v1.6.0
 	github.com/mccutchen/go-httpbin/v2 v2.15.0
 	github.com/prometheus/client_golang v1.20.5
-	github.com/prometheus/client_model v0.6.1
+	github.com/prometheus/client_model v0.6.2
 	github.com/prometheus/common v0.62.0
 	github.com/quasilyte/go-ruleguard/dsl v0.3.22
 	github.com/solo-io/cue v0.4.7
 	github.com/stoewer/go-strcase v1.3.0
 	github.com/stretchr/testify v1.10.0
-	go.opentelemetry.io/proto/otlp v1.5.0
+	go.opentelemetry.io/proto/otlp v1.6.0
 	golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e
 	golang.org/x/mod v0.23.0
-	google.golang.org/genproto/googleapis/api v0.0.0-20250122153221-138b5a5a4fd4
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250122153221-138b5a5a4fd4
+	google.golang.org/genproto/googleapis/api v0.0.0-20250428153025-10db94c68c34
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34
 	istio.io/api v1.25.2-0.20250410212420-84c271001f68
 	istio.io/client-go v1.25.2-0.20250410213018-e5f6074bc228
 	istio.io/istio v0.0.0-20250411142419-0d83506c2883
@@ -120,7 +120,7 @@ require (
 )
 
 require (
-	cel.dev/expr v0.19.1 // indirect
+	cel.dev/expr v0.20.0 // indirect
 	contrib.go.opencensus.io/exporter/prometheus v0.4.0 // indirect
 	cuelang.org/go v0.10.0 // indirect
 	dario.cat/mergo v1.0.1 // indirect