1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-21 03:38:43 +00:00

Merge pull request from simonpasquier/cut-0.78.2

chore: cut v0.78.2
This commit is contained in:
Simon Pasquier 2024-11-21 14:18:29 +01:00 committed by GitHub
commit 9efea40e09
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
41 changed files with 72 additions and 72 deletions

View file

@ -1,4 +1,4 @@
## Unreleased
## 0.78.2 / 2024-11-21
* [BUGFIX] Revert the removal of the `proxyURL` field in `AlertmanagerConfig` CRD. The field takes precedence over `proxyUrl`. #7114

View file

@ -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.1")
Prometheus config reloader image (default "quay.io/prometheus-operator/prometheus-config-reloader:v0.78.2")
-prometheus-default-base-image string
Prometheus default base image (path without tag/version) (default "quay.io/prometheus/prometheus")
-prometheus-instance-namespaces value

View file

@ -26,7 +26,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
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.1
app.kubernetes.io/version: 0.78.2
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.1
app.kubernetes.io/version: 0.78.2
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io

View file

@ -26,7 +26,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
name: prometheus-operator
rules:
- apiGroups:

View file

@ -86,7 +86,7 @@ kind: ServiceAccount
metadata:
labels:
app.kubernetes.io/name: prometheus-operator-admission-webhook
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
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.1
app.kubernetes.io/version: 0.78.2
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.1
app.kubernetes.io/version: 0.78.2
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.1
image: quay.io/prometheus-operator/admission-webhook:v0.78.2
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.1
app.kubernetes.io/version: 0.78.2
name: prometheus-operator-admission-webhook
namespace: default
spec:

View file

@ -1 +1 @@
0.78.1
0.78.2

36
bundle.yaml generated
View file

@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -10036,7 +10036,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -18671,7 +18671,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -19846,7 +19846,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -21006,7 +21006,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -31611,7 +31611,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -44395,7 +44395,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -44545,7 +44545,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -56013,7 +56013,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -57216,7 +57216,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -65226,7 +65226,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
@ -65243,7 +65243,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
name: prometheus-operator
rules:
- apiGroups:
@ -65351,7 +65351,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
name: prometheus-operator
namespace: default
spec:
@ -65367,19 +65367,19 @@ spec:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.78.1
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.78.2
- --kubelet-endpoints=true
- --kubelet-endpointslice=false
env:
- name: GOGC
value: "30"
image: quay.io/prometheus-operator/prometheus-operator:v0.78.1
image: quay.io/prometheus-operator/prometheus-operator:v0.78.2
name: prometheus-operator
ports:
- containerPort: 8080
@ -65413,7 +65413,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
name: prometheus-operator
namespace: default
---
@ -65423,7 +65423,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
name: prometheus-operator
namespace: default
spec:

View file

@ -3,7 +3,7 @@ kind: Deployment
metadata:
labels:
app.kubernetes.io/name: prometheus-operator-admission-webhook
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
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.1
app.kubernetes.io/version: 0.78.2
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.1
image: quay.io/prometheus-operator/admission-webhook:v0.78.2
name: prometheus-operator-admission-webhook
ports:
- containerPort: 8443

View file

@ -3,7 +3,7 @@ kind: PodDisruptionBudget
metadata:
labels:
app.kubernetes.io/name: prometheus-operator-admission-webhook
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
name: prometheus-operator-admission-webhook
namespace: default
spec:

View file

@ -4,6 +4,6 @@ kind: ServiceAccount
metadata:
labels:
app.kubernetes.io/name: prometheus-operator-admission-webhook
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
name: prometheus-operator-admission-webhook
namespace: default

View file

@ -3,7 +3,7 @@ kind: ServiceMonitor
metadata:
labels:
app.kubernetes.io/name: prometheus-operator-admission-webhook
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
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.1
app.kubernetes.io/version: 0.78.2

View file

@ -3,7 +3,7 @@ kind: Service
metadata:
labels:
app.kubernetes.io/name: prometheus-operator-admission-webhook
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
name: prometheus-operator-admission-webhook
namespace: default
spec:

View file

@ -4,7 +4,7 @@
"metadata": {
"annotations": {
"controller-gen.kubebuilder.io/version": "v0.16.4",
"operator.prometheus.io/version": "0.78.1"
"operator.prometheus.io/version": "0.78.2"
},
"name": "alertmanagerconfigs.monitoring.coreos.com"
},

View file

@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com

View file

@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com

View file

@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com

View file

@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com

View file

@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com

View file

@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com

View file

@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com

View file

@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com

View file

@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com

View file

@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.4
operator.prometheus.io/version: 0.78.1
operator.prometheus.io/version: 0.78.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com

