Merge branch 'main' into sheidkamp/test-result-slack-notifications

.github/workflows/.env/nightly-tests/max_versions.env

@@ -1,7 +1,7 @@
-node_version='v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865'
-kubectl_version='v1.31.0'
-kind_version='v0.24.0'
-helm_version='v3.14.4'
-argocd_version='v2.8.4'
+node_version='v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027'
+kubectl_version='v1.32.2'
+kind_version='v0.26.0'
+helm_version='v3.17.1'
+argocd_version='v2.14.2'
 istio_version='1.22.0'
 k8sgateway_api_version='v1.2.1'

.github/workflows/.env/nightly-tests/min_versions.env

@@ -1,7 +1,7 @@
-node_version='v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72'
-kubectl_version='v1.27.3'
-kind_version='v0.20.0'
-helm_version='v3.12.2'
+node_version='v1.28.6@sha256:b7e1cf6b2b729f604133c667a6be8aab6f4dde5bb042c1891ae248d9154f665b'
+kubectl_version='v1.28.15'
+kind_version='v0.21.0'
+helm_version='v3.13.3'
 argocd_version='v2.8.4'
 istio_version='1.16.7'
 k8sgateway_api_version='v1.0.0'

.github/workflows/.env/pr-tests/versions.env

@@ -1,6 +1,7 @@
-node_version='v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865'
-kubectl_version='v1.31.0'
-kind_version='v0.24.0'
-helm_version='v3.14.4'
-argocd_version='v2.8.4'
+node_version='v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027'
+kubectl_version='v1.32.2'
+kind_version='v0.26.0'
+helm_version='v3.17.1'
+argocd_version='v2.14.2'
 istio_version='1.22.0'
+

.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml

@@ -10,6 +10,7 @@ runs:
     with:
       install_only: true
       version: ${{ matrix.kube-version.kind }}
+      node_image: kindest/node:${{ matrix.kube-version.node }}
   - uses: azure/setup-kubectl@v4
     id: kubectl
     with:

.github/workflows/composite-actions/regression-tests/action.yaml

@@ -12,6 +12,7 @@ runs:
     with:
       install_only: true
       version: ${{ matrix.kube-version.kind }}
+      node_image: kindest/node:${{ matrix.kube-version.node }}
   - uses: azure/setup-kubectl@v4
     id: kubectl
     with:

.github/workflows/conformance-tests.yaml

@@ -25,10 +25,10 @@ jobs:
         # how this was setup and there's a limited # of dispatch inputs that GH
         # supports. We can revisit this later.
         kube-version:
-        - node: 'v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865'
-          kubectl: 'v1.31.0'
-          kind: 'v0.24.0'
-          helm: 'v3.14.4'
+        - node: 'v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027'
+          kubectl: 'v1.32.2'
+          kind: 'v0.26.0'
+          helm: 'v3.17.1'
         image-variant:
           - ${{ inputs.image-variant }}
         version:

changelog/v1.19.0-beta10/k8s-1.32-bump.yaml

