Skip to content

Commit

Permalink
Prep for release v0.63.0 (#5325)
Browse files Browse the repository at this point in the history
* Update default versions of Thanos and Prometheus

* make: clean generate after bumping to v0.63.0

* mod: Update versions to v0.63.0

* docs: Add changelog for v0.63.0

* make: docs

* chore: Remove unrequired check in alertmanager test
  • Loading branch information
philipgough authored Feb 8, 2023
1 parent bea7a4d commit 1a38cb5
Show file tree
Hide file tree
Showing 22 changed files with 53 additions and 67 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
## 0.63.0 / 2023-02-08

* [CHANGE] Use `tmpfs` to store `Prometheus` and `Alertmanager` configuration. #5311
* [FEATURE] Add `status` subresource to the `Alertmanager` CRD. #5270
* [FEATURE] Add `spec.additionalArgs` to the `ThanosRuler` CRD. #5293
* [ENHANCEMENT] Add `spec.web.maxConnections` to the `Prometheus` CRD. #5175
* [BUGFIX] Fix unsupported types in Alertmanager route sanitizer log lines. #5296
* [BUGFIX] Fix `ThanosRuler` StatefulSet re-creation bug when labels are specified. #5318

## 0.62.0 / 2023-01-04

* [CHANGE] Use `spec.version` of the Prometheus object as the image's tag if the image name is untagged. #5171
Expand Down
5 changes: 3 additions & 2 deletions Documentation/compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,13 @@ Prometheus Operator supports all Prometheus versions >= v2.0.0. The operator's e
* v2.40.6
* v2.40.7
* v2.41.0
* v2.42.0
```

The end-to-end tests are mostly tested against

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

## Alertmanager
Expand All @@ -74,5 +75,5 @@ The Prometheus Operator is compatible with Thanos v0.10 and above.
The end-to-end tests are mostly tested against

```$ mdox-exec="go run ./cmd/po-docgen/. compatibility defaultThanosVersion"
* v0.30.1
* v0.30.2
```
2 changes: 1 addition & 1 deletion Documentation/operator.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,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.62.0")
Prometheus config reloader image (default "quay.io/prometheus-operator/prometheus-config-reloader:v0.63.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.62.0
app.kubernetes.io/version: 0.63.0
name: prometheus-operator
rules:
- apiGroups:
Expand Down Expand Up @@ -176,7 +176,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.0
name: prometheus-operator
namespace: default
```
Expand All @@ -192,7 +192,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.0
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
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.62.0
app.kubernetes.io/version: 0.63.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.62.0
app.kubernetes.io/version: 0.63.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.62.0
app.kubernetes.io/version: 0.63.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.62.0
image: quay.io/prometheus-operator/admission-webhook:v0.63.0
name: prometheus-operator-admission-webhook
ports:
- containerPort: 8443
Expand Down Expand Up @@ -177,7 +177,7 @@ kind: Service
metadata:
labels:
app.kubernetes.io/name: prometheus-operator-admission-webhook
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.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.62.0
0.63.0
16 changes: 8 additions & 8 deletions bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29636,7 +29636,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.0
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -29653,7 +29653,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.0
name: prometheus-operator
rules:
- apiGroups:
Expand Down Expand Up @@ -29735,7 +29735,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.0
name: prometheus-operator
namespace: default
spec:
Expand All @@ -29751,14 +29751,14 @@ spec:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.0
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.62.0
image: quay.io/prometheus-operator/prometheus-operator:v0.62.0
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.63.0
image: quay.io/prometheus-operator/prometheus-operator:v0.63.0
name: prometheus-operator
ports:
- containerPort: 8080
Expand Down Expand Up @@ -29790,7 +29790,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.0
name: prometheus-operator
namespace: default
---
Expand All @@ -29800,7 +29800,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.0
name: prometheus-operator
namespace: default
spec:
Expand Down
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.62.0
app.kubernetes.io/version: 0.63.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.62.0
app.kubernetes.io/version: 0.63.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.62.0
image: quay.io/prometheus-operator/admission-webhook:v0.63.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.62.0
app.kubernetes.io/version: 0.63.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.62.0
app.kubernetes.io/version: 0.63.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.62.0
app.kubernetes.io/version: 0.63.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.62.0
app.kubernetes.io/version: 0.63.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.62.0
app.kubernetes.io/version: 0.63.0
name: prometheus-operator-admission-webhook
namespace: default
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.0
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.0
name: prometheus-operator
rules:
- apiGroups:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.0
name: prometheus-operator
namespace: default
spec:
Expand All @@ -20,14 +20,14 @@ spec:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.0
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.62.0
image: quay.io/prometheus-operator/prometheus-operator:v0.62.0
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.63.0
image: quay.io/prometheus-operator/prometheus-operator:v0.63.0
name: prometheus-operator
ports:
- containerPort: 8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.0
name: prometheus-operator
namespace: default
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.0
name: prometheus-operator
namespace: default
spec:
Expand All @@ -15,4 +15,4 @@ spec:
matchLabels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.0
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/version: 0.62.0
app.kubernetes.io/version: 0.63.0
name: prometheus-operator
namespace: default
spec:
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ require (
github.com/oklog/run v1.1.0
github.com/pkg/errors v0.9.1
github.com/prometheus-community/prom-label-proxy v0.6.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.62.0
github.com/prometheus-operator/prometheus-operator/pkg/client v0.62.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.63.0
github.com/prometheus-operator/prometheus-operator/pkg/client v0.63.0
github.com/prometheus/alertmanager v0.25.0
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/common v0.39.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/prometheus-operator/prometheus-operator/pkg/client
go 1.19

require (
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.62.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.63.0
k8s.io/api v0.26.1
k8s.io/apiextensions-apiserver v0.26.1
k8s.io/apimachinery v0.26.1
Expand Down
3 changes: 2 additions & 1 deletion pkg/operator/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const (
DefaultAlertmanagerImage = DefaultAlertmanagerBaseImage + ":" + DefaultAlertmanagerVersion

// DefaultThanosVersion is a default image tag for the Thanos long-term prometheus storage collector
DefaultThanosVersion = "v0.30.1"
DefaultThanosVersion = "v0.30.2"
// DefaultThanosBaseImage is a base container registry address for the Thanos long-term prometheus
// storage collector
DefaultThanosBaseImage = "quay.io/thanos/thanos"
Expand Down Expand Up @@ -68,5 +68,6 @@ var (
"v2.40.6",
"v2.40.7",
"v2.41.0",
"v2.42.0",
}
)
Loading

0 comments on commit 1a38cb5

Please sign in to comment.