Skip to content

Commit

Permalink
Merge pull request prometheus-operator#6725 from slashpai/cut-0.75.1
Browse files Browse the repository at this point in the history
chore: cut 0.75.1
  • Loading branch information
slashpai authored Jul 2, 2024
2 parents 84bddcb + 7e721e2 commit 9b72f85
Show file tree
Hide file tree
Showing 41 changed files with 75 additions and 71 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Documentation/operator.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Documentation/rbac.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
```
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Documentation/user-guides/prometheus-agent.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions Documentation/user-guides/webhook.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.75.0
0.75.1
36 changes: 18 additions & 18 deletions bundle.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions example/admission-webhook/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion example/admission-webhook/pod-disruption-budget.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion example/admission-webhook/service-account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions example/admission-webhook/service-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
2 changes: 1 addition & 1 deletion example/admission-webhook/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion example/alertmanager-crd-conversion/patch.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9b72f85

Please sign in to comment.