Merge pull request prometheus-operator#4461 from simonpasquier/merge-…

…v0.53.1 Merge release-053 branch (v0.53.1) into main
mahumpula · Dec 21, 2021 · 2421947 · 2421947
2 parents dec443d + e68cebe
commit 2421947
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.53.1 / 2021-12-20
+
+* [BUGFIX] Fixed the validation pattern for the `february` month in the AlertManagerConfig CRD. #4458
+
 ## 0.53.0 / 2021-12-16
 
 * [CHANGE] Added startup probe to Prometheus. #4433 #4369

diff --git a/Documentation/compatibility.md b/Documentation/compatibility.md
@@ -82,6 +82,7 @@ The versions of Prometheus compatible to be run with the Prometheus Operator are
 * v2.31.0
 * v2.31.1
 * v2.32.0
+* v2.32.1
 
 ## Alertmanager
 

diff --git a/Documentation/operator.md b/Documentation/operator.md
@@ -58,7 +58,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.53.0")
+    	Prometheus config reloader image (default "quay.io/prometheus-operator/prometheus-config-reloader:v0.53.1")
   -prometheus-default-base-image string
     	Prometheus default base image (path without tag/version) (default "quay.io/prometheus/prometheus")
   -prometheus-instance-namespaces value

diff --git a/Documentation/rbac.md b/Documentation/rbac.md
@@ -27,7 +27,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.53.0
+    app.kubernetes.io/version: 0.53.1
   name: prometheus-operator
 rules:
 - apiGroups:
