1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-21 11:48:53 +00:00

Merge pull request from prometheus-operator/release-0.75

Merge release 0.75 to main
This commit is contained in:
Simon Pasquier 2024-07-02 14:08:39 +02:00 committed by GitHub
commit b98962be1e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
43 changed files with 77 additions and 73 deletions

View file

@ -1,3 +1,7 @@
## 0.75.1 / 2024-07-02
* [BUGFIX] Fix OVHCloud service discovery configs key error. #6723
## 0.75.0 / 2024-06-26
* [CHANGE] Global limits over enforced limits when no user limits are set. #6608

View file

@ -74,7 +74,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.75.0")
Prometheus config reloader image (default "quay.io/prometheus-operator/prometheus-config-reloader:v0.75.1")
-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.75.0
app.kubernetes.io/version: 0.75.1
name: prometheus-operator
rules:
- apiGroups:
@ -194,7 +194,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.75.0
app.kubernetes.io/version: 0.75.1
name: prometheus-operator
namespace: default
```
@ -210,7 +210,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.75.0
app.kubernetes.io/version: 0.75.1
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.75.0
app.kubernetes.io/version: 0.75.1
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.75.0
app.kubernetes.io/version: 0.75.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.75.0
app.kubernetes.io/version: 0.75.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.75.0
app.kubernetes.io/version: 0.75.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.75.0
image: quay.io/prometheus-operator/admission-webhook:v0.75.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.75.0
app.kubernetes.io/version: 0.75.1
name: prometheus-operator-admission-webhook
namespace: default
spec:

View file

@ -1 +1 @@
0.75.0
0.75.1

36
bundle.yaml generated
View file

@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -6703,7 +6703,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -15029,7 +15029,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -16006,7 +16006,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -16958,7 +16958,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -27307,7 +27307,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -39686,7 +39686,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -39829,7 +39829,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -47295,7 +47295,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -48300,7 +48300,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@ -56265,7 +56265,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.75.0
app.kubernetes.io/version: 0.75.1
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
@ -56282,7 +56282,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.75.0
app.kubernetes.io/version: 0.75.1
name: prometheus-operator
rules:
- apiGroups:
@ -56382,7 +56382,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.75.0
app.kubernetes.io/version: 0.75.1
name: prometheus-operator
namespace: default
spec:
@ -56398,17 +56398,17 @@ spec:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.75.0
app.kubernetes.io/version: 0.75.1
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.75.0
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.75.1
env:
- name: GOGC
value: "30"
image: quay.io/prometheus-operator/prometheus-operator:v0.75.0
image: quay.io/prometheus-operator/prometheus-operator:v0.75.1
name: prometheus-operator
ports:
- containerPort: 8080
@ -56442,7 +56442,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.75.0
app.kubernetes.io/version: 0.75.1
name: prometheus-operator
namespace: default
---
@ -56452,7 +56452,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.75.0
app.kubernetes.io/version: 0.75.1
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.75.0
app.kubernetes.io/version: 0.75.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.75.0
app.kubernetes.io/version: 0.75.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.75.0
image: quay.io/prometheus-operator/admission-webhook:v0.75.1
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.75.0
app.kubernetes.io/version: 0.75.1
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.75.0
app.kubernetes.io/version: 0.75.1
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.75.0
app.kubernetes.io/version: 0.75.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.75.0
app.kubernetes.io/version: 0.75.1

View file

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

View file

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

View file

@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
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.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
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.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
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.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
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.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
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.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
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.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
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.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
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.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
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.15.0
operator.prometheus.io/version: 0.75.0
operator.prometheus.io/version: 0.75.1
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.75.0
app.kubernetes.io/version: 0.75.1
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.75.0
app.kubernetes.io/version: 0.75.1
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.75.0
app.kubernetes.io/version: 0.75.1
name: prometheus-operator
namespace: default
spec:
@ -20,17 +20,17 @@ spec:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.75.0
app.kubernetes.io/version: 0.75.1
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.75.0
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.75.1
env:
- name: GOGC
value: "30"
image: quay.io/prometheus-operator/prometheus-operator:v0.75.0
image: quay.io/prometheus-operator/prometheus-operator:v0.75.1
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.75.0
app.kubernetes.io/version: 0.75.1
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.75.0
app.kubernetes.io/version: 0.75.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.75.0
app.kubernetes.io/version: 0.75.1

View file

@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.75.0
app.kubernetes.io/version: 0.75.1
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.10.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.0
github.com/prometheus-operator/prometheus-operator/pkg/client v0.75.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.1
github.com/prometheus-operator/prometheus-operator/pkg/client v0.75.1
github.com/prometheus/alertmanager v0.27.0
github.com/prometheus/client_golang v1.19.1
github.com/prometheus/common v0.55.0

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -5,7 +5,7 @@ go 1.22.0
toolchain go1.22.2
require (
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.1
k8s.io/api v0.30.2
k8s.io/apiextensions-apiserver v0.30.2
k8s.io/apimachinery v0.30.2

View file

@ -3993,7 +3993,7 @@ func (cg *ConfigGenerator) generateScrapeConfig(
}
cfg = append(cfg, yaml.MapItem{
Key: "ovhcloud_sd_config",
Key: "ovhcloud_sd_configs",
Value: configs,
})
}

View file

@ -6,7 +6,7 @@ global:
prometheus_replica: $(POD_NAME)
scrape_configs:
- job_name: scrapeConfig/default/testscrapeconfig1
ovhcloud_sd_config:
ovhcloud_sd_configs:
- application_key: application-key
application_secret: application-secret
consumer_key: consumer-key