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: 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/Dockerfile b/Dockerfile index 24bb22ce5..a8d6cefb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,15 @@ ARG ARCH=amd64 ARG OS=linux ARG GOLANG_BUILDER=1.23 -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 +ARG GOARCH +ENV GOARCH=${GOARCH} RUN make operator FROM quay.io/prometheus/busybox-${OS}-${ARCH}:latest 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/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/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 9244d086d..aea853fb7 100644 --- a/bundle.yaml +++ b/bundle.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - 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.5 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -18601,7 +18601,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: podmonitors.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -19776,7 +19776,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -20936,7 +20936,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -31543,7 +31543,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -44329,7 +44329,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -44479,7 +44479,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -55947,7 +55947,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -57150,7 +57150,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.0 + operator.prometheus.io/version: 0.78.1 name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -65162,7 +65162,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 @@ -65179,7 +65179,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: @@ -65287,7 +65287,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: @@ -65303,19 +65303,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 @@ -65349,7 +65349,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 --- @@ -65359,7 +65359,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/cmd/admission-webhook/Dockerfile b/cmd/admission-webhook/Dockerfile index ef94977c2..c51474115 100644 --- a/cmd/admission-webhook/Dockerfile +++ b/cmd/admission-webhook/Dockerfile @@ -1,13 +1,15 @@ ARG ARCH=amd64 ARG OS=linux ARG GOLANG_BUILDER=1.23 -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 +ARG GOARCH +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 86a4a9001..48a79a282 100644 --- a/cmd/prometheus-config-reloader/Dockerfile +++ b/cmd/prometheus-config-reloader/Dockerfile @@ -1,13 +1,15 @@ ARG ARCH=amd64 ARG OS=linux ARG GOLANG_BUILDER=1.23 -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 +ARG GOARCH +ENV GOARCH=${GOARCH} RUN make prometheus-config-reloader FROM quay.io/prometheus/busybox-${OS}-${ARCH}:latest 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 32269891b..76f778985 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.5", - "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 8521c7f71..46ef4fc4c 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.5 - 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 4772fdb41..139b59643 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.5 - 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 1ae332866..e46df62a9 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.5 - 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 74d4cfc08..ef286a926 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.5 - 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 4334bbf30..6d03bf123 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.5 - 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 5a24f492b..c308ceb3e 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.5 - 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 5da86cc2d..8bcf93f7b 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.5 - 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 6cdd2c466..19f5bc3c7 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.5 - 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 c513483ae..fcd004d9b 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.5 - 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 c27290d75..d8caa09c4 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.5 - 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/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/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json b/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json index c93566de5..ff83558f1 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.5", - "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 a4efa61e2..d98c5bb0b 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.5", - "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 a943fa77b..0a3742902 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.5", - "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 a29b7fb34..467b85e7a 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.5", - "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 6cb9b6e1e..9e5cc51ce 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.5", - "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 ad0280e26..5682e91b2 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.5", - "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 802f32779..a6258a817 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.5", - "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 809c1fefa..dbcb2d1cd 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.5", - "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 05c1d30f7..b0e8714ac 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.5", - "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 123f64faa..6ed3755af 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.5", - "operator.prometheus.io/version": "0.78.0" + "operator.prometheus.io/version": "0.78.1" }, "name": "thanosrulers.monitoring.coreos.com" }, 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