@@ -0,0 +1,66 @@
+changelog:
+- type: BREAKING_CHANGE
+  description: >
+    Bump dependencies to support Kubernetes 1.32
+  issueLink: https://github.com/solo-io/solo-projects/issues/7788
+  resolvesIssue: false
+- type: DEPENDENCY_BUMP
+  dependencyOwner: k8s.io
+  dependencyRepo: api
+  dependencyTag: v0.32.2
+- type: DEPENDENCY_BUMP
+  dependencyOwner: k8s.io
+  dependencyRepo: apiextensions-apiserver
+  dependencyTag: v0.32.2
+- type: DEPENDENCY_BUMP
+  dependencyOwner: k8s.io
+  dependencyRepo: apimachinery
+  dependencyTag: v0.32.2
+- type: DEPENDENCY_BUMP
+  dependencyOwner: k8s.io
+  dependencyRepo: client-go
+  dependencyTag: v0.32.2
+- type: DEPENDENCY_BUMP
+  dependencyOwner: k8s.io
+  dependencyRepo: code-generator 
+  dependencyTag: v0.32.2
+- type: DEPENDENCY_BUMP
+  dependencyOwner: k8s.io
+  dependencyRepo: component-base
+  dependencyTag: v0.32.2
+- type: DEPENDENCY_BUMP
+  dependencyOwner: k8s.io
+  dependencyRepo: kubectl
+  dependencyTag: v0.32.2
+- type: DEPENDENCY_BUMP
+  dependencyOwner: sigs.k8s.io
+  dependencyRepo: controller-runtime
+  dependencyTag: v0.20.1
+- type: DEPENDENCY_BUMP
+  dependencyOwner: onsi
+  dependencyRepo: gomega
+  dependencyTag: v1.35.1
+- type: DEPENDENCY_BUMP
+  dependencyOwner: onsi
+  dependencyRepo: ginkgo
+  dependencyTag: v2.21.0
+- type: DEPENDENCY_BUMP
+  dependencyOwner: go.uber.org
+  dependencyRepo: zap
+  dependencyTag: v1.27.0
+- type: DEPENDENCY_BUMP
+  dependencyOwner: solo-io
+  dependencyRepo: go-utils
+  dependencyTag: v0.27.4
+- type: DEPENDENCY_BUMP
+  dependencyOwner: solo-io
+  dependencyRepo: cloud-builders
+  dependencyTag: v0.11.1
+- type: DEPENDENCY_BUMP
+  dependencyOwner: solo-io
+  dependencyRepo: skv2
+  dependencyTag: v0.42.0
+- type: DEPENDENCY_BUMP
+  dependencyOwner: solo-io
+  dependencyRepo: solo-kit
+  dependencyTag: v0.37.0

ci/cloudbuild/publish-artifacts.yaml

@@ -1,6 +1,6 @@
 steps:
 
-- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.11.1'
   id: 'prepare-workspace'
   args:
   - '--repo-name'
@@ -51,7 +51,7 @@ steps:
   - create
   - --use
 
-- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.1'
   id: 'build-certgen-arm64-binary'
   args:
   - 'certgen-docker'
@@ -60,7 +60,7 @@ steps:
   - 'GOARCH=arm64'
 
 # Run make targets to push docker images to quay.io
-- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.1'
   id: 'publish-docker'
   args:
   - 'publish-docker'
@@ -86,7 +86,7 @@ steps:
   waitFor:
   - 'publish-docker'
 
-- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.1'
   id: 'release-chart'
   dir: *dir
   args:
@@ -101,7 +101,7 @@ steps:
   - 'gcr-auth'
 
 # Run make targets to build and push docker images to GCR
-- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.1'
   id: 'publish-docker-extended-gcr'
   dir: *dir
   args:

ci/cloudbuild/run-tests.yaml

@@ -1,6 +1,6 @@
 steps:
 
-- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.11.1'
   id: 'prepare-workspace'
   args:
   - '--repo-name'
@@ -23,7 +23,7 @@ steps:
     cd /go/pkg
     gsutil cat gs://$PROJECT_ID-cache/gloo/gloo-mod.tar.gz | tar -xzf - || echo "untar mod cache failed; continuing because we can download deps as we need them"
 
-- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.1'
   id: 'prepare-envoy'
   dir: *dir
   entrypoint: 'bash'
@@ -77,7 +77,7 @@ steps:
   waitFor:
   - 'prepare-gcr-zone'
 
-- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.1'
   id: 'prepare-test-tools'
   dir: *dir
   args:
@@ -88,7 +88,7 @@ steps:
   - 'prepare-gcr-zone'
   - 'prepare-test-credentials'
 
-- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.11.1'
   id: 'run-tests'
   dir: *dir
   entrypoint: 'make'
@@ -99,7 +99,7 @@ steps:
   secretEnv:
   - 'JWT_PRIVATE_KEY'
 
-- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.11.1'
   id: 'run-e2e-tests'
   dir: *dir
   entrypoint: 'make'
@@ -110,7 +110,7 @@ steps:
   secretEnv:
   - 'JWT_PRIVATE_KEY'
 
-- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.2'
+- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.11.1'
   id: 'run-hashicorp-e2e-tests'
   dir: *dir
   entrypoint: 'make'

docs/content/static/content/osa_provided.md

@@ -72,14 +72,14 @@ Name|Version|License
 [istio.io/api](https://istio.io/api)|v1.25.0-alpha.0.0.20250210220544-0b64afd2de85|Apache License 2.0
 [istio.io/client-go](https://istio.io/client-go)|v1.25.0-alpha.0.0.20250210220843-5a4065fded65|Apache License 2.0
 [istio.io/istio](https://istio.io/istio)|v0.0.0-20250212203644-c2ac935c5888|Apache License 2.0
-[k8s.io/api](https://k8s.io/api)|v0.32.1|Apache License 2.0
-[k8s.io/apiextensions-apiserver](https://k8s.io/apiextensions-apiserver)|v0.32.1|Apache License 2.0
-[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.32.1|Apache License 2.0
-[k8s.io/client-go](https://k8s.io/client-go)|v0.32.1|Apache License 2.0
-[k8s.io/code-generator](https://k8s.io/code-generator)|v0.32.1|Apache License 2.0
-[k8s.io/component-base](https://k8s.io/component-base)|v0.32.1|Apache License 2.0
-[k8s.io/kubectl](https://k8s.io/kubectl)|v0.32.1|Apache License 2.0
-[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20240711033017-18e509b52bc8|Apache License 2.0
+[k8s.io/api](https://k8s.io/api)|v0.32.2|Apache License 2.0
+[k8s.io/apiextensions-apiserver](https://k8s.io/apiextensions-apiserver)|v0.32.2|Apache License 2.0
+[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.32.2|Apache License 2.0
+[k8s.io/client-go](https://k8s.io/client-go)|v0.32.2|Apache License 2.0
+[k8s.io/code-generator](https://k8s.io/code-generator)|v0.32.2|Apache License 2.0
+[k8s.io/component-base](https://k8s.io/component-base)|v0.32.2|Apache License 2.0
+[k8s.io/kubectl](https://k8s.io/kubectl)|v0.32.2|Apache License 2.0
+[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20241104100929-3ea5e8cea738|Apache License 2.0
 [knative.dev/networking](https://knative.dev/networking)|v0.0.0-20211210083629-bace06e98aee|Apache License 2.0
 [knative.dev/pkg](https://knative.dev/pkg)|v0.0.0-20211206113427-18589ac7627e|Apache License 2.0
 [sigs.k8s.io/controller-runtime](https://sigs.k8s.io/controller-runtime)|v0.20.1|Apache License 2.0

go.mod

@@ -1,6 +1,6 @@
 module github.com/solo-io/gloo
 
-go 1.23.3
+go 1.23.6
 
 // Note for developers: upgrading go will also require upgrading go in the following files:
 // ./cloudbuild-cache.yaml,
@@ -49,17 +49,17 @@ require (
 	github.com/saiskee/gettercheck v0.0.0-20210820204958-38443d06ebe0
 	github.com/sergi/go-diff v1.2.0
 	github.com/solo-io/go-list-licenses v0.1.4
-	github.com/solo-io/go-utils v0.27.3
-	github.com/solo-io/k8s-utils v0.8.1
+	github.com/solo-io/go-utils v0.27.4
+	github.com/solo-io/k8s-utils v0.9.0
 	github.com/solo-io/protoc-gen-ext v0.0.25
 	github.com/solo-io/protoc-gen-openapi v0.2.5
-	github.com/solo-io/skv2 v0.41.0
+	github.com/solo-io/skv2 v0.42.0
 
-	// Pinned to the `sa-k8s-1.29-bump` tag of solo-apis on `gloo-main` branch
+	// Pinned to the `k8s-1.32-bump` tag of solo-apis on `gloo-main` branch
 	// Ref: https://github.com/solo-io/gloo/pull/9463/files#r1594409655 && https://solo-io-corp.slack.com/archives/C03MFATU265/p1716913420716729?thread_ts=1716476992.938679&cid=C03MFATU265
 	// as to why it is now based off `gloo-main` and not `gloo-repo-branch`
-	github.com/solo-io/solo-apis v0.0.0-20240917212400-9103ca169358
-	github.com/solo-io/solo-kit v0.36.4
+	github.com/solo-io/solo-apis v0.0.0-20250218202255-bad789c9de63
+	github.com/solo-io/solo-kit v0.37.0
 	github.com/spf13/afero v1.11.0
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
@@ -75,13 +75,13 @@ require (
 	google.golang.org/protobuf v1.36.5
 	gopkg.in/AlecAivazis/survey.v1 v1.8.7
 	helm.sh/helm/v3 v3.17.0
-	k8s.io/api v0.32.1
-	k8s.io/apiextensions-apiserver v0.32.1
-	k8s.io/apimachinery v0.32.1
-	k8s.io/client-go v0.32.1
-	k8s.io/code-generator v0.32.1
-	k8s.io/component-base v0.32.1
-	k8s.io/kubectl v0.32.1
+	k8s.io/api v0.32.2
+	k8s.io/apiextensions-apiserver v0.32.2
+	k8s.io/apimachinery v0.32.2
+	k8s.io/client-go v0.32.2
+	k8s.io/code-generator v0.32.2
+	k8s.io/component-base v0.32.2
+	k8s.io/kubectl v0.32.2
 	k8s.io/utils v0.0.0-20241210054802-24370beab758
 	knative.dev/networking v0.0.0-20211210083629-bace06e98aee
 	knative.dev/pkg v0.0.0-20211206113427-18589ac7627e
@@ -335,14 +335,14 @@ require (
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiserver v0.32.1 // indirect
-	k8s.io/cli-runtime v0.32.1 // indirect
-	k8s.io/component-helpers v0.32.1 // indirect
+	k8s.io/apiserver v0.32.2 // indirect
+	k8s.io/cli-runtime v0.32.2 // indirect
+	k8s.io/component-helpers v0.32.2 // indirect
 	k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
 	k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
-	k8s.io/metrics v0.32.1 // indirect
+	k8s.io/metrics v0.32.2 // indirect
 	oras.land/oras-go v1.2.5 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
 	sigs.k8s.io/kustomize/api v0.18.0 // indirect
@@ -383,20 +383,20 @@ replace (
 
 	// Pin Kube libraries to v0.32
 	// These should be upgraded collectively
-	k8s.io/api => k8s.io/api v0.32.1
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.1
-	k8s.io/apimachinery => k8s.io/apimachinery v0.32.1
-	k8s.io/apiserver => k8s.io/apiserver v0.32.1
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.1
-	k8s.io/client-go => k8s.io/client-go v0.32.1
-	k8s.io/code-generator => k8s.io/code-generator v0.32.1
-	k8s.io/component-base => k8s.io/component-base v0.32.1
-	k8s.io/component-helpers => k8s.io/component-helpers v0.32.1
-	// version of kube-openapi used by client-go v0.32.1
-	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2
-	k8s.io/kubectl => k8s.io/kubectl v0.32.1
-	k8s.io/metrics => k8s.io/metrics v0.32.1
-	k8s.io/utils => k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
+	k8s.io/api => k8s.io/api v0.32.2
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.2
+	k8s.io/apimachinery => k8s.io/apimachinery v0.32.2
+	k8s.io/apiserver => k8s.io/apiserver v0.32.2
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.2
+	k8s.io/client-go => k8s.io/client-go v0.32.2
+	k8s.io/code-generator => k8s.io/code-generator v0.32.2
+	k8s.io/component-base => k8s.io/component-base v0.32.2
+	k8s.io/component-helpers => k8s.io/component-helpers v0.32.2
+	// version of kube-openapi used by client-go v0.32.2
+	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
+	k8s.io/kubectl => k8s.io/kubectl v0.32.2
+	k8s.io/metrics => k8s.io/metrics v0.32.2
+	k8s.io/utils => k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
 )
 
 exclude (