From fcf21f1d78ae8d5a33fbb9d8c07b475a3678c0fb Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Mon, 4 Nov 2024 14:06:19 +0100 Subject: [PATCH 1/6] fix: fix image builds for non-amd64 architectures Signed-off-by: Simon Pasquier --- Dockerfile | 1 + Makefile | 8 ++++---- cmd/admission-webhook/Dockerfile | 1 + cmd/prometheus-config-reloader/Dockerfile | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 24bb22ce5..ffb80cf8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ ARG ARCH=amd64 ARG OS=linux ARG GOLANG_BUILDER=1.23 +ARG GOARCH= FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base as builder WORKDIR /workspace diff --git a/Makefile b/Makefile index 98ea31564..cfba6f8dd 100644 --- a/Makefile +++ b/Makefile @@ -193,21 +193,21 @@ image: .hack-operator-image .hack-prometheus-config-reloader-image .hack-admissi # Create empty target file, for the sole purpose of recording when this target # was last executed via the last-modification timestamp on the file. See # https://www.gnu.org/software/make/manual/make.html#Empty-Targets - $(CONTAINER_CLI) build --build-arg ARCH=$(ARCH) --build-arg OS=$(GOOS) -t $(IMAGE_OPERATOR):$(TAG) . + $(CONTAINER_CLI) build --build-arg ARCH=$(ARCH) --build-arg GOARCH=$(GOARCH) --build-arg OS=$(GOOS) -t $(IMAGE_OPERATOR):$(TAG) . touch $@ .hack-prometheus-config-reloader-image: cmd/prometheus-config-reloader/Dockerfile # Create empty target file, for the sole purpose of recording when this target # was last executed via the last-modification timestamp on the file. See # https://www.gnu.org/software/make/manual/make.html#Empty-Targets - $(CONTAINER_CLI) build --build-arg ARCH=$(ARCH) --build-arg OS=$(GOOS) -t $(IMAGE_RELOADER):$(TAG) -f cmd/prometheus-config-reloader/Dockerfile . + $(CONTAINER_CLI) build --build-arg ARCH=$(ARCH) --build-arg GOARCH=$(GOARCH) --build-arg OS=$(GOOS) -t $(IMAGE_RELOADER):$(TAG) -f cmd/prometheus-config-reloader/Dockerfile . touch $@ .hack-admission-webhook-image: cmd/admission-webhook/Dockerfile # Create empty target file, for the sole purpose of recording when this target # was last executed via the last-modification timestamp on the file. See # https://www.gnu.org/software/make/manual/make.html#Empty-Targets - $(CONTAINER_CLI) build --build-arg ARCH=$(ARCH) --build-arg OS=$(GOOS) -t $(IMAGE_WEBHOOK):$(TAG) -f cmd/admission-webhook/Dockerfile . + $(CONTAINER_CLI) build --build-arg ARCH=$(ARCH) --build-arg GOARCH=$(GOARCH) --build-arg OS=$(GOOS) -t $(IMAGE_WEBHOOK):$(TAG) -f cmd/admission-webhook/Dockerfile . touch $@ .PHONY: update-go-deps @@ -250,7 +250,7 @@ generate-crds: $(CONTROLLER_GEN_BINARY) $(GOJSONTOYAML_BINARY) $(TYPES_V1_TARGET .PHONY: generate-remote-write-certs generate-remote-write-certs: mkdir -p test/e2e/remote_write_certs && \ - (cd scripts && GOOS=$(OS) GOARCH=$(ARCH) go run -v ./certs/.) + (cd scripts && GOOS=$(OS) GOARCH=$(GOARCH) go run -v ./certs/.) .PHONY: generate-docs generate-docs: $(shell find Documentation -type f) diff --git a/cmd/admission-webhook/Dockerfile b/cmd/admission-webhook/Dockerfile index ef94977c2..c0377a144 100644 --- a/cmd/admission-webhook/Dockerfile +++ b/cmd/admission-webhook/Dockerfile @@ -1,6 +1,7 @@ ARG ARCH=amd64 ARG OS=linux ARG GOLANG_BUILDER=1.23 +ARG GOARCH= FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base as builder WORKDIR /workspace diff --git a/cmd/prometheus-config-reloader/Dockerfile b/cmd/prometheus-config-reloader/Dockerfile index 86a4a9001..f7f0fe59e 100644 --- a/cmd/prometheus-config-reloader/Dockerfile +++ b/cmd/prometheus-config-reloader/Dockerfile @@ -1,6 +1,7 @@ ARG ARCH=amd64 ARG OS=linux ARG GOLANG_BUILDER=1.23 +ARG GOARCH= FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base as builder WORKDIR /workspace From e27dc7b52c8531ae348a63ce3cd218f5d4c02601 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Mon, 4 Nov 2024 15:34:23 +0100 Subject: [PATCH 2/6] fix: pass the GOARCH variable to the build command Signed-off-by: Simon Pasquier --- Dockerfile | 4 +++- cmd/admission-webhook/Dockerfile | 4 +++- cmd/prometheus-config-reloader/Dockerfile | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ffb80cf8a..fa4decac5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,13 +2,15 @@ ARG ARCH=amd64 ARG OS=linux ARG GOLANG_BUILDER=1.23 ARG GOARCH= -FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base as builder +FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base AS builder WORKDIR /workspace # Copy source files COPY . . # Build +ENV GOOS=${OS} +ENV GOARCH=${GOARCH} RUN make operator FROM quay.io/prometheus/busybox-${OS}-${ARCH}:latest diff --git a/cmd/admission-webhook/Dockerfile b/cmd/admission-webhook/Dockerfile index c0377a144..3470bda11 100644 --- a/cmd/admission-webhook/Dockerfile +++ b/cmd/admission-webhook/Dockerfile @@ -2,13 +2,15 @@ ARG ARCH=amd64 ARG OS=linux ARG GOLANG_BUILDER=1.23 ARG GOARCH= -FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base as builder +FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base AS builder WORKDIR /workspace # Copy source files COPY . . # Build +ENV GOOS=${OS} +ENV GOARCH=${GOARCH} RUN make admission-webhook FROM quay.io/prometheus/busybox-${OS}-${ARCH}:latest diff --git a/cmd/prometheus-config-reloader/Dockerfile b/cmd/prometheus-config-reloader/Dockerfile index f7f0fe59e..ed03e3954 100644 --- a/cmd/prometheus-config-reloader/Dockerfile +++ b/cmd/prometheus-config-reloader/Dockerfile @@ -2,13 +2,15 @@ ARG ARCH=amd64 ARG OS=linux ARG GOLANG_BUILDER=1.23 ARG GOARCH= -FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base as builder +FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base AS builder WORKDIR /workspace # Copy source files COPY . . # Build +ENV GOOS=${OS} +ENV GOARCH=${GOARCH} RUN make prometheus-config-reloader FROM quay.io/prometheus/busybox-${OS}-${ARCH}:latest From c7e2bd7ff34710c249c03a7d5940053ed3757a5b Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Mon, 4 Nov 2024 17:18:45 +0100 Subject: [PATCH 3/6] fix: pass GOARCH variable to the build stage Signed-off-by: Simon Pasquier --- Dockerfile | 3 +-- cmd/admission-webhook/Dockerfile | 3 +-- cmd/prometheus-config-reloader/Dockerfile | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index fa4decac5..a8d6cefb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ ARG ARCH=amd64 ARG OS=linux ARG GOLANG_BUILDER=1.23 -ARG GOARCH= FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base AS builder WORKDIR /workspace @@ -9,7 +8,7 @@ WORKDIR /workspace COPY . . # Build -ENV GOOS=${OS} +ARG GOARCH ENV GOARCH=${GOARCH} RUN make operator diff --git a/cmd/admission-webhook/Dockerfile b/cmd/admission-webhook/Dockerfile index 3470bda11..c51474115 100644 --- a/cmd/admission-webhook/Dockerfile +++ b/cmd/admission-webhook/Dockerfile @@ -1,7 +1,6 @@ ARG ARCH=amd64 ARG OS=linux ARG GOLANG_BUILDER=1.23 -ARG GOARCH= FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base AS builder WORKDIR /workspace @@ -9,7 +8,7 @@ WORKDIR /workspace COPY . . # Build -ENV GOOS=${OS} +ARG GOARCH ENV GOARCH=${GOARCH} RUN make admission-webhook diff --git a/cmd/prometheus-config-reloader/Dockerfile b/cmd/prometheus-config-reloader/Dockerfile index ed03e3954..48a79a282 100644 --- a/cmd/prometheus-config-reloader/Dockerfile +++ b/cmd/prometheus-config-reloader/Dockerfile @@ -1,7 +1,6 @@ ARG ARCH=amd64 ARG OS=linux ARG GOLANG_BUILDER=1.23 -ARG GOARCH= FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base AS builder WORKDIR /workspace @@ -9,7 +8,7 @@ WORKDIR /workspace COPY . . # Build -ENV GOOS=${OS} +ARG GOARCH ENV GOARCH=${GOARCH} RUN make prometheus-config-reloader From 951d701bd20b9324002f4360a4880e799d1e1cac Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Tue, 5 Nov 2024 10:17:23 +0100 Subject: [PATCH 4/6] chore: reclaim disk space in publish workflow Signed-off-by: Simon Pasquier --- .github/workflows/publish.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 7ce9e7a62..0593fec80 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -25,6 +25,11 @@ jobs: uses: actions/checkout@v4 - name: Import environment variables from file run: cat ".github/env" >> $GITHUB_ENV + - name: Reclaim disk space + run: | + docker image prune --force --all + sudo rm -rf /usr/share/dotnet + sudo rm -rf /usr/local/lib/android - name: Install Go uses: actions/setup-go@v5 with: From 9c340b2508e1d920d0cf8bb42e46e6e2a9983771 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Tue, 5 Nov 2024 08:24:58 +0100 Subject: [PATCH 5/6] chore: cut v0.78.1 Signed-off-by: Simon Pasquier --- CHANGELOG.md | 4 +++ Documentation/operator.md | 2 +- Documentation/rbac.md | 6 ++-- Documentation/user-guides/prometheus-agent.md | 2 +- Documentation/user-guides/webhook.md | 10 +++--- VERSION | 2 +- bundle.yaml | 36 +++++++++---------- example/admission-webhook/deployment.yaml | 6 ++-- .../pod-disruption-budget.yaml | 2 +- .../admission-webhook/service-account.yaml | 2 +- .../admission-webhook/service-monitor.yaml | 4 +-- example/admission-webhook/service.yaml | 2 +- .../alertmanager-crd-conversion/patch.json | 2 +- ...toring.coreos.com_alertmanagerconfigs.yaml | 2 +- .../monitoring.coreos.com_alertmanagers.yaml | 2 +- .../monitoring.coreos.com_podmonitors.yaml | 2 +- .../monitoring.coreos.com_probes.yaml | 2 +- ...onitoring.coreos.com_prometheusagents.yaml | 2 +- .../monitoring.coreos.com_prometheuses.yaml | 2 +- ...monitoring.coreos.com_prometheusrules.yaml | 2 +- .../monitoring.coreos.com_scrapeconfigs.yaml | 2 +- ...monitoring.coreos.com_servicemonitors.yaml | 2 +- .../monitoring.coreos.com_thanosrulers.yaml | 2 +- ...metheus-operator-cluster-role-binding.yaml | 2 +- .../prometheus-operator-cluster-role.yaml | 2 +- .../prometheus-operator-deployment.yaml | 8 ++--- .../prometheus-operator-service-account.yaml | 2 +- .../prometheus-operator-service-monitor.yaml | 4 +-- .../prometheus-operator-service.yaml | 2 +- .../alertmanagerconfigs-crd.json | 2 +- .../alertmanagers-crd.json | 2 +- .../prometheus-operator/podmonitors-crd.json | 2 +- jsonnet/prometheus-operator/probes-crd.json | 2 +- .../prometheusagents-crd.json | 2 +- .../prometheus-operator/prometheuses-crd.json | 2 +- .../prometheusrules-crd.json | 2 +- .../scrapeconfigs-crd.json | 2 +- .../servicemonitors-crd.json | 2 +- .../prometheus-operator/thanosrulers-crd.json | 2 +- 39 files changed, 72 insertions(+), 68 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66ec10dd7..9e12eea0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.78.1 / 2024-10-30 + +* [BUGFIX] Fix container images for architectures other than `amd64`. #7065 #7066 #7067 + ## 0.78.0 / 2024-10-30 * [CHANGE] Allow overlapping compactions by default in Prometheus when the Thanos sidecar is configured with uploads. #6906 diff --git a/Documentation/operator.md b/Documentation/operator.md index 9cbbd0012..8e573e1c0 100644 --- a/Documentation/operator.md +++ b/Documentation/operator.md @@ -78,7 +78,7 @@ Usage of ./operator: -namespaces value Namespaces to scope the interaction of the Prometheus Operator and the apiserver (allow list). This is mutually exclusive with --deny-namespaces. -prometheus-config-reloader string - Prometheus config reloader image (default "quay.io/prometheus-operator/prometheus-config-reloader:v0.78.0") + Prometheus config reloader image (default "quay.io/prometheus-operator/prometheus-config-reloader:v0.78.1") -prometheus-default-base-image string Prometheus default base image (path without tag/version) (default "quay.io/prometheus/prometheus") -prometheus-instance-namespaces value diff --git a/Documentation/rbac.md b/Documentation/rbac.md index 677091069..4d1773945 100644 --- a/Documentation/rbac.md +++ b/Documentation/rbac.md @@ -26,7 +26,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator rules: - apiGroups: @@ -207,7 +207,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator namespace: default ``` @@ -223,7 +223,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/Documentation/user-guides/prometheus-agent.md b/Documentation/user-guides/prometheus-agent.md index 6961e46f9..4ca6fb674 100644 --- a/Documentation/user-guides/prometheus-agent.md +++ b/Documentation/user-guides/prometheus-agent.md @@ -26,7 +26,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator rules: - apiGroups: diff --git a/Documentation/user-guides/webhook.md b/Documentation/user-guides/webhook.md index 8ce638960..8146e971a 100644 --- a/Documentation/user-guides/webhook.md +++ b/Documentation/user-guides/webhook.md @@ -86,7 +86,7 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator-admission-webhook namespace: default ``` @@ -97,7 +97,7 @@ kind: Deployment metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator-admission-webhook namespace: default spec: @@ -114,7 +114,7 @@ spec: kubectl.kubernetes.io/default-container: prometheus-operator-admission-webhook labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 spec: affinity: podAntiAffinity: @@ -131,7 +131,7 @@ spec: - --web.enable-tls=true - --web.cert-file=/etc/tls/private/tls.crt - --web.key-file=/etc/tls/private/tls.key - image: quay.io/prometheus-operator/admission-webhook:v0.78.0 + image: quay.io/prometheus-operator/admission-webhook:v0.78.1 name: prometheus-operator-admission-webhook ports: - containerPort: 8443 @@ -179,7 +179,7 @@ kind: Service metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator-admission-webhook namespace: default spec: diff --git a/VERSION b/VERSION index bd14e8533..b88fccfdc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.78.0 +0.78.1 diff --git a/bundle.yaml b/bundle.yaml index 04d445ccb..3f494dfd9 100644 --- a/bundle.yaml +++ b/bundle.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: alertmanagerconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -9964,7 +9964,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -18599,7 +18599,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: podmonitors.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -19774,7 +19774,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -20934,7 +20934,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -31539,7 +31539,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -44323,7 +44323,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -44473,7 +44473,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -55941,7 +55941,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -57144,7 +57144,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -65154,7 +65154,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io @@ -65171,7 +65171,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator rules: - apiGroups: @@ -65279,7 +65279,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator namespace: default spec: @@ -65295,19 +65295,19 @@ spec: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 spec: automountServiceAccountToken: true containers: - args: - --kubelet-service=kube-system/kubelet - - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.78.0 + - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.78.1 - --kubelet-endpoints=true - --kubelet-endpointslice=false env: - name: GOGC value: "30" - image: quay.io/prometheus-operator/prometheus-operator:v0.78.0 + image: quay.io/prometheus-operator/prometheus-operator:v0.78.1 name: prometheus-operator ports: - containerPort: 8080 @@ -65341,7 +65341,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator namespace: default --- @@ -65351,7 +65351,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator namespace: default spec: diff --git a/example/admission-webhook/deployment.yaml b/example/admission-webhook/deployment.yaml index 4848da155..ce8a74769 100644 --- a/example/admission-webhook/deployment.yaml +++ b/example/admission-webhook/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator-admission-webhook namespace: default spec: @@ -20,7 +20,7 @@ spec: kubectl.kubernetes.io/default-container: prometheus-operator-admission-webhook labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 spec: affinity: podAntiAffinity: @@ -37,7 +37,7 @@ spec: - --web.enable-tls=true - --web.cert-file=/etc/tls/private/tls.crt - --web.key-file=/etc/tls/private/tls.key - image: quay.io/prometheus-operator/admission-webhook:v0.78.0 + image: quay.io/prometheus-operator/admission-webhook:v0.78.1 name: prometheus-operator-admission-webhook ports: - containerPort: 8443 diff --git a/example/admission-webhook/pod-disruption-budget.yaml b/example/admission-webhook/pod-disruption-budget.yaml index ee70173c3..c6e0eb1a9 100644 --- a/example/admission-webhook/pod-disruption-budget.yaml +++ b/example/admission-webhook/pod-disruption-budget.yaml @@ -3,7 +3,7 @@ kind: PodDisruptionBudget metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator-admission-webhook namespace: default spec: diff --git a/example/admission-webhook/service-account.yaml b/example/admission-webhook/service-account.yaml index ce79a3fb6..9d22d64ba 100644 --- a/example/admission-webhook/service-account.yaml +++ b/example/admission-webhook/service-account.yaml @@ -4,6 +4,6 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator-admission-webhook namespace: default diff --git a/example/admission-webhook/service-monitor.yaml b/example/admission-webhook/service-monitor.yaml index 5d22caa42..bbb034ac5 100644 --- a/example/admission-webhook/service-monitor.yaml +++ b/example/admission-webhook/service-monitor.yaml @@ -3,7 +3,7 @@ kind: ServiceMonitor metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator-admission-webhook namespace: default spec: @@ -13,4 +13,4 @@ spec: selector: matchLabels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 diff --git a/example/admission-webhook/service.yaml b/example/admission-webhook/service.yaml index 5894c721b..d8b6fe9f6 100644 --- a/example/admission-webhook/service.yaml +++ b/example/admission-webhook/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: labels: app.kubernetes.io/name: prometheus-operator-admission-webhook - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator-admission-webhook namespace: default spec: diff --git a/example/alertmanager-crd-conversion/patch.json b/example/alertmanager-crd-conversion/patch.json index 0b175dec8..f6b3a86f9 100644 --- a/example/alertmanager-crd-conversion/patch.json +++ b/example/alertmanager-crd-conversion/patch.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.16.4", - "operator.prometheus.io/version": "0.78.0" + "operator.prometheus.io/version": "0.78.1" }, "name": "alertmanagerconfigs.monitoring.coreos.com" }, diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml index ac38fd12c..bb2b64b66 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: alertmanagerconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml index ec1454b88..cd8a31693 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml index 506d40b39..4b7f58cb3 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: podmonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml index 7aa3c7875..994f0ff10 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml index ebc5f0ac7..5aad0f641 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml index b4ec89433..f57b42d94 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml index 5cd7721a7..075dbd006 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml index 7bd73d250..654a1e6a1 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml index ab28281a4..7055e221a 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml index 930f77fa6..84a473fd1 100644 --- a/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml +++ b/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.4 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml b/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml index e5b2bf189..8bafc3dfe 100644 --- a/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml +++ b/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml b/example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml index d133905a3..710f427f1 100644 --- a/example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml +++ b/example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator rules: - apiGroups: diff --git a/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml b/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml index 26091c7d1..7b064df0a 100644 --- a/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml +++ b/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator namespace: default spec: @@ -20,19 +20,19 @@ spec: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 spec: automountServiceAccountToken: true containers: - args: - --kubelet-service=kube-system/kubelet - - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.78.0 + - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.78.1 - --kubelet-endpoints=true - --kubelet-endpointslice=false env: - name: GOGC value: "30" - image: quay.io/prometheus-operator/prometheus-operator:v0.78.0 + image: quay.io/prometheus-operator/prometheus-operator:v0.78.1 name: prometheus-operator ports: - containerPort: 8080 diff --git a/example/rbac/prometheus-operator/prometheus-operator-service-account.yaml b/example/rbac/prometheus-operator/prometheus-operator-service-account.yaml index 2ebcfe46c..62b494730 100644 --- a/example/rbac/prometheus-operator/prometheus-operator-service-account.yaml +++ b/example/rbac/prometheus-operator/prometheus-operator-service-account.yaml @@ -5,6 +5,6 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator namespace: default diff --git a/example/rbac/prometheus-operator/prometheus-operator-service-monitor.yaml b/example/rbac/prometheus-operator/prometheus-operator-service-monitor.yaml index 55a8f3925..fc3b9115c 100644 --- a/example/rbac/prometheus-operator/prometheus-operator-service-monitor.yaml +++ b/example/rbac/prometheus-operator/prometheus-operator-service-monitor.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator namespace: default spec: @@ -15,4 +15,4 @@ spec: matchLabels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 diff --git a/example/rbac/prometheus-operator/prometheus-operator-service.yaml b/example/rbac/prometheus-operator/prometheus-operator-service.yaml index 992a0f3b2..352ceb0b2 100644 --- a/example/rbac/prometheus-operator/prometheus-operator-service.yaml +++ b/example/rbac/prometheus-operator/prometheus-operator-service.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: 0.78.0 + app.kubernetes.io/version: 0.78.1 name: prometheus-operator namespace: default spec: diff --git a/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json b/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json index cbd8c3521..013aea0a2 100644 --- a/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json +++ b/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.16.4", - "operator.prometheus.io/version": "0.78.0" + "operator.prometheus.io/version": "0.78.1" }, "name": "alertmanagerconfigs.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/alertmanagers-crd.json b/jsonnet/prometheus-operator/alertmanagers-crd.json index f19bc8dd9..3d483b0e3 100644 --- a/jsonnet/prometheus-operator/alertmanagers-crd.json +++ b/jsonnet/prometheus-operator/alertmanagers-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.16.4", - "operator.prometheus.io/version": "0.78.0" + "operator.prometheus.io/version": "0.78.1" }, "name": "alertmanagers.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/podmonitors-crd.json b/jsonnet/prometheus-operator/podmonitors-crd.json index 52084f785..bd36cb85b 100644 --- a/jsonnet/prometheus-operator/podmonitors-crd.json +++ b/jsonnet/prometheus-operator/podmonitors-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.16.4", - "operator.prometheus.io/version": "0.78.0" + "operator.prometheus.io/version": "0.78.1" }, "name": "podmonitors.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/probes-crd.json b/jsonnet/prometheus-operator/probes-crd.json index 3719e6cb7..18684b74d 100644 --- a/jsonnet/prometheus-operator/probes-crd.json +++ b/jsonnet/prometheus-operator/probes-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.16.4", - "operator.prometheus.io/version": "0.78.0" + "operator.prometheus.io/version": "0.78.1" }, "name": "probes.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/prometheusagents-crd.json b/jsonnet/prometheus-operator/prometheusagents-crd.json index 94b579ad6..e435bc105 100644 --- a/jsonnet/prometheus-operator/prometheusagents-crd.json +++ b/jsonnet/prometheus-operator/prometheusagents-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.16.4", - "operator.prometheus.io/version": "0.78.0" + "operator.prometheus.io/version": "0.78.1" }, "name": "prometheusagents.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/prometheuses-crd.json b/jsonnet/prometheus-operator/prometheuses-crd.json index 0d05e69e1..bb704e26d 100644 --- a/jsonnet/prometheus-operator/prometheuses-crd.json +++ b/jsonnet/prometheus-operator/prometheuses-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.16.4", - "operator.prometheus.io/version": "0.78.0" + "operator.prometheus.io/version": "0.78.1" }, "name": "prometheuses.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/prometheusrules-crd.json b/jsonnet/prometheus-operator/prometheusrules-crd.json index 1fd8c90d8..14f572190 100644 --- a/jsonnet/prometheus-operator/prometheusrules-crd.json +++ b/jsonnet/prometheus-operator/prometheusrules-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.16.4", - "operator.prometheus.io/version": "0.78.0" + "operator.prometheus.io/version": "0.78.1" }, "name": "prometheusrules.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/scrapeconfigs-crd.json b/jsonnet/prometheus-operator/scrapeconfigs-crd.json index 02fa78cb2..75ead172a 100644 --- a/jsonnet/prometheus-operator/scrapeconfigs-crd.json +++ b/jsonnet/prometheus-operator/scrapeconfigs-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.16.4", - "operator.prometheus.io/version": "0.78.0" + "operator.prometheus.io/version": "0.78.1" }, "name": "scrapeconfigs.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/servicemonitors-crd.json b/jsonnet/prometheus-operator/servicemonitors-crd.json index 0cb069dbe..741ec97b8 100644 --- a/jsonnet/prometheus-operator/servicemonitors-crd.json +++ b/jsonnet/prometheus-operator/servicemonitors-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.16.4", - "operator.prometheus.io/version": "0.78.0" + "operator.prometheus.io/version": "0.78.1" }, "name": "servicemonitors.monitoring.coreos.com" }, diff --git a/jsonnet/prometheus-operator/thanosrulers-crd.json b/jsonnet/prometheus-operator/thanosrulers-crd.json index 650c976cf..28e2700ec 100644 --- a/jsonnet/prometheus-operator/thanosrulers-crd.json +++ b/jsonnet/prometheus-operator/thanosrulers-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.16.4", - "operator.prometheus.io/version": "0.78.0" + "operator.prometheus.io/version": "0.78.1" }, "name": "thanosrulers.monitoring.coreos.com" }, From c8d66348b6596fd63490f0979b9f24f8b0c0b22f Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Tue, 5 Nov 2024 14:21:24 +0100 Subject: [PATCH 6/6] chore: update version in go.mod files Signed-off-by: Simon Pasquier --- go.mod | 4 ++-- pkg/client/go.mod | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 46f104534..cabd8d63c 100644 --- a/go.mod +++ b/go.mod @@ -21,8 +21,8 @@ require ( github.com/mitchellh/hashstructure v1.1.0 github.com/oklog/run v1.1.0 github.com/prometheus-community/prom-label-proxy v0.11.0 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.0 - github.com/prometheus-operator/prometheus-operator/pkg/client v0.78.0 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.1 + github.com/prometheus-operator/prometheus-operator/pkg/client v0.78.1 github.com/prometheus/alertmanager v0.27.0 github.com/prometheus/client_golang v1.20.5 github.com/prometheus/common v0.60.1 diff --git a/pkg/client/go.mod b/pkg/client/go.mod index 83a0bccc5..5b439bf1d 100644 --- a/pkg/client/go.mod +++ b/pkg/client/go.mod @@ -5,7 +5,7 @@ go 1.23 toolchain go1.23.1 require ( - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.0 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.1 k8s.io/api v0.31.2 k8s.io/apiextensions-apiserver v0.31.2 k8s.io/apimachinery v0.31.2