Merge pull request #240 from rhobs/automated-updates-master

[bot] Bump openshift/prometheus-operator to v0.67.1
openshift · Aug 4, 2023 · f7f609a · f7f609a
2 parents 12fcd8b + fa48ebf
commit f7f609a
Show file tree

Hide file tree

Showing 22 changed files with 49 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.67.1 / 2023-08-03
+
+* [BUGFIX] Avoid skipping `AlertmanagerConfig` resources for Alertmanager versions prior v0.25.0. #5788
+
 ## 0.67.0 / 2023-07-27
 
 * [FEATURE] Add `spec.scheme` field to the ScrapeConfig CRD. #5679

diff --git a/Documentation/operator.md b/Documentation/operator.md
@@ -62,7 +62,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.67.0")
+    	Prometheus config reloader image (default "quay.io/prometheus-operator/prometheus-config-reloader:v0.67.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
@@ -26,7 +26,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.67.0
+    app.kubernetes.io/version: 0.67.1
   name: prometheus-operator
 rules:
 - apiGroups:
@@ -181,7 +181,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.67.0
+    app.kubernetes.io/version: 0.67.1
   name: prometheus-operator
   namespace: default
 ```
@@ -197,7 +197,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.67.0
+    app.kubernetes.io/version: 0.67.1
   name: prometheus-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/Documentation/user-guides/prometheus-agent.md b/Documentation/user-guides/prometheus-agent.md
@@ -26,7 +26,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.67.0
+    app.kubernetes.io/version: 0.67.1
   name: prometheus-operator
 rules:
 - apiGroups:

diff --git a/Documentation/user-guides/webhook.md b/Documentation/user-guides/webhook.md
@@ -86,7 +86,7 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.67.0
+    app.kubernetes.io/version: 0.67.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.67.0
+    app.kubernetes.io/version: 0.67.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.67.0
+        app.kubernetes.io/version: 0.67.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.67.0
+        image: quay.io/prometheus-operator/admission-webhook:v0.67.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.67.0
+    app.kubernetes.io/version: 0.67.1
   name: prometheus-operator-admission-webhook
   namespace: default
 spec:

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.67.0
+0.67.1
diff --git a/bundle.yaml b/bundle.yaml
diff --git a/example/admission-webhook/deployment.yaml b/example/admission-webhook/deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.67.0
+    app.kubernetes.io/version: 0.67.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.67.0
+        app.kubernetes.io/version: 0.67.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.67.0
+        image: quay.io/prometheus-operator/admission-webhook:v0.67.1
         name: prometheus-operator-admission-webhook
         ports:
         - containerPort: 8443

diff --git a/example/admission-webhook/pod-disruption-budget.yaml b/example/admission-webhook/pod-disruption-budget.yaml
@@ -3,7 +3,7 @@ kind: PodDisruptionBudget
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.67.0
+    app.kubernetes.io/version: 0.67.1
   name: prometheus-operator-admission-webhook
   namespace: default
 spec:

diff --git a/example/admission-webhook/service-account.yaml b/example/admission-webhook/service-account.yaml
@@ -4,6 +4,6 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.67.0
+    app.kubernetes.io/version: 0.67.1
   name: prometheus-operator-admission-webhook
   namespace: default
diff --git a/example/admission-webhook/service-monitor.yaml b/example/admission-webhook/service-monitor.yaml
@@ -3,7 +3,7 @@ kind: ServiceMonitor
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.67.0
+    app.kubernetes.io/version: 0.67.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.67.0
+      app.kubernetes.io/version: 0.67.1
diff --git a/example/admission-webhook/service.yaml b/example/admission-webhook/service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/name: prometheus-operator-admission-webhook
-    app.kubernetes.io/version: 0.67.0
+    app.kubernetes.io/version: 0.67.1
   name: prometheus-operator-admission-webhook
   namespace: default
 spec:

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.67.0
+    app.kubernetes.io/version: 0.67.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.67.0
+    app.kubernetes.io/version: 0.67.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.67.0
+    app.kubernetes.io/version: 0.67.1
   name: prometheus-operator
   namespace: default
 spec:
@@ -20,14 +20,14 @@ spec:
       labels:
         app.kubernetes.io/component: controller
         app.kubernetes.io/name: prometheus-operator
-        app.kubernetes.io/version: 0.67.0
+        app.kubernetes.io/version: 0.67.1
     spec:
       automountServiceAccountToken: true
       containers:
       - args:
         - --kubelet-service=kube-system/kubelet
-        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.67.0
-        image: quay.io/prometheus-operator/prometheus-operator:v0.67.0
+        - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.67.1
+        image: quay.io/prometheus-operator/prometheus-operator:v0.67.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
@@ -5,6 +5,6 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: 0.67.0
+    app.kubernetes.io/version: 0.67.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.67.0
+    app.kubernetes.io/version: 0.67.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.67.0
+      app.kubernetes.io/version: 0.67.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.67.0
+    app.kubernetes.io/version: 0.67.1
   name: prometheus-operator
   namespace: default
 spec:

diff --git a/go.mod b/go.mod
@@ -21,8 +21,8 @@ require (
 	github.com/oklog/run v1.1.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus-community/prom-label-proxy v0.7.0
-	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.67.0
-	github.com/prometheus-operator/prometheus-operator/pkg/client v0.67.0
+	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.67.1
+	github.com/prometheus-operator/prometheus-operator/pkg/client v0.67.1
 	github.com/prometheus/alertmanager v0.25.0
 	github.com/prometheus/client_golang v1.16.0
 	github.com/prometheus/common v0.44.0

diff --git a/pkg/alertmanager/operator.go b/pkg/alertmanager/operator.go
@@ -1323,6 +1323,9 @@ func checkDiscordConfigs(
 	store *assets.Store,
 	amVersion semver.Version,
 ) error {
+	if len(configs) == 0 {
+		return nil
+	}
 	if amVersion.LT(semver.MustParse("0.25.0")) {
 		return fmt.Errorf(`discordConfigs' is available in Alertmanager >= 0.25.0 only - current %s`, amVersion)
 	}

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.19
 
 require (
-	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.67.0
+	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.67.1
 	k8s.io/api v0.27.2
 	k8s.io/apiextensions-apiserver v0.27.2
 	k8s.io/apimachinery v0.27.2

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -347,13 +347,13 @@ github.com/pmezard/go-difflib/difflib
 # github.com/prometheus-community/prom-label-proxy v0.7.0
 ## explicit; go 1.19
 github.com/prometheus-community/prom-label-proxy/injectproxy
-# github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.67.0 => ./pkg/apis/monitoring
+# github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.67.1 => ./pkg/apis/monitoring
 ## explicit; go 1.17
 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring
 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1
 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1
 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1beta1
-# github.com/prometheus-operator/prometheus-operator/pkg/client v0.67.0 => ./pkg/client
+# github.com/prometheus-operator/prometheus-operator/pkg/client v0.67.1 => ./pkg/client
 ## explicit; go 1.19
 github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1
 github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1