Skip to content

Commit

Permalink
Merge pull request #6834 from prometheus-operator/nicolas/prepare-0.76
Browse files Browse the repository at this point in the history
preparing release-0.76
  • Loading branch information
nicolastakashi authored Aug 14, 2024
2 parents a7a1ad6 + e12ef9a commit 022a289
Show file tree
Hide file tree
Showing 47 changed files with 134 additions and 115 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
## 0.76.0 / 2025-08-08

[CHANGE] Enhanced secret management in Prometheus and PrometheusAgent CRDs by switching the secrets field from atomic to listType: set, allowing independent handling of entries by different managers to prevent conflicts and improve deployment stability. #6762
[CHANGE] Add API-level validations to Kubernetes SD in the ScrapeConfig CRD. #6678
[FEATURE] Add TLS and Proxy settings to OAuth2 configuration for Prometheus and PrometheusAgent CRDs. #6735
[FEATURE] Add support for OAuth2 in the ScrapeConfig CRD. #6814
[FEATURE] Add scale subresource to the Alertmanger CRD. #6728
[FEATURE] Add Scaleway service discovery to the ScrapeConfig CRD. #6711
[FEATURE] Add `serviceDiscoveryRole` field to the Prometheus and PrometheusAgent CRDs to select between Endpoints (default) and EndpointSlice for discovering scrape and alerting targets. #6672
[ENHANCEMENT] Make the `namespace` field optional in the Alertmanager endpoints configuration of the Prometheus CRD, if not defined it will use the `default` namespace. #6338
[ENHANCEMENT] Add support to configure the TLS version for Prometheus, PrometheusAgent and Alertmanager CRDs. #6736
[ENHANCEMENT] Add `-secret-label-selector` argument to the operator to filter the Secrets being watched. #6731
[ENHANCEMENT] Add `attachMetadata` field to ScrapeClasses. #6756
[BUGFIX] Add support for all proxy settings in the Alertmanager configuration. #6818

## 0.75.2 / 2024-07-23

* [BUGFIX] Avoid invalid alerting config with TLS. #6765
Expand Down
3 changes: 2 additions & 1 deletion Documentation/compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,13 @@ Prometheus Operator supports all Prometheus versions >= v2.0.0. The operator's e
* v2.52.0
* v2.53.0
* v2.53.1
* v2.54.0
```

The end-to-end tests are mostly tested against

```$ mdox-exec="go run ./cmd/po-docgen/. compatibility defaultPrometheusVersion"
* v2.53.1
* v2.54.0
```

## Alertmanager
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.2")
Prometheus config reloader image (default "quay.io/prometheus-operator/prometheus-config-reloader:v0.76.0")
-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.2
app.kubernetes.io/version: 0.76.0
name: prometheus-operator
rules:
- apiGroups:
Expand Down Expand Up @@ -199,7 +199,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.75.2
app.kubernetes.io/version: 0.76.0
name: prometheus-operator
namespace: default
```
Expand All @@ -215,7 +215,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.75.2
app.kubernetes.io/version: 0.76.0
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.2
app.kubernetes.io/version: 0.76.0
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.2
app.kubernetes.io/version: 0.76.0
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.2
app.kubernetes.io/version: 0.76.0
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.2
app.kubernetes.io/version: 0.76.0
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.2
image: quay.io/prometheus-operator/admission-webhook:v0.76.0
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.2
app.kubernetes.io/version: 0.76.0
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.2
0.76.0
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.2
app.kubernetes.io/version: 0.76.0
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.2
app.kubernetes.io/version: 0.76.0
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.2
image: quay.io/prometheus-operator/admission-webhook:v0.76.0
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.2
app.kubernetes.io/version: 0.76.0
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.2
app.kubernetes.io/version: 0.76.0
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.2
app.kubernetes.io/version: 0.76.0
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.2
app.kubernetes.io/version: 0.76.0
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.2
app.kubernetes.io/version: 0.76.0
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.2"
"operator.prometheus.io/version": "0.76.0"
},
"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.

Loading

0 comments on commit 022a289

Please sign in to comment.