@@ -174,7 +174,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.53.0
+    app.kubernetes.io/version: 0.53.1
   name: prometheus-operator
   namespace: default
 ```
@@ -190,7 +190,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.53.0
+    app.kubernetes.io/version: 0.53.1
   name: prometheus-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.53.0
+0.53.1
diff --git a/bundle.yaml b/bundle.yaml
@@ -164,7 +164,7 @@ spec:
                                 by name (e.g 'January') by numerical month (e.g '1')
                                 or as an inclusive range (e.g 'January:March', '1:3',
                                 '1:March')
-                              pattern: ^((?i)january|febuary|march|april|may|june|july|august|september|october|november|december|[1-12])(?:((:((?i)january|febuary|march|april|may|june|july|august|september|october|november|december|[1-12]))$)|$)
+                              pattern: ^((?i)january|february|march|april|may|june|july|august|september|october|november|december|[1-12])(?:((:((?i)january|february|march|april|may|june|july|august|september|october|november|december|[1-12]))$)|$)
                               type: string
                             type: array
                           times:
@@ -25322,7 +25322,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.53.0
+    app.kubernetes.io/version: 0.53.1
   name: prometheus-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -25339,7 +25339,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.53.0
+    app.kubernetes.io/version: 0.53.1
   name: prometheus-operator
 rules:
 - apiGroups:
@@ -25419,7 +25419,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.53.0
+    app.kubernetes.io/version: 0.53.1
   name: prometheus-operator
   namespace: default
 spec:
@@ -25435,13 +25435,13 @@ spec:
       labels:
         app.kubernetes.io/component: controller
         app.kubernetes.io/name: prometheus-operator
-        app.kubernetes.io/version: 0.53.0
+        app.kubernetes.io/version: 0.53.1
     spec:
       containers:
       - args:
         - --kubelet-service=kube-system/kubelet
-        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.53.0
-        image: quay.io/prometheus-operator/prometheus-operator:v0.53.0
+        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.53.1
+        image: quay.io/prometheus-operator/prometheus-operator:v0.53.1
         name: prometheus-operator
         ports:
         - containerPort: 8080
@@ -25468,7 +25468,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.53.0
+    app.kubernetes.io/version: 0.53.1
   name: prometheus-operator
   namespace: default
 ---
@@ -25478,7 +25478,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.53.0
+    app.kubernetes.io/version: 0.53.1
   name: prometheus-operator
   namespace: default
 spec:

diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
@@ -164,7 +164,7 @@ spec:
                                 by name (e.g 'January') by numerical month (e.g '1')
                                 or as an inclusive range (e.g 'January:March', '1:3',
                                 '1:March')
-                              pattern: ^((?i)january|febuary|march|april|may|june|july|august|september|october|november|december|[1-12])(?:((:((?i)january|febuary|march|april|may|june|july|august|september|october|november|december|[1-12]))$)|$)
+                              pattern: ^((?i)january|february|march|april|may|june|july|august|september|october|november|december|[1-12])(?:((:((?i)january|february|march|april|may|june|july|august|september|october|november|december|[1-12]))$)|$)
                               type: string
                             type: array
                           times:

diff --git a/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml b/example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.53.0
+    app.kubernetes.io/version: 0.53.1
   name: prometheus-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml b/example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.53.0
+    app.kubernetes.io/version: 0.53.1
   name: prometheus-operator
 rules:
 - apiGroups:

diff --git a/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml b/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.53.0
+    app.kubernetes.io/version: 0.53.1
   name: prometheus-operator
   namespace: default
 spec:
@@ -20,13 +20,13 @@ spec:
       labels:
         app.kubernetes.io/component: controller
         app.kubernetes.io/name: prometheus-operator
-        app.kubernetes.io/version: 0.53.0
+        app.kubernetes.io/version: 0.53.1
     spec:
       containers:
       - args:
         - --kubelet-service=kube-system/kubelet
-        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.53.0
-        image: quay.io/prometheus-operator/prometheus-operator:v0.53.0
+        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.53.1
+        image: quay.io/prometheus-operator/prometheus-operator:v0.53.1
         name: prometheus-operator
         ports:
         - containerPort: 8080

diff --git a/example/rbac/prometheus-operator/prometheus-operator-service-account.yaml b/example/rbac/prometheus-operator/prometheus-operator-service-account.yaml
@@ -4,6 +4,6 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.53.0
+    app.kubernetes.io/version: 0.53.1
   name: prometheus-operator
   namespace: default
diff --git a/example/rbac/prometheus-operator/prometheus-operator-service-monitor.yaml b/example/rbac/prometheus-operator/prometheus-operator-service-monitor.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.53.0
+    app.kubernetes.io/version: 0.53.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.53.0
+      app.kubernetes.io/version: 0.53.1
diff --git a/example/rbac/prometheus-operator/prometheus-operator-service.yaml b/example/rbac/prometheus-operator/prometheus-operator-service.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.53.0
+    app.kubernetes.io/version: 0.53.1
   name: prometheus-operator
   namespace: default
 spec:

diff --git a/go.mod b/go.mod
@@ -19,8 +19,8 @@ require (
 	github.com/oklog/run v1.1.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus-community/prom-label-proxy v0.4.1-0.20211215142838-1eac0933d512
-	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.53.0
-	github.com/prometheus-operator/prometheus-operator/pkg/client v0.53.0
+	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.53.1
+	github.com/prometheus-operator/prometheus-operator/pkg/client v0.53.1
 	github.com/prometheus/alertmanager v0.23.1-0.20210914172521-e35efbddb66a
 	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/common v0.32.1

diff --git a/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json b/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json
@@ -170,7 +170,7 @@
                                 "description": "Months is a list of MonthRange",
                                 "items": {
                                   "description": "MonthRange is an inclusive range of months of the year beginning in January Months can be specified by name (e.g 'January') by numerical month (e.g '1') or as an inclusive range (e.g 'January:March', '1:3', '1:March')",
-                                  "pattern": "^((?i)january|febuary|march|april|may|june|july|august|september|october|november|december|[1-12])(?:((:((?i)january|febuary|march|april|may|june|july|august|september|october|november|december|[1-12]))$)|$)",
+                                  "pattern": "^((?i)january|february|march|april|may|june|july|august|september|october|november|december|[1-12])(?:((:((?i)january|february|march|april|may|june|july|august|september|october|november|december|[1-12]))$)|$)",
                                   "type": "string"
                                 },
                                 "type": "array"

diff --git a/pkg/apis/monitoring/v1alpha1/alertmanager_config_types.go b/pkg/apis/monitoring/v1alpha1/alertmanager_config_types.go
@@ -892,7 +892,7 @@ type DayOfMonthRange struct {
 
 // MonthRange is an inclusive range of months of the year beginning in January
 // Months can be specified by name (e.g 'January') by numerical month (e.g '1') or as an inclusive range (e.g 'January:March', '1:3', '1:March')
-// +kubebuilder:validation:Pattern=`^((?i)january|febuary|march|april|may|june|july|august|september|october|november|december|[1-12])(?:((:((?i)january|febuary|march|april|may|june|july|august|september|october|november|december|[1-12]))$)|$)`
+// +kubebuilder:validation:Pattern=`^((?i)january|february|march|april|may|june|july|august|september|october|november|december|[1-12])(?:((:((?i)january|february|march|april|may|june|july|august|september|october|november|december|[1-12]))$)|$)`
 type MonthRange string
 
 // YearRange is an inclusive range of years

diff --git a/pkg/client/go.mod b/pkg/client/go.mod
@@ -3,7 +3,7 @@ module github.com/prometheus-operator/prometheus-operator/pkg/client
 go 1.14
 
 require (
-	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.53.0
+	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.53.1
 	k8s.io/apimachinery v0.23.0
 	k8s.io/client-go v0.23.0
 )

diff --git a/pkg/operator/defaults.go b/pkg/operator/defaults.go
@@ -103,5 +103,6 @@ var (
 		"v2.31.0",
 		"v2.31.1",
 		"v2.32.0",
+		"v2.32.1",
 	}
 )