From 85215b7dd4381aab97c294b0a727636940d9d090 Mon Sep 17 00:00:00 2001 From: Adi Muraru Date: Mon, 16 Nov 2026 17:44:45 +0100 Subject: [PATCH] feat(operator): manage Kubernetes compatibility and REST observability Centralize Kubernetes targets, refresh supported boundaries in dependency automation, and verify chart/documentation consistency. Pin runtime tooling, expose REST-client metrics, and harden CI downloads. Refs #368, #375, #386. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/actions/kind-create/action.yaml | 4 +- .github/workflows/ci.yml | 67 +++- .github/workflows/e2e-test.yaml | 40 ++- .github/workflows/update-go-deps.yml | 55 ++-- .gitignore | 1 + AGENTS.md | 13 +- Makefile | 14 +- README.md | 6 +- charts/kafka-operator/Chart.yaml | 1 + charts/kafka-operator/README.md | 6 +- charts/kafka-operator/README.md.gotmpl | 12 +- config/kubernetes-versions.env | 17 + docs/monitoring.md | 41 ++- go.mod | 2 +- go.sum | 4 +- main.go | 10 + main_test.go | 64 ++++ scripts/update-kubernetes-versions/files.go | 154 +++++++++ scripts/update-kubernetes-versions/main.go | 296 ++++++++++++++++++ .../update-kubernetes-versions/main_test.go | 166 ++++++++++ tests/e2e/go.mod | 2 +- tests/e2e/go.sum | 4 +- .../banzaicloud/operator-tools/go.mod | 2 +- .../banzaicloud/operator-tools/go.sum | 4 +- 24 files changed, 926 insertions(+), 59 deletions(-) create mode 100644 config/kubernetes-versions.env create mode 100644 main_test.go create mode 100644 scripts/update-kubernetes-versions/files.go create mode 100644 scripts/update-kubernetes-versions/main.go create mode 100644 scripts/update-kubernetes-versions/main_test.go diff --git a/.github/actions/kind-create/action.yaml b/.github/actions/kind-create/action.yaml index 32ec7cc08..707ee6053 100644 --- a/.github/actions/kind-create/action.yaml +++ b/.github/actions/kind-create/action.yaml @@ -6,9 +6,8 @@ inputs: # adding these parameters to make this reusable later on required: true default: "e2e-kind" kind_k8s_version: - description: 'The k8s version to use' + description: 'The Kubernetes target from config/kubernetes-versions.env, prefixed with v' required: true - default: 'v1.37.0' # renovate: datasource=docker depName=kindest/node kind_config: description: 'Path to the kind config to use' required: true @@ -30,6 +29,7 @@ runs: cluster_name: ${{ inputs.kind_cluster_name }} version: v0.33.0 # renovate: datasource=github-releases depName=kubernetes-sigs/kind node_image: kindest/node:${{ inputs.kind_k8s_version }} + kubectl_version: ${{ inputs.kind_k8s_version }} config: ${{ inputs.kind_config }} - name: Verify all nodes are healthy, recreating the cluster otherwise diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2708796f4..03c6d451f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,6 +11,18 @@ concurrency: cancel-in-progress: true jobs: + kubernetes-versions: + name: Read Kubernetes targets + runs-on: ubuntu-26.04 + outputs: + matrix: ${{ steps.versions.outputs.matrix }} + steps: + - uses: actions/checkout@v7 + - id: versions + run: | + source config/kubernetes-versions.env + echo "matrix=$(jq -cn --arg min "$KUBERNETES_MIN_VERSION" --arg max "$KUBERNETES_MAX_VERSION" '[$min, $max] | unique')" >> "$GITHUB_OUTPUT" + check-integrity: name: Check integrity runs-on: ubuntu-26.04 @@ -26,6 +38,26 @@ jobs: working-directory: charts/kafka-operator fail-on-diff: true + - name: Setup Helm + uses: azure/setup-helm@v5 + with: + version: '4.3.1' # renovate: datasource=github-releases depName=helm/helm + + - name: Check supported Kubernetes chart versions + run: | + source config/kubernetes-versions.env + for version in "$KUBERNETES_MIN_VERSION" "$KUBERNETES_MAX_VERSION"; do + helm lint charts/kafka-operator --strict --kube-version "$version" + helm template kafka-operator charts/kafka-operator --kube-version "$version" > /dev/null + done + IFS=. read -r major minor _ <<< "$KUBERNETES_MIN_VERSION" + unsupported="${major}.$((minor - 1)).99" + if output=$(helm template kafka-operator charts/kafka-operator --kube-version "$unsupported" 2>&1); then + echo "::error::Chart must reject unsupported Kubernetes ${unsupported}" + exit 1 + fi + grep -F 'kubeVersion' <<< "$output" + - name: Set up Go uses: actions/setup-go@v7 with: @@ -45,6 +77,9 @@ jobs: popd > /dev/null done + - name: Check managed Kubernetes versions + run: make check-kubernetes-versions + - name: Check generated file integrity run: | make generate manifests @@ -57,8 +92,15 @@ jobs: build: name: Build runs-on: ubuntu-26.04 + needs: test + if: ${{ always() }} steps: + - name: Require successful Kubernetes test matrix + env: + TEST_RESULT: ${{ needs.test.result }} + run: test "$TEST_RESULT" = success + - name: Checkout code uses: actions/checkout@v7 @@ -122,12 +164,29 @@ jobs: run: | make lint - - name: Run tests - run: | - make test - - name: Save license cache uses: actions/cache/save@v6 with: path: .licensei.cache key: ci-license-v1-${{ hashFiles('**/go.sum') }} + + test: + name: Test (Kubernetes ${{ matrix.kubernetes-version }}) + runs-on: ubuntu-26.04 + needs: kubernetes-versions + strategy: + fail-fast: false + matrix: + kubernetes-version: ${{ fromJSON(needs.kubernetes-versions.outputs.matrix) }} + + steps: + - name: Checkout code + uses: actions/checkout@v7 + + - name: Set up Go + uses: actions/setup-go@v7 + with: + go-version-file: go.mod + + - name: Run tests + run: make test ENVTEST_K8S_VERSION=${{ matrix.kubernetes-version }} diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml index 0c957d5de..7fcaa0690 100644 --- a/.github/workflows/e2e-test.yaml +++ b/.github/workflows/e2e-test.yaml @@ -14,8 +14,26 @@ env: REPOSITORY: koperator_e2e_test jobs: + kubernetes-versions: + name: Read Kubernetes targets + runs-on: ubuntu-26.04 + outputs: + matrix: ${{ steps.versions.outputs.matrix }} + steps: + - uses: actions/checkout@v7 + - id: versions + run: | + source config/kubernetes-versions.env + echo "matrix=$(jq -cn --arg min "$KUBERNETES_MIN_VERSION" --arg max "$KUBERNETES_MAX_VERSION" '[$min, $max] | unique')" >> "$GITHUB_OUTPUT" + build: + name: E2E (Kubernetes ${{ matrix.kubernetes-version }}) runs-on: ubuntu-26.04 + needs: kubernetes-versions + strategy: + fail-fast: false + matrix: + kubernetes-version: ${{ fromJSON(needs.kubernetes-versions.outputs.matrix) }} steps: - name: Checkout code @@ -65,6 +83,8 @@ jobs: - name: Setup Kind cluster id: setup-kind uses: ./.github/actions/kind-create + with: + kind_k8s_version: v${{ matrix.kubernetes-version }} - name: Load image into kind cluster run: | @@ -72,13 +92,21 @@ jobs: - name: Download dependencies + timeout-minutes: 20 run: | - # Download dependencies for all modules - go mod download - cd api && go mod download && cd .. - cd properties && go mod download && cd .. - cd tests/e2e && go mod download && cd ../.. - + for module in . api properties tests/e2e; do + attempt=1 + until timeout --kill-after=10s 180s go -C "$module" mod download; do + if [ "$attempt" -ge 5 ]; then + echo "::error::Dependency download for ${module} failed after ${attempt} attempts" + exit 1 + fi + delay=$((5 << (attempt - 1))) + echo "::warning::Dependency download for ${module} failed (attempt ${attempt}/5); retrying in ${delay}s" + sleep "$delay" + attempt=$((attempt + 1)) + done + done - name: Run E2E tests env: diff --git a/.github/workflows/update-go-deps.yml b/.github/workflows/update-go-deps.yml index c63b6026d..37a666e69 100644 --- a/.github/workflows/update-go-deps.yml +++ b/.github/workflows/update-go-deps.yml @@ -1,4 +1,4 @@ -name: Update Go Dependencies +name: Update Dependencies on: schedule: @@ -12,7 +12,7 @@ permissions: jobs: update-dependencies: - name: Update Go Dependencies + name: Update Dependencies runs-on: ubuntu-26.04 steps: @@ -30,6 +30,9 @@ jobs: - name: Update Go dependencies run: make update-go-deps + - name: Update supported Kubernetes targets + run: make update-kubernetes-versions + - name: Tidy dependencies run: make tidy @@ -43,9 +46,9 @@ jobs: id: check_changes run: | if [ -n "$(git status --porcelain)" ]; then - echo "has_changes=true" >> $GITHUB_OUTPUT + echo "has_changes=true" >> "$GITHUB_OUTPUT" else - echo "has_changes=false" >> $GITHUB_OUTPUT + echo "has_changes=false" >> "$GITHUB_OUTPUT" fi - name: Create Pull Request @@ -53,23 +56,35 @@ jobs: uses: peter-evans/create-pull-request@v8 with: token: ${{ secrets.PAT }} - commit-message: 'chore(deps): update Go dependencies' - title: 'chore(deps): update Go dependencies' + commit-message: 'chore(deps): update Go dependencies and Kubernetes targets' + title: 'chore(deps): update Go dependencies and Kubernetes targets' body: | - ## Automated Go Dependencies Update - - This PR updates Go module dependencies to their latest versions. - - ### Changes made: - - Updated Go module dependencies via `make update-go-deps` - - Bumped `CONTROLLER_GEN_VERSION` in the Makefile to the latest release - - Regenerated manifests via `make generate manifests` - - Applied formatting and linting fixes via `make fmt lint-fix` - - Please review the changes and ensure all tests pass before merging. - - --- - *Generated by https://github.com/adobe/koperator/blob/main/.github/workflows/update-go-deps.yml* + ## Description + + Update Go dependencies/tooling and the managed Kubernetes test targets. + Regenerate manifests and derived support documentation. References #386. + + Kubernetes targets follow the oldest/newest upstream-supported minors. + Review any increase to the minimum supported version. CI validation is required. + + ## Type of Change + + - [ ] Bug Fix + - [ ] New Feature + - [ ] Breaking Change + - [ ] Refactor + - [ ] Documentation + - [x] Other (please describe): dependency and Kubernetes target updates + + ## Checklist + + - [ ] I have read the [contributing guidelines](../CONTRIBUTING.md) + - [x] Existing issues have been referenced (where applicable) + - [ ] I have verified this change is not present in other open pull requests + - [ ] Functionality is documented + - [ ] All code style checks pass + - [ ] New code contribution is covered by automated tests + - [ ] All new and existing tests pass branch: automated/update-go-deps delete-branch: true labels: | diff --git a/.gitignore b/.gitignore index 64ead7802..f346f900b 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ manager_image_patch.yaml **/go.work **/go.work.sum .claude/worktrees/** +/improvement-plan.md diff --git a/AGENTS.md b/AGENTS.md index 012cd76fb..13776ccac 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -7,6 +7,7 @@ - **Language**: Go - **Framework**: Kubebuilder v2 with controller-runtime - **Primary CRD**: `KafkaCluster` (v1beta1) +- **Minimum Kubernetes server version**: 1.35.0; CI targets: 1.35.0 and 1.37.0, managed in config/kubernetes-versions.env - **Key Features**: Fine-grained broker management, Cruise Control integration, multiple ingress options (Envoy, Istio, Contour) ## Architecture @@ -27,7 +28,7 @@ This is a standard Kubernetes operator using: 6. **AlertManagerForKafka** - Self-healing based on Prometheus alerts ### Multi-Module Structure -Uses Go workspaces with 5+ modules: +Uses multiple Go modules with local replacements: - Main: `/go.mod` - API: `/api/go.mod` - Properties parser: `/properties/go.mod` @@ -88,7 +89,7 @@ make run # Run operator locally (outside cluster) ### Important Make Variables - `IMG` - Operator image name (default: `ghcr.io/adobe/koperator:latest`) -- `ENVTEST_K8S_VERSION` - Kubernetes version for envtest assets (default: 1.36.2) +- `ENVTEST_K8S_VERSION` - Defaults to KUBERNETES_MAX_VERSION from config/kubernetes-versions.env; use `make test ENVTEST_K8S_VERSION=1.35.0` for the lower CI boundary ## Development Workflows @@ -421,11 +422,11 @@ GitHub Actions workflows (`.github/workflows/`): ## Key Dependencies -- **controller-runtime** v0.22.4 - Operator framework -- **k8s.io/*** v0.34.3 - Kubernetes client libraries -- **IBM/sarama** v1.46.3 - Kafka client +- **controller-runtime** v0.25.3 - Operator framework +- **k8s.io/*** v0.37.1 - Kubernetes client libraries +- **IBM/sarama** v1.61.1 - Kafka client - **Ginkgo** v2 - BDD testing framework -- **cert-manager** v1.19.2 - Certificate management integration +- **cert-manager** v1.21.2 - Certificate management integration ## Troubleshooting diff --git a/Makefile b/Makefile index 393e8348f..c681169a1 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ SHELL = /bin/bash .SHELLFLAGS := -eu -o pipefail -c PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST)))) +include $(PROJECT_DIR)/config/kubernetes-versions.env BIN_DIR := $(PROJECT_DIR)/bin BOILERPLATE_DIR := $(PROJECT_DIR)/hack/boilerplate @@ -9,7 +10,7 @@ BOILERPLATE_DIR := $(PROJECT_DIR)/hack/boilerplate TAG ?= $(shell git describe --tags --dirty --always --abbrev=0 --match '[0-9].*[0-9].*[0-9]*' 2>/dev/null) IMG ?= ghcr.io/adobe/kafka-operator:$(TAG) -# Produce CRDs that work back to Kubernetes 1.11 (no version conversion) +# Generate CRDs for the supported Kubernetes server range (no version conversion). CRD_OPTIONS ?= "crd" RELEASE_TYPE ?= p @@ -21,8 +22,8 @@ REL_TAG = $(shell ./scripts/increment_version.sh -${RELEASE_TYPE} ${TAG}) GOLANGCI_VERSION = 2.15.0 # renovate: datasource=github-releases depName=golangci/golangci-lint LICENSEI_VERSION = 0.9.0 # renovate: datasource=github-releases depName=goph/licensei CONTROLLER_GEN_VERSION = v0.22.0 # kept in sync with kubernetes-sigs/controller-tools by `make update-go-deps` -ENVTEST_K8S_VERSION = 1.37.0 # renovate: datasource=github-releases depName=kubernetes-sigs/controller-tools extractVersion=^envtest-v(?.+)$ -SETUP_ENVTEST_VERSION := latest +ENVTEST_K8S_VERSION = $(KUBERNETES_MAX_VERSION) +SETUP_ENVTEST_VERSION = v0.25.3 # renovate: datasource=github-releases depName=kubernetes-sigs/controller-runtime ADDLICENSE_VERSION = 1.2.0 # renovate: datasource=github-releases depName=google/addlicense GOTEMPLATE_VERSION = 3.12.1 # renovate: datasource=github-releases depName=coveooss/gotemplate MOCKGEN_VERSION = 0.6.0 # renovate: datasource=github-releases depName=uber-go/mock @@ -335,6 +336,13 @@ define update-module-deps go mod tidy endef +.PHONY: update-kubernetes-versions check-kubernetes-versions +update-kubernetes-versions: ## Update supported Kubernetes pins and derived documentation. + go run ./scripts/update-kubernetes-versions -update + +check-kubernetes-versions: ## Check committed Kubernetes pins and derived documentation offline. + go run ./scripts/update-kubernetes-versions -check + update-go-deps: ## Update Go modules dependencies. @echo "Updating third_party modules first (deepest to shallowest)..." @for gomod in $$(find ./third_party -name "go.mod" 2>/dev/null | awk '{print length, $$0}' | sort -rn | cut -d' ' -f2-); do \ diff --git a/README.md b/README.md index 9fe6c358b..2fd9bbfaf 100644 --- a/README.md +++ b/README.md @@ -62,9 +62,13 @@ If you want to learn more about our design motivations and the scenarios that dr This quick start guide will walk you through the process of deploying Koperator on an existing Kubernetes cluster and provisioning a Kafka cluster using its custom resources. +### Kubernetes support + +Koperator requires **Kubernetes 1.35.0 or newer** and tracks upstream-maintained minor releases. CI tests 1.35.0 and 1.37.0 using envtest and Kind. Pins live in [config/kubernetes-versions.env](config/kubernetes-versions.env); the weekly dependency updater selects the oldest/newest supported minors and the newest patches available for both test tools. Kubernetes client-library versions do not change this policy. + ### Prerequisites -To complete this guide, you will need a Kubernetes cluster (with a suggested minimum of 6 vCPUs and 8 GB RAM). You can run the cluster locally using Kind or Minikube. +To complete this guide, you will need a Kubernetes 1.35.0+ cluster (with a suggested minimum of 6 vCPUs and 8 GB RAM). You can run the cluster locally using Kind or Minikube. > The quick start will help you set up a functioning Kafka cluster on Kubernetes. However, it does not include guidance on the installation of Prometheus and cert-manager, which are necessary for some of the more advanced functionality. diff --git a/charts/kafka-operator/Chart.yaml b/charts/kafka-operator/Chart.yaml index 52b0f682c..fe7910646 100644 --- a/charts/kafka-operator/Chart.yaml +++ b/charts/kafka-operator/Chart.yaml @@ -5,3 +5,4 @@ description: kafka-operator manages Kafka deployments on Kubernetes sources: - https://github.com/adobe/koperator appVersion: "0.32.0" +kubeVersion: ">=1.35.0-0" diff --git a/charts/kafka-operator/README.md b/charts/kafka-operator/README.md index ad1e37556..47c5fe046 100644 --- a/charts/kafka-operator/README.md +++ b/charts/kafka-operator/README.md @@ -4,9 +4,11 @@ The [Koperator](https://github.com/adobe/koperator) is a Kubernetes operator to ## Prerequisites -- Kubernetes 1.15.0+ +- Kubernetes 1.35.0+ - Helm 3.8+ (for OCI registry support) +CI covers Kubernetes 1.35.0 and 1.37.0. The chart's `kubeVersion` constraint also accepts distribution-specific version suffixes. + ## Installing the chart Before installing the chart, you must first install the Koperator CustomResourceDefinition resources. @@ -94,7 +96,7 @@ The command removes all the Kubernetes components associated with the chart and | prometheusMetrics.authProxy.enabled | bool | `true` | If true, use auth proxy for Prometheus metrics | | prometheusMetrics.authProxy.image.pullPolicy | string | `"IfNotPresent"` | Auth proxy container image pull policy | | prometheusMetrics.authProxy.image.repository | string | `"quay.io/brancz/kube-rbac-proxy"` | Auth proxy container image repository | -| prometheusMetrics.authProxy.image.tag | string | `"v0.22.1"` | Auth proxy container image tag | +| prometheusMetrics.authProxy.image.tag | string | `"v0.23.1"` | Auth proxy container image tag | | prometheusMetrics.authProxy.serviceAccount.create | bool | `true` | If true, create the service account (see `prometheusMetrics.authProxy.serviceAccount.name`) used by prometheus auth proxy | | prometheusMetrics.authProxy.serviceAccount.name | string | `"kafka-operator-authproxy"` | ServiceAccount used by prometheus auth proxy | | prometheusMetrics.enabled | bool | `true` | If true, use direct access for Prometheus metrics | diff --git a/charts/kafka-operator/README.md.gotmpl b/charts/kafka-operator/README.md.gotmpl index 9670a831b..4a315da8c 100644 --- a/charts/kafka-operator/README.md.gotmpl +++ b/charts/kafka-operator/README.md.gotmpl @@ -4,19 +4,21 @@ The [Koperator](https://github.com/adobe/koperator) is a Kubernetes operator to ## Prerequisites -- Kubernetes 1.15.0+ +- Kubernetes 1.35.0+ - Helm 3.8+ (for OCI registry support) +CI covers Kubernetes 1.35.0 and 1.37.0. The chart's `kubeVersion` constraint also accepts distribution-specific version suffixes. + ## Installing the chart Before installing the chart, you must first install the Koperator CustomResourceDefinition resources. This is performed in a separate step to allow you to easily uninstall and reinstall Koperator without deleting your installed custom resources. ```bash -kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/master/config/base/crds/kafka.banzaicloud.io_cruisecontroloperations.yaml -kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/master/config/base/crds/kafka.banzaicloud.io_kafkaclusters.yaml -kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/master/config/base/crds/kafka.banzaicloud.io_kafkatopics.yaml -kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/master/config/base/crds/kafka.banzaicloud.io_kafkausers.yaml +kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/main/config/base/crds/kafka.banzaicloud.io_cruisecontroloperations.yaml +kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/main/config/base/crds/kafka.banzaicloud.io_kafkaclusters.yaml +kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/main/config/base/crds/kafka.banzaicloud.io_kafkatopics.yaml +kubectl apply -f https://raw.githubusercontent.com/adobe/koperator/refs/heads/main/config/base/crds/kafka.banzaicloud.io_kafkausers.yaml ``` To install the chart from the OCI registry. Use `--skip-crds` since the CRDs were already installed in the diff --git a/config/kubernetes-versions.env b/config/kubernetes-versions.env new file mode 100644 index 000000000..8385b0c14 --- /dev/null +++ b/config/kubernetes-versions.env @@ -0,0 +1,17 @@ +# Copyright 2026 Adobe. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Managed by make update-kubernetes-versions. +KUBERNETES_MIN_VERSION=1.35.0 +KUBERNETES_MAX_VERSION=1.37.0 diff --git a/docs/monitoring.md b/docs/monitoring.md index 2d90c185b..b6f802f1c 100644 --- a/docs/monitoring.md +++ b/docs/monitoring.md @@ -1 +1,40 @@ -The documentation of the Koperator project is available at the [Banzai Cloud Documentation Page](https://banzaicloud.com/docs/supertubes/kafka-operator/monitoring/). \ No newline at end of file +The documentation of the Koperator project is available at the [Banzai Cloud Documentation Page](https://banzaicloud.com/docs/supertubes/kafka-operator/monitoring/). + +## Kubernetes API client metrics + +The operator exposes controller-runtime's opt-in REST-client metrics on its +existing metrics endpoint: + +- `rest_client_request_duration_seconds` +- `rest_client_dns_resolution_duration_seconds` +- `rest_client_request_size_bytes` +- `rest_client_response_size_bytes` +- `rest_client_rate_limiter_duration_seconds` +- `rest_client_request_retries_total` + +The existing `rest_client_requests_total` counter remains enabled. Families +appear after the corresponding operation occurs; DNS and retry metrics may be +absent until a lookup or retry is needed. No resource names, UIDs, or error +messages are added as labels. + +Before changing cache, polling, apply, or concurrency behavior, compare API +request rates, latency, throttling time, retries, controller queue depth, +reconcile duration, and operator memory under the same workload. For example: + +```promql +sum by (method, code) (rate(rest_client_requests_total[5m])) +``` + +```promql +histogram_quantile(0.99, + sum by (verb, le) (rate(rest_client_request_duration_seconds_bucket[5m]))) +``` + +```promql +sum by (verb) (rate(rest_client_rate_limiter_duration_seconds_sum[5m])) +``` + +Record cluster size, resource counts, workload, test duration, leader changes, +and error rates with each measurement. These metrics establish instrumentation, +not evidence that an optimization improves performance. This change does not +alter metrics authentication, scraper routing, worker counts, or cache scope. \ No newline at end of file diff --git a/go.mod b/go.mod index 92071499f..905cc1e79 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( k8s.io/apiextensions-apiserver v0.37.1 k8s.io/apimachinery v0.37.1 k8s.io/client-go v0.37.1 - sigs.k8s.io/controller-runtime v0.25.2 + sigs.k8s.io/controller-runtime v0.25.3 sigs.k8s.io/yaml v1.6.0 ) diff --git a/go.sum b/go.sum index 03967fd0f..bb7969981 100644 --- a/go.sum +++ b/go.sum @@ -323,8 +323,8 @@ k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad h1:oXImqH8mQNk7PmvzKhmN3d k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad/go.mod h1:0/mqHCVhlumdJ3BhCfnjSZQE037nAhNodh1/hK0T8/I= k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 h1:jVkFFVfXdXP74B/zbO3hM3hpSFD0xvhQ5U686DPurkE= k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3/go.mod h1:M2s5JB1lIYP3jzZdorPLHXIPJzt9vv2muW5a6L9DtNM= -sigs.k8s.io/controller-runtime v0.25.2 h1:bEkK3PVOIVK9X8QWLGVhJgmFc++47vfT6wakSzAOLsQ= -sigs.k8s.io/controller-runtime v0.25.2/go.mod h1:4QqLdT6z/L6Olj8JJCtvztid4/fnIiYsfaTFScegctc= +sigs.k8s.io/controller-runtime v0.25.3 h1:b4OcZSY/aKHY8JG+rBlQmQ1xLs574+ZBEjv1dtfLd80= +sigs.k8s.io/controller-runtime v0.25.3/go.mod h1:4QqLdT6z/L6Olj8JJCtvztid4/fnIiYsfaTFScegctc= sigs.k8s.io/gateway-api v1.6.0 h1:735YBRj5NXFrOGX0GoSjwzUIzbz8kiEOfADsqHFmHgE= sigs.k8s.io/gateway-api v1.6.0/go.mod h1:FVfx3t389ybeXOqvDghLbdvJdSCfI/PReqCUI3lu3mY= sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5 h1:k9jo7ED/fsfOcz3L1P20P5tjTNtsdQNwMOG2aKzHrl8= diff --git a/main.go b/main.go index 0a62f715a..a854dd863 100644 --- a/main.go +++ b/main.go @@ -39,6 +39,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/healthz" + "sigs.k8s.io/controller-runtime/pkg/metrics" "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" @@ -67,6 +68,15 @@ var ( ) func init() { + metrics.RegisterRESTClientMetrics( + metrics.MetricRequestLatency, + metrics.MetricDNSResolutionLatency, + metrics.MetricRequestSize, + metrics.MetricResponseSize, + metrics.MetricRateLimiterLatency, + metrics.MetricRequestRetry, + ) + _ = clientgoscheme.AddToScheme(scheme) _ = banzaicloudv1alpha1.AddToScheme(scheme) diff --git a/main_test.go b/main_test.go new file mode 100644 index 000000000..b3841021d --- /dev/null +++ b/main_test.go @@ -0,0 +1,64 @@ +// Copyright 2026 Adobe. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package main + +import ( + "context" + "net/http" + "net/http/httptest" + "testing" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/rest" + "sigs.k8s.io/controller-runtime/pkg/metrics" +) + +func TestRESTRequestMetricsAreExposed(t *testing.T) { + apiServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { + w.Header().Set("Content-Type", "application/json") + _, _ = w.Write([]byte(`{"apiVersion":"v1","kind":"NamespaceList","items":[]}`)) + })) + defer apiServer.Close() + + client, err := kubernetes.NewForConfig(&rest.Config{Host: apiServer.URL}) + if err != nil { + t.Fatal(err) + } + if _, err := client.CoreV1().Namespaces().List(context.Background(), metav1.ListOptions{}); err != nil { + t.Fatal(err) + } + + families, err := metrics.Registry.Gather() + if err != nil { + t.Fatal(err) + } + for _, name := range []string{"rest_client_request_duration_seconds", "rest_client_response_size_bytes"} { + var observed bool + for _, family := range families { + if family.GetName() != name { + continue + } + for _, metric := range family.GetMetric() { + if metric.GetHistogram().GetSampleCount() > 0 { + observed = true + } + } + } + if !observed { + t.Errorf("%s has no observed REST request", name) + } + } +} diff --git a/scripts/update-kubernetes-versions/files.go b/scripts/update-kubernetes-versions/files.go new file mode 100644 index 000000000..4877aec75 --- /dev/null +++ b/scripts/update-kubernetes-versions/files.go @@ -0,0 +1,154 @@ +// Copyright 2026 Adobe. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package main + +import ( + "fmt" + "os" + "path/filepath" + "regexp" + "slices" + "strings" +) + +const pinsPath = "config/kubernetes-versions.env" + +func readPins(root string) (targets, error) { + data, err := os.ReadFile(filepath.Join(root, pinsPath)) + if err != nil { + return targets{}, err + } + values := map[string]string{} + for _, line := range strings.Split(string(data), "\n") { + line = strings.TrimSpace(line) + if line == "" || strings.HasPrefix(line, "#") { + continue + } + key, value, ok := strings.Cut(line, "=") + if !ok || (key != "KUBERNETES_MIN_VERSION" && key != "KUBERNETES_MAX_VERSION") || + values[key] != "" || numbers(value) == nil || strings.HasPrefix(value, "v") { + return targets{}, fmt.Errorf("invalid Kubernetes pin %q", line) + } + values[key] = value + } + result := targets{Minimum: values["KUBERNETES_MIN_VERSION"], Latest: values["KUBERNETES_MAX_VERSION"]} + if result.Minimum == "" || result.Latest == "" || compareVersion(result.Minimum, result.Latest) > 0 { + return targets{}, fmt.Errorf("invalid Kubernetes boundary pins") + } + return result, nil +} + +type replacement struct { + pattern string + value string +} + +func renderFiles(root string, pins targets) (map[string][]byte, error) { + n := numbers(pins.Minimum) + if n == nil || numbers(pins.Latest) == nil || compareVersion(pins.Minimum, pins.Latest) > 0 { + return nil, fmt.Errorf("invalid discovered Kubernetes pins") + } + floor := fmt.Sprintf("%d.%d.0", n[0], n[1]) + supportText := fmt.Sprintf( + "Koperator requires **Kubernetes %s or newer** and tracks upstream-maintained minor releases. "+ + "CI tests %s and %s using envtest and Kind. "+ + "Pins live in [config/kubernetes-versions.env](config/kubernetes-versions.env); "+ + "the weekly dependency updater selects the oldest/newest supported minors and the newest patches available for both test tools. "+ + "Kubernetes client-library versions do not change this policy.", floor, pins.Minimum, pins.Latest) + chartDocs := []replacement{ + {`(?m)^- Kubernetes [0-9.]+\+$`, "- Kubernetes " + floor + "+"}, + {`(?m)^CI covers Kubernetes .*$`, fmt.Sprintf("CI covers Kubernetes %s and %s. The chart's `kubeVersion` constraint also accepts distribution-specific version suffixes.", pins.Minimum, pins.Latest)}, + } + rules := map[string][]replacement{ + pinsPath: { + {`(?m)^KUBERNETES_MIN_VERSION=.*$`, "KUBERNETES_MIN_VERSION=" + pins.Minimum}, + {`(?m)^KUBERNETES_MAX_VERSION=.*$`, "KUBERNETES_MAX_VERSION=" + pins.Latest}, + }, + "charts/kafka-operator/Chart.yaml": { + {`(?m)^kubeVersion: .*$`, `kubeVersion: ">=` + floor + `-0"`}, + }, + "charts/kafka-operator/README.md.gotmpl": chartDocs, + "charts/kafka-operator/README.md": chartDocs, + "README.md": { + {`(?m)^Koperator requires \*\*Kubernetes .*$`, supportText}, + {`(?m)^To complete this guide, you will need a Kubernetes [0-9.]+\+ cluster`, "To complete this guide, you will need a Kubernetes " + floor + "+ cluster"}, + }, + "AGENTS.md": { + {`(?m)^- \*\*Minimum Kubernetes server version\*\*:.*$`, fmt.Sprintf("- **Minimum Kubernetes server version**: %s; CI targets: %s and %s, managed in config/kubernetes-versions.env", floor, pins.Minimum, pins.Latest)}, + {`(?m)^- ` + "`ENVTEST_K8S_VERSION`" + ` - .*$`, fmt.Sprintf("- `ENVTEST_K8S_VERSION` - Defaults to KUBERNETES_MAX_VERSION from config/kubernetes-versions.env; use `make test ENVTEST_K8S_VERSION=%s` for the lower CI boundary", pins.Minimum)}, + }, + } + result := make(map[string][]byte, len(rules)) + for name, replacements := range rules { + data, err := os.ReadFile(filepath.Join(root, name)) + if err != nil { + return nil, err + } + for _, r := range replacements { + pattern := regexp.MustCompile(r.pattern) + if len(pattern.FindAllIndex(data, -1)) != 1 { + return nil, fmt.Errorf("expected one managed field matching %q in %s", r.pattern, name) + } + data = pattern.ReplaceAllLiteral(data, []byte(r.value)) + } + result[name] = data + } + return result, nil +} + +func update(root string, discover func() (targets, error)) error { + pins, err := discover() + if err != nil { + return err + } + files, err := renderFiles(root, pins) + if err != nil { + return err + } + names := make([]string, 0, len(files)) + for name := range files { + names = append(names, name) + } + slices.Sort(names) + for _, name := range names { + path := filepath.Join(root, name) + if err := os.WriteFile(path, files[name], 0o644); err != nil { + return err + } + } + fmt.Printf("Pinned Kubernetes test boundaries: %s and %s\n", pins.Minimum, pins.Latest) + return nil +} + +func check(root string) error { + pins, err := readPins(root) + if err != nil { + return err + } + expected, err := renderFiles(root, pins) + if err != nil { + return err + } + for name, want := range expected { + actual, err := os.ReadFile(filepath.Join(root, name)) + if err != nil { + return err + } + if string(actual) != string(want) { + return fmt.Errorf("%s differs from managed Kubernetes pins; run make update-kubernetes-versions", name) + } + } + return nil +} diff --git a/scripts/update-kubernetes-versions/main.go b/scripts/update-kubernetes-versions/main.go new file mode 100644 index 000000000..0ada3c56d --- /dev/null +++ b/scripts/update-kubernetes-versions/main.go @@ -0,0 +1,296 @@ +// Copyright 2026 Adobe. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package main + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "io" + "net/http" + "net/url" + "os" + "regexp" + "slices" + "strconv" + "strings" + "time" + + "sigs.k8s.io/yaml" +) + +const ( + scheduleURL = "https://raw.githubusercontent.com/kubernetes/website/main/data/releases/schedule.yaml" + envtestURL = "https://raw.githubusercontent.com/kubernetes-sigs/controller-tools/HEAD/envtest-releases.yaml" + kindTagsURL = "https://hub.docker.com/v2/repositories/kindest/node/tags?" +) + +var ( + stableVersion = regexp.MustCompile(`^v?([0-9]+)\.([0-9]+)\.([0-9]+)$`) + platforms = []string{"linux-amd64", "linux-arm64", "darwin-amd64", "darwin-arm64"} +) + +type asset struct { + Hash string `json:"hash"` + SelfLink string `json:"selfLink"` +} + +type targets struct { + Minimum string + Latest string +} + +func numbers(value string) []int { + match := stableVersion.FindStringSubmatch(value) + if match == nil { + return nil + } + result := make([]int, 3) + for i := range result { + n, err := strconv.Atoi(match[i+1]) + if err != nil { + return nil + } + result[i] = n + } + return result +} + +func compareVersion(a, b string) int { + left, right := numbers(a), numbers(b) + for i := range left { + if left[i] < right[i] { + return -1 + } + if left[i] > right[i] { + return 1 + } + } + return 0 +} + +func supportedMinors(data []byte, now time.Time) ([]string, error) { + var metadata struct { + Schedules []struct { + Release string `json:"release"` + ReleaseDate string `json:"releaseDate"` + EOL string `json:"endOfLifeDate"` + } `json:"schedules"` + } + if err := yaml.Unmarshal(data, &metadata); err != nil { + return nil, fmt.Errorf("decode Kubernetes lifecycle metadata: %w", err) + } + today := now.UTC().Truncate(24 * time.Hour) + var result []string + for _, release := range metadata.Schedules { + if numbers(release.Release+".0") == nil { + continue + } + start, startErr := time.Parse(time.DateOnly, release.ReleaseDate) + end, endErr := time.Parse(time.DateOnly, release.EOL) + if startErr != nil || endErr != nil || end.Before(start) { + return nil, fmt.Errorf("invalid lifecycle dates for Kubernetes %s", release.Release) + } + if !today.Before(start) && !today.After(end) { + result = append(result, release.Release+".0") + } + } + if len(result) == 0 { + return nil, fmt.Errorf("no released, maintained Kubernetes minors found") + } + slices.SortFunc(result, compareVersion) + result = slices.Compact(result) + for i := range result { + result[i] = strings.TrimSuffix(result[i], ".0") + } + return result, nil +} + +func selectVersion(minor string, kindTags []string, releases map[string]map[string]asset) (string, error) { + var candidates []string + for _, tag := range kindTags { + value := strings.TrimPrefix(tag, "v") + n := numbers(value) + if n == nil || fmt.Sprintf("%d.%d", n[0], n[1]) != minor { + continue + } + available := true + for _, platform := range platforms { + a := releases["v"+value]["envtest-v"+value+"-"+platform+".tar.gz"] + if a.Hash == "" || a.SelfLink == "" { + available = false + break + } + } + if available { + candidates = append(candidates, value) + } + } + if len(candidates) == 0 { + return "", fmt.Errorf("no common stable Kind/envtest assets for Kubernetes %s", minor) + } + slices.SortFunc(candidates, compareVersion) + return candidates[len(candidates)-1], nil +} + +type fetcher struct { + client *http.Client + delay func(context.Context, time.Duration) error +} + +func (f fetcher) get(ctx context.Context, address string) ([]byte, error) { + var lastErr error + for attempt := 0; attempt < 3; attempt++ { + if attempt > 0 { + if err := f.delay(ctx, time.Second<=1.34.0-0\"\n", + "charts/kafka-operator/README.md": "- Kubernetes 1.34.0+\nCI covers Kubernetes 1.34.0 and 1.37.0.\n", + "charts/kafka-operator/README.md.gotmpl": "- Kubernetes 1.34.0+\nCI covers Kubernetes 1.34.0 and 1.37.0.\n", + "README.md": "Koperator requires **Kubernetes 1.34.0 or newer**.\nTo complete this guide, you will need a Kubernetes 1.34.0+ cluster.\n", + "AGENTS.md": "- **Minimum Kubernetes server version**: 1.34.0\n- `ENVTEST_K8S_VERSION` - Kubernetes version for envtest assets\n", + } + + for name, text := range fixtures { + path := filepath.Join(root, name) + if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil { + t.Fatal(err) + } + if err := os.WriteFile(path, []byte(text), 0o644); err != nil { + t.Fatal(err) + } + } + discover := func() (targets, error) { return targets{Minimum: "1.35.9", Latest: "1.37.1"}, nil } + if err := update(root, discover); err != nil { + t.Fatal(err) + } + if err := check(root); err != nil { + t.Fatal(err) + } + chart := filepath.Join(root, "charts/kafka-operator/Chart.yaml") + data, err := os.ReadFile(chart) + if err != nil || string(data) != "kubeVersion: \">=1.35.0-0\"\n" { + t.Fatalf("floor must follow the minor, not the test patch: %q, %v", data, err) + } + if err := os.WriteFile(chart, []byte(fixtures["charts/kafka-operator/Chart.yaml"]), 0o644); err != nil { + t.Fatal(err) + } + if err := check(root); err == nil { + t.Fatal("offline check accepted drifted chart metadata") + } +} + +func TestPinsRejectPrefixedVersions(t *testing.T) { + root := t.TempDir() + path := filepath.Join(root, pinsPath) + if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil { + t.Fatal(err) + } + if err := os.WriteFile(path, []byte("KUBERNETES_MIN_VERSION=v1.35.0\nKUBERNETES_MAX_VERSION=1.37.0\n"), 0o644); err != nil { + t.Fatal(err) + } + if _, err := readPins(root); err == nil { + t.Fatal("accepted a v-prefixed pin that would produce an invalid vv-prefixed Kind target") + } +} diff --git a/tests/e2e/go.mod b/tests/e2e/go.mod index a80fda2dc..5ae623e60 100644 --- a/tests/e2e/go.mod +++ b/tests/e2e/go.mod @@ -190,7 +190,7 @@ require ( k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad // indirect k8s.io/streaming v0.37.1 // indirect k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 // indirect - sigs.k8s.io/controller-runtime v0.25.2 // indirect + sigs.k8s.io/controller-runtime v0.25.3 // indirect sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5 // indirect sigs.k8s.io/randfill v1.0.0 // indirect sigs.k8s.io/structured-merge-diff/v6 v6.4.2 // indirect diff --git a/tests/e2e/go.sum b/tests/e2e/go.sum index 96052645d..eba5969de 100644 --- a/tests/e2e/go.sum +++ b/tests/e2e/go.sum @@ -472,8 +472,8 @@ k8s.io/streaming v0.37.1 h1:TpzVfQeFuVndn2g9mFqxy1UcUYPwDzqjUmwR/IzJCWc= k8s.io/streaming v0.37.1/go.mod h1:APlJR26ZWRcVy5bIEj0QRrKUXROtBHPcxl2NT7EAzPU= k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 h1:jVkFFVfXdXP74B/zbO3hM3hpSFD0xvhQ5U686DPurkE= k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3/go.mod h1:M2s5JB1lIYP3jzZdorPLHXIPJzt9vv2muW5a6L9DtNM= -sigs.k8s.io/controller-runtime v0.25.2 h1:bEkK3PVOIVK9X8QWLGVhJgmFc++47vfT6wakSzAOLsQ= -sigs.k8s.io/controller-runtime v0.25.2/go.mod h1:4QqLdT6z/L6Olj8JJCtvztid4/fnIiYsfaTFScegctc= +sigs.k8s.io/controller-runtime v0.25.3 h1:b4OcZSY/aKHY8JG+rBlQmQ1xLs574+ZBEjv1dtfLd80= +sigs.k8s.io/controller-runtime v0.25.3/go.mod h1:4QqLdT6z/L6Olj8JJCtvztid4/fnIiYsfaTFScegctc= sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5 h1:k9jo7ED/fsfOcz3L1P20P5tjTNtsdQNwMOG2aKzHrl8= sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= diff --git a/third_party/github.com/banzaicloud/operator-tools/go.mod b/third_party/github.com/banzaicloud/operator-tools/go.mod index df0083060..a12f7862d 100644 --- a/third_party/github.com/banzaicloud/operator-tools/go.mod +++ b/third_party/github.com/banzaicloud/operator-tools/go.mod @@ -24,7 +24,7 @@ require ( k8s.io/apimachinery v0.37.1 k8s.io/client-go v0.37.1 k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 - sigs.k8s.io/controller-runtime v0.25.2 + sigs.k8s.io/controller-runtime v0.25.3 sigs.k8s.io/yaml v1.6.0 ) diff --git a/third_party/github.com/banzaicloud/operator-tools/go.sum b/third_party/github.com/banzaicloud/operator-tools/go.sum index 65e4cf149..cd9bdb7da 100644 --- a/third_party/github.com/banzaicloud/operator-tools/go.sum +++ b/third_party/github.com/banzaicloud/operator-tools/go.sum @@ -567,8 +567,8 @@ k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 h1:jVkFFVfXdXP74B/zbO3hM3hpSFD0x k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3/go.mod h1:M2s5JB1lIYP3jzZdorPLHXIPJzt9vv2muW5a6L9DtNM= oras.land/oras-go/v2 v2.6.2 h1:N04RXngAp1LJKTG6ifz3xHPipasEkWr+hFmInja5YKo= oras.land/oras-go/v2 v2.6.2/go.mod h1:PlTtg4JTDJkDe8yVHpM2wz7/YDc00GVas+i4jAW2TZ4= -sigs.k8s.io/controller-runtime v0.25.2 h1:bEkK3PVOIVK9X8QWLGVhJgmFc++47vfT6wakSzAOLsQ= -sigs.k8s.io/controller-runtime v0.25.2/go.mod h1:4QqLdT6z/L6Olj8JJCtvztid4/fnIiYsfaTFScegctc= +sigs.k8s.io/controller-runtime v0.25.3 h1:b4OcZSY/aKHY8JG+rBlQmQ1xLs574+ZBEjv1dtfLd80= +sigs.k8s.io/controller-runtime v0.25.3/go.mod h1:4QqLdT6z/L6Olj8JJCtvztid4/fnIiYsfaTFScegctc= sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5 h1:k9jo7ED/fsfOcz3L1P20P5tjTNtsdQNwMOG2aKzHrl8= sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= sigs.k8s.io/kustomize/api v0.21.1 h1:lzqbzvz2CSvsjIUZUBNFKtIMsEw7hVLJp0JeSIVmuJs=