View file

@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io

View file

@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
name: prometheus-operator
rules:
- apiGroups:

View file

@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
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.1
app.kubernetes.io/version: 0.78.2
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.78.1
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.78.2
- --kubelet-endpoints=true
- --kubelet-endpointslice=false
env:
- name: GOGC
value: "30"
image: quay.io/prometheus-operator/prometheus-operator:v0.78.1
image: quay.io/prometheus-operator/prometheus-operator:v0.78.2
name: prometheus-operator
ports:
- containerPort: 8080

View file

@ -5,6 +5,6 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
name: prometheus-operator
namespace: default

View file

@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
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.1
app.kubernetes.io/version: 0.78.2

View file

@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.78.1
app.kubernetes.io/version: 0.78.2
name: prometheus-operator
namespace: default
spec:

4
go.mod
View file

@ -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.1
github.com/prometheus-operator/prometheus-operator/pkg/client v0.78.1
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.2
github.com/prometheus-operator/prometheus-operator/pkg/client v0.78.2
github.com/prometheus/alertmanager v0.27.0
github.com/prometheus/client_golang v1.20.5
github.com/prometheus/common v0.60.1

View file

@ -4,7 +4,7 @@
"metadata": {
"annotations": {
"controller-gen.kubebuilder.io/version": "v0.16.4",
"operator.prometheus.io/version": "0.78.1"
"operator.prometheus.io/version": "0.78.2"
},
"name": "alertmanagerconfigs.monitoring.coreos.com"
},

View file

@ -4,7 +4,7 @@
"metadata": {
"annotations": {
"controller-gen.kubebuilder.io/version": "v0.16.4",
"operator.prometheus.io/version": "0.78.1"
"operator.prometheus.io/version": "0.78.2"
},
"name": "alertmanagers.monitoring.coreos.com"
},

View file

@ -4,7 +4,7 @@
"metadata": {
"annotations": {
"controller-gen.kubebuilder.io/version": "v0.16.4",
"operator.prometheus.io/version": "0.78.1"
"operator.prometheus.io/version": "0.78.2"
},
"name": "podmonitors.monitoring.coreos.com"
},

View file

@ -4,7 +4,7 @@
"metadata": {
"annotations": {
"controller-gen.kubebuilder.io/version": "v0.16.4",
"operator.prometheus.io/version": "0.78.1"
"operator.prometheus.io/version": "0.78.2"
},
"name": "probes.monitoring.coreos.com"
},

View file

@ -4,7 +4,7 @@
"metadata": {
"annotations": {
"controller-gen.kubebuilder.io/version": "v0.16.4",
"operator.prometheus.io/version": "0.78.1"
"operator.prometheus.io/version": "0.78.2"
},
"name": "prometheusagents.monitoring.coreos.com"
},

View file

@ -4,7 +4,7 @@
"metadata": {
"annotations": {
"controller-gen.kubebuilder.io/version": "v0.16.4",
"operator.prometheus.io/version": "0.78.1"
"operator.prometheus.io/version": "0.78.2"
},
"name": "prometheuses.monitoring.coreos.com"
},

View file

@ -4,7 +4,7 @@
"metadata": {
"annotations": {
"controller-gen.kubebuilder.io/version": "v0.16.4",
"operator.prometheus.io/version": "0.78.1"
"operator.prometheus.io/version": "0.78.2"
},
"name": "prometheusrules.monitoring.coreos.com"
},

View file

@ -4,7 +4,7 @@
"metadata": {
"annotations": {
"controller-gen.kubebuilder.io/version": "v0.16.4",
"operator.prometheus.io/version": "0.78.1"
"operator.prometheus.io/version": "0.78.2"
},
"name": "scrapeconfigs.monitoring.coreos.com"
},

View file

@ -4,7 +4,7 @@
"metadata": {
"annotations": {
"controller-gen.kubebuilder.io/version": "v0.16.4",
"operator.prometheus.io/version": "0.78.1"
"operator.prometheus.io/version": "0.78.2"
},
"name": "servicemonitors.monitoring.coreos.com"
},

View file

@ -4,7 +4,7 @@
"metadata": {
"annotations": {
"controller-gen.kubebuilder.io/version": "v0.16.4",
"operator.prometheus.io/version": "0.78.1"
"operator.prometheus.io/version": "0.78.2"
},
"name": "thanosrulers.monitoring.coreos.com"
},

View file

@ -5,7 +5,7 @@ go 1.23
toolchain go1.23.1
require (
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.1
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.2
k8s.io/api v0.31.2
k8s.io/apiextensions-apiserver v0.31.2
k8s.io/apimachinery v0.31.2