diff --git a/.github/workflows/.env/nightly-tests/max_versions.env b/.github/workflows/.env/nightly-tests/max_versions.env index 29b84ac82a7..5586a84fa41 100644 --- a/.github/workflows/.env/nightly-tests/max_versions.env +++ b/.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' diff --git a/.github/workflows/.env/nightly-tests/min_versions.env b/.github/workflows/.env/nightly-tests/min_versions.env index c4a2a492d6b..8812c6f72c6 100644 --- a/.github/workflows/.env/nightly-tests/min_versions.env +++ b/.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' diff --git a/.github/workflows/.env/pr-tests/versions.env b/.github/workflows/.env/pr-tests/versions.env index 8bd1351e048..f467e4926f7 100644 --- a/.github/workflows/.env/pr-tests/versions.env +++ b/.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' + diff --git a/.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml b/.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml index e508db830d5..d143737f973 100644 --- a/.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml +++ b/.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: diff --git a/.github/workflows/composite-actions/regression-tests/action.yaml b/.github/workflows/composite-actions/regression-tests/action.yaml index 4b0616be6bd..6e9e10182b1 100644 --- a/.github/workflows/composite-actions/regression-tests/action.yaml +++ b/.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: diff --git a/.github/workflows/conformance-tests.yaml b/.github/workflows/conformance-tests.yaml index 2cd34c51d20..6dccc6d45f4 100644 --- a/.github/workflows/conformance-tests.yaml +++ b/.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: diff --git a/changelog/v1.19.0-beta10/k8s-1.32-bump.yaml b/changelog/v1.19.0-beta10/k8s-1.32-bump.yaml new file mode 100644 index 00000000000..f011c7b80e4 --- /dev/null +++ b/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 diff --git a/ci/cloudbuild/publish-artifacts.yaml b/ci/cloudbuild/publish-artifacts.yaml index 0de36bc7e57..3480565db3f 100644 --- a/ci/cloudbuild/publish-artifacts.yaml +++ b/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: diff --git a/ci/cloudbuild/run-tests.yaml b/ci/cloudbuild/run-tests.yaml index 1f7fb0a3712..055cb77f4d6 100644 --- a/ci/cloudbuild/run-tests.yaml +++ b/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' diff --git a/docs/content/static/content/osa_provided.md b/docs/content/static/content/osa_provided.md index 8e75caab2c9..a5792ee7f7a 100644 --- a/docs/content/static/content/osa_provided.md +++ b/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 diff --git a/go.mod b/go.mod index 8dca2993ce2..a1e515db546 100644 --- a/go.mod +++ b/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 ( diff --git a/go.sum b/go.sum index 17ec72b4347..957dcf123f2 100644 --- a/go.sum +++ b/go.sum @@ -2696,20 +2696,20 @@ github.com/solo-io/cue v0.4.7/go.mod h1:P1tN9y6nBPAMoEK5aJxI8kn0VUcjVcRc+8esieRz github.com/solo-io/go-list-licenses v0.1.4 h1:u4xh1OUORT4iSWuAp3Q4NsfHcDaeUV8QRDH8ACQqbxw= github.com/solo-io/go-list-licenses v0.1.4/go.mod h1:x6LSp/NrYgVXwNum7ZOiaAYTpg6B3F6TrWYfcdHVroA= github.com/solo-io/go-utils v0.20.2/go.mod h1:6e8K1spnMWwlnJRSNp/J84GEyJbrcK4Gm7i+ehzCi8c= -github.com/solo-io/go-utils v0.27.3 h1:1LxErw8pisPAuH1Vk6FKRgnvkwgm7mHrpjZow0hvfnA= -github.com/solo-io/go-utils v0.27.3/go.mod h1:cwbQIYO1/BeU4aPB0Yy8WzzS77dfVTZyCVqbA4YsRSY= -github.com/solo-io/k8s-utils v0.8.1 h1:Xqqze6RLWsHCYetbaiXDEnuhFRXyqw0azyogggK43H8= -github.com/solo-io/k8s-utils v0.8.1/go.mod h1:fOIFkh4+F45MmrUZEFx0pW75EvFYOR7v5/BIIQiSIwA= +github.com/solo-io/go-utils v0.27.4 h1:/VOXUZTsIfnP+aWeWdkiWI4hCyF8nODOr1x+TX+e+dk= +github.com/solo-io/go-utils v0.27.4/go.mod h1:xJncbCIrp5iovb95MReJQFf88q3P23NgB1RyGckzq7k= +github.com/solo-io/k8s-utils v0.9.0 h1:q3/KN8yJ0ps3eGWOjLOwSjdUpwsJHDl0puv0Ur7ZeBk= +github.com/solo-io/k8s-utils v0.9.0/go.mod h1:Yk4DdpjvFnTUl8+SwnoobjEy3/x9E9rdQ4ee5KLCBNI= github.com/solo-io/protoc-gen-ext v0.0.25 h1:UqNW/A4UqCO5aUFg7LYdV82tK0R2mqu7RFftYtT/Fu8= github.com/solo-io/protoc-gen-ext v0.0.25/go.mod h1:TZwUhbFtfd1fQQGBN6qWwtea0Fhi3V6DvGQnbqk3jf8= github.com/solo-io/protoc-gen-openapi v0.2.5 h1:l8YKsVks6JDFRzA9liYZIqauqpYRxHXnmHi4TjTIRf4= github.com/solo-io/protoc-gen-openapi v0.2.5/go.mod h1:osEjRl1miHqlq4Wl/8SEqHFoyydptPL1EzEdM9c4vfE= -github.com/solo-io/skv2 v0.41.0 h1:NRZUe83LquB8zR++SY36JKhw1abRd+SBuGUGAHS9rWA= -github.com/solo-io/skv2 v0.41.0/go.mod h1:GtEN0CCne94tm710YbefQh9YcMFcIu2X490g7Loq/Zs= -github.com/solo-io/solo-apis v0.0.0-20240917212400-9103ca169358 h1:yNJpr6sKTBUJ0XbYEdOZuFEr+umyq4XgB/GR1cbhCCI= -github.com/solo-io/solo-apis v0.0.0-20240917212400-9103ca169358/go.mod h1:xWaT1lP+nkAGYCuAtRdG1l4MsdKwphqeomC41AIsemY= -github.com/solo-io/solo-kit v0.36.4 h1:P1EsMDS81jNj2DK33GpKLxZ07vDmdZcGamKtenGIYuA= -github.com/solo-io/solo-kit v0.36.4/go.mod h1:tLK3BllHZZUZsvgG3paVzux8ccmItKadqLSg7nOltDw= +github.com/solo-io/skv2 v0.42.0 h1:MrrBJauarReCJdkVCB2PtWOVULE1IoJNTTWlQrfX4mc= +github.com/solo-io/skv2 v0.42.0/go.mod h1:LP0CYAp2tblmttNP4rlHbYUnIUHazh+LU8QLV36yHAo= +github.com/solo-io/solo-apis v0.0.0-20250218202255-bad789c9de63 h1:5SI9O39qJ1NZydCqfwVUK1kwLU6C2WHBu2xb2qXtZao= +github.com/solo-io/solo-apis v0.0.0-20250218202255-bad789c9de63/go.mod h1:n69+QnkG+YEbZtrAsLYjW9BEqfy2vPGrafan2+fUrMA= +github.com/solo-io/solo-kit v0.37.0 h1:hQmxb4OkA24MuFAfERtyK1loUxXdgrEaIrwPLp57urs= +github.com/solo-io/solo-kit v0.37.0/go.mod h1:Jdj9cmv2gWF+KIDAlmz9XMmb2MnDTtR6dkbw5gWfJOY= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -4074,24 +4074,24 @@ istio.io/client-go v1.25.0-alpha.0.0.20250210220843-5a4065fded65 h1:JikKtnwGCV1h istio.io/client-go v1.25.0-alpha.0.0.20250210220843-5a4065fded65/go.mod h1:40cl7CY83rmIUgLHYXNX5uGDhkx4tBZgzxqUpzTjV/A= istio.io/istio v0.0.0-20250212203644-c2ac935c5888 h1:4uIAapZvWqD/Vo8uLecH1hxC3EAE2aqUmq8rOzaXJws= istio.io/istio v0.0.0-20250212203644-c2ac935c5888/go.mod h1:k9mWJfHRkdIya53hz/BzKfKmVRk2/aiA2H1AF0KmDC0= -k8s.io/api v0.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc= -k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k= -k8s.io/apiextensions-apiserver v0.32.1 h1:hjkALhRUeCariC8DiVmb5jj0VjIc1N0DREP32+6UXZw= -k8s.io/apiextensions-apiserver v0.32.1/go.mod h1:sxWIGuGiYov7Io1fAS2X06NjMIk5CbRHc2StSmbaQto= -k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs= -k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= -k8s.io/apiserver v0.32.1 h1:oo0OozRos66WFq87Zc5tclUX2r0mymoVHRq8JmR7Aak= -k8s.io/apiserver v0.32.1/go.mod h1:UcB9tWjBY7aryeI5zAgzVJB/6k7E97bkr1RgqDz0jPw= -k8s.io/cli-runtime v0.32.1 h1:19nwZPlYGJPUDbhAxDIS2/oydCikvKMHsxroKNGA2mM= -k8s.io/cli-runtime v0.32.1/go.mod h1:NJPbeadVFnV2E7B7vF+FvU09mpwYlZCu8PqjzfuOnkY= -k8s.io/client-go v0.32.1 h1:otM0AxdhdBIaQh7l1Q0jQpmo7WOFIk5FFa4bg6YMdUU= -k8s.io/client-go v0.32.1/go.mod h1:aTTKZY7MdxUaJ/KiUs8D+GssR9zJZi77ZqtzcGXIiDg= -k8s.io/code-generator v0.32.1 h1:4lw1kFNDuFYXquTkB7Sl5EwPMUP2yyW9hh6BnFfRZFY= -k8s.io/code-generator v0.32.1/go.mod h1:zaILfm00CVyP/6/pJMJ3zxRepXkxyDfUV5SNG4CjZI4= -k8s.io/component-base v0.32.1 h1:/5IfJ0dHIKBWysGV0yKTFfacZ5yNV1sulPh3ilJjRZk= -k8s.io/component-base v0.32.1/go.mod h1:j1iMMHi/sqAHeG5z+O9BFNCF698a1u0186zkjMZQ28w= -k8s.io/component-helpers v0.32.1 h1:TwdsSM1vW9GjnfX18lkrZbwE5G9psCIS2/rhenTDXd8= -k8s.io/component-helpers v0.32.1/go.mod h1:1JT1Ei3FD29yFQ18F3laj1WyvxYdHIhyxx6adKMFQXI= +k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw= +k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y= +k8s.io/apiextensions-apiserver v0.32.2 h1:2YMk285jWMk2188V2AERy5yDwBYrjgWYggscghPCvV4= +k8s.io/apiextensions-apiserver v0.32.2/go.mod h1:GPwf8sph7YlJT3H6aKUWtd0E+oyShk/YHWQHf/OOgCA= +k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ= +k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/apiserver v0.32.2 h1:WzyxAu4mvLkQxwD9hGa4ZfExo3yZZaYzoYvvVDlM6vw= +k8s.io/apiserver v0.32.2/go.mod h1:PEwREHiHNU2oFdte7BjzA1ZyjWjuckORLIK/wLV5goM= +k8s.io/cli-runtime v0.32.2 h1:aKQR4foh9qeyckKRkNXUccP9moxzffyndZAvr+IXMks= +k8s.io/cli-runtime v0.32.2/go.mod h1:a/JpeMztz3xDa7GCyyShcwe55p8pbcCVQxvqZnIwXN8= +k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA= +k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94= +k8s.io/code-generator v0.32.2 h1:CIvyPrLWP7cMgrqval2qYT839YAwCDeSvGfXgWSNpHQ= +k8s.io/code-generator v0.32.2/go.mod h1:plh7bWk7JztAUkHM4zpbdy0KOMdrhsePcZL2HLWFH7Y= +k8s.io/component-base v0.32.2 h1:1aUL5Vdmu7qNo4ZsE+569PV5zFatM9hl+lb3dEea2zU= +k8s.io/component-base v0.32.2/go.mod h1:PXJ61Vx9Lg+P5mS8TLd7bCIr+eMJRQTyXe8KvkrvJq0= +k8s.io/component-helpers v0.32.2 h1:2usSAm3zNE5yu5DdAdrKBWLfSYNpU4OPjZywJY5ovP8= +k8s.io/component-helpers v0.32.2/go.mod h1:fvQAoiiOP7jUEUBc9qR0PXiBPuB0I56WTxTkkpcI8g8= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20230306165830-ab3349d207d4/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 h1:pWEwq4Asjm4vjW7vcsmijwBhOr1/shsbSYiWXmNGlks= @@ -4106,15 +4106,15 @@ k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kms v0.32.1/go.mod h1:Bk2evz/Yvk0oVrvm4MvZbgq8BD34Ksxs2SRHn4/UiOM= -k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 h1:GKE9U8BH16uynoxQii0auTjmmmuZ3O0LFMN6S0lPPhI= -k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2/go.mod h1:coRQXBK9NxO98XUv3ZD6AK3xzHCxV6+b7lrquKwaKzA= -k8s.io/kubectl v0.32.1 h1:/btLtXLQUU1rWx8AEvX9jrb9LaI6yeezt3sFALhB8M8= -k8s.io/kubectl v0.32.1/go.mod h1:sezNuyWi1STk4ZNPVRIFfgjqMI6XMf+oCVLjZen/pFQ= -k8s.io/metrics v0.32.1 h1:Ou4nrEtZS2vFf7OJCf9z3+2kr0A00kQzfoSwxg0gXps= -k8s.io/metrics v0.32.1/go.mod h1:cLnai9XKYby1tNMX+xe8p9VLzTqrxYPcmqfCBoWObcM= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/kms v0.32.2/go.mod h1:Bk2evz/Yvk0oVrvm4MvZbgq8BD34Ksxs2SRHn4/UiOM= +k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= +k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= +k8s.io/kubectl v0.32.2 h1:TAkag6+XfSBgkqK9I7ZvwtF0WVtUAvK8ZqTt+5zi1Us= +k8s.io/kubectl v0.32.2/go.mod h1:+h/NQFSPxiDZYX/WZaWw9fwYezGLISP0ud8nQKg+3g8= +k8s.io/metrics v0.32.2 h1:7t/rZzTHFrGa9f94XcgLlm3ToAuJtdlHANcJEHlYl9g= +k8s.io/metrics v0.32.2/go.mod h1:VL3nJpzcgB6L5nSljkkzoE0nilZhVgcjCfNRgoylaIQ= +k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= +k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= knative.dev/hack v0.0.0-20211122162614-813559cefdda/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/hack v0.0.0-20211203062838-e11ac125e707/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/networking v0.0.0-20211210083629-bace06e98aee h1:tMn0wtCgn2X+i+JiRk0mYHGrzI/7dZOkCPogz3u3qTU= @@ -4209,7 +4209,6 @@ sigs.k8s.io/kustomize/kyaml v0.18.1 h1:WvBo56Wzw3fjS+7vBjN6TeivvpbW9GmRaWZ9CIVmt sigs.k8s.io/kustomize/kyaml v0.18.1/go.mod h1:C3L2BFVU1jgcddNBE1TxuVLgS46TjObMwW5FT9FcjYo= sigs.k8s.io/mcs-api v0.1.1-0.20240624222831-d7001fe1d21c h1:F7hIEutAxtXDOQX9NXFdvhWmWETu2zmUPHuPPcAez7g= sigs.k8s.io/mcs-api v0.1.1-0.20240624222831-d7001fe1d21c/go.mod h1:DPFniRsBzCeLB4ANjlPEvQQt9QGIX489d1faK+GPvI4= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= sigs.k8s.io/structured-merge-diff/v4 v4.5.0 h1:nbCitCK2hfnhyiKo6uf2HxUPTCodY6Qaf85SbDIaMBk= sigs.k8s.io/structured-merge-diff/v4 v4.5.0/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=