Merge pull request #850 from lilic/fix-crd-version

Bump prometheus-operator to 0.40.0 version
openshift · Jul 15, 2020 · 061ba1c · 061ba1c
2 parents 83f478c + e977e88
commit 061ba1c
Show file tree

Hide file tree

Showing 25 changed files with 10,131 additions and 9,994 deletions.
diff --git a/assets/prometheus-operator-user-workload/cluster-role-binding.yaml b/assets/prometheus-operator-user-workload/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: v0.38.1
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-user-workload-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/assets/prometheus-operator-user-workload/cluster-role.yaml b/assets/prometheus-operator-user-workload/cluster-role.yaml
@@ -4,29 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.38.1
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-user-workload-operator
 rules:
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - customresourcedefinitions
-  verbs:
-  - create
-- apiGroups:
-  - apiextensions.k8s.io
-  resourceNames:
-  - alertmanagers.monitoring.coreos.com
-  - podmonitors.monitoring.coreos.com
-  - prometheuses.monitoring.coreos.com
-  - prometheusrules.monitoring.coreos.com
-  - servicemonitors.monitoring.coreos.com
-  - thanosrulers.monitoring.coreos.com
-  resources:
-  - customresourcedefinitions
-  verbs:
-  - get
-  - update
 - apiGroups:
   - monitoring.coreos.com
   resources:
@@ -99,3 +79,23 @@ rules:
   - subjectaccessreviews
   verbs:
   - create
+- apiGroups:
+  - apiextensions.k8s.io
+  resources:
+  - customresourcedefinitions
+  verbs:
+  - create
+- apiGroups:
+  - apiextensions.k8s.io
+  resourceNames:
+  - alertmanagers.monitoring.coreos.com
+  - podmonitors.monitoring.coreos.com
+  - prometheuses.monitoring.coreos.com
+  - prometheusrules.monitoring.coreos.com
+  - servicemonitors.monitoring.coreos.com
+  - thanosrulers.monitoring.coreos.com
+  resources:
+  - customresourcedefinitions
+  verbs:
+  - get
+  - update
diff --git a/assets/prometheus-operator-user-workload/deployment.yaml b/assets/prometheus-operator-user-workload/deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.38.1
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-operator
   namespace: openshift-user-workload-monitoring
 spec:
@@ -18,20 +18,20 @@ spec:
       labels:
         app.kubernetes.io/component: controller
         app.kubernetes.io/name: prometheus-operator
-        app.kubernetes.io/version: v0.38.1
+        app.kubernetes.io/version: v0.40.0
     spec:
       containers:
       - args:
         - --kubelet-service=kube-system/kubelet
         - --logtostderr=true
         - --config-reloader-image=jimmidyson/configmap-reload:v0.3.0
-        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.38.1
+        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.40.0
         - --deny-namespaces=openshift-monitoring
         - --prometheus-instance-namespaces=openshift-user-workload-monitoring
         - --alertmanager-instance-namespaces=openshift-user-workload-monitoring
         - --thanos-ruler-instance-namespaces=openshift-user-workload-monitoring
         - --config-reloader-cpu=0
-        image: quay.io/coreos/prometheus-operator:v0.38.1
+        image: quay.io/coreos/prometheus-operator:v0.40.0
         name: prometheus-operator
         ports:
         - containerPort: 8080

diff --git a/assets/prometheus-operator-user-workload/service-account.yaml b/assets/prometheus-operator-user-workload/service-account.yaml
@@ -4,6 +4,6 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.38.1
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-operator
   namespace: openshift-user-workload-monitoring
diff --git a/assets/prometheus-operator-user-workload/service-monitor.yaml b/assets/prometheus-operator-user-workload/service-monitor.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.38.1
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-operator
   namespace: openshift-user-workload-monitoring
 spec:
@@ -20,4 +20,4 @@ spec:
     matchLabels:
       app.kubernetes.io/component: controller
       app.kubernetes.io/name: prometheus-operator
-      app.kubernetes.io/version: v0.38.1
+      app.kubernetes.io/version: v0.40.0
diff --git a/assets/prometheus-operator-user-workload/service.yaml b/assets/prometheus-operator-user-workload/service.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.38.1
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-operator
   namespace: openshift-user-workload-monitoring
 spec:

diff --git a/assets/prometheus-operator/cluster-role-binding.yaml b/assets/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: v0.38.1
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/assets/prometheus-operator/cluster-role.yaml b/assets/prometheus-operator/cluster-role.yaml
@@ -4,29 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.38.1
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-operator
 rules:
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - customresourcedefinitions
-  verbs:
-  - create
-- apiGroups:
-  - apiextensions.k8s.io
-  resourceNames:
-  - alertmanagers.monitoring.coreos.com
-  - podmonitors.monitoring.coreos.com
-  - prometheuses.monitoring.coreos.com
-  - prometheusrules.monitoring.coreos.com
-  - servicemonitors.monitoring.coreos.com
-  - thanosrulers.monitoring.coreos.com
-  resources:
-  - customresourcedefinitions
-  verbs:
-  - get
-  - update
 - apiGroups:
   - monitoring.coreos.com
   resources:
@@ -99,3 +79,23 @@ rules:
   - subjectaccessreviews
   verbs:
   - create
+- apiGroups:
+  - apiextensions.k8s.io
+  resources:
+  - customresourcedefinitions
+  verbs:
+  - create
+- apiGroups:
+  - apiextensions.k8s.io
+  resourceNames:
+  - alertmanagers.monitoring.coreos.com
+  - podmonitors.monitoring.coreos.com
+  - prometheuses.monitoring.coreos.com
+  - prometheusrules.monitoring.coreos.com
+  - servicemonitors.monitoring.coreos.com
+  - thanosrulers.monitoring.coreos.com
+  resources:
+  - customresourcedefinitions
+  verbs:
+  - get
+  - update
diff --git a/assets/prometheus-operator/deployment.yaml b/assets/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: v0.38.1
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-operator
   namespace: openshift-monitoring
 spec:
@@ -18,14 +18,14 @@ spec:
       labels:
         app.kubernetes.io/component: controller
         app.kubernetes.io/name: prometheus-operator
-        app.kubernetes.io/version: v0.38.1
+        app.kubernetes.io/version: v0.40.0
     spec:
       containers:
       - args:
         - --kubelet-service=kube-system/kubelet
         - --logtostderr=true
         - --config-reloader-image=jimmidyson/configmap-reload:v0.3.0
-        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.38.1
+        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.40.0
         - --namespaces=openshift-monitoring
         - --prometheus-instance-namespaces=openshift-monitoring
         - --thanos-ruler-instance-namespaces=openshift-monitoring
@@ -35,7 +35,7 @@ spec:
         - --web.enable-tls=true
         - --web.tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256
         - --web.tls-min-version=VersionTLS12
-        image: quay.io/coreos/prometheus-operator:v0.38.1
+        image: quay.io/coreos/prometheus-operator:v0.40.0
         name: prometheus-operator
         ports:
         - containerPort: 8080

diff --git a/assets/prometheus-operator/prometheus-rule-validating-webhook.yaml b/assets/prometheus-operator/prometheus-rule-validating-webhook.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.38.1
+    app.kubernetes.io/version: v0.40.0
   name: prometheusrules.openshift.io
 webhooks:
 - admissionReviewVersions:

diff --git a/assets/prometheus-operator/service-account.yaml b/assets/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: v0.38.1
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-operator
   namespace: openshift-monitoring
diff --git a/assets/prometheus-operator/service-monitor.yaml b/assets/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: v0.38.1
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-operator
   namespace: openshift-monitoring
 spec:
@@ -20,4 +20,4 @@ spec:
     matchLabels:
       app.kubernetes.io/component: controller
       app.kubernetes.io/name: prometheus-operator
-      app.kubernetes.io/version: v0.38.1
+      app.kubernetes.io/version: v0.40.0
diff --git a/assets/prometheus-operator/service.yaml b/assets/prometheus-operator/service.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/component: controller
     app.kubernetes.io/name: prometheus-operator
-    app.kubernetes.io/version: v0.38.1
+    app.kubernetes.io/version: v0.40.0
   name: prometheus-operator
   namespace: openshift-monitoring
 spec:

diff --git a/jsonnet/jsonnetfile.json b/jsonnet/jsonnetfile.json
@@ -26,7 +26,7 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "release-0.38"
+      "version": "release-0.40"
     },
     {
       "source": {

diff --git a/jsonnet/jsonnetfile.lock.json b/jsonnet/jsonnetfile.lock.json
@@ -34,12 +34,12 @@
     {
       "source": {
         "git": {
-          "remote": "https://github.com/coreos/prometheus-operator",
+          "remote": "https://github.com/coreos/prometheus-operator.git",
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "8fa7349020073bcc7932abb2bc4bd08e4bc3a0ac",
-      "sum": "z4e20kyCOyqH3V+wnq2yEzch6LsZa37bsimcl5+eYA4="
+      "version": "e31c69f9b5c6555e0f4a5c1f39d0f03182dd6b41",
+      "sum": "WggWVWZ+CBEUThQCztSaRELbtqdXf9s3OFzf06HbYNA="
     },
     {
       "source": {

diff --git a/jsonnet/prometheus-operator-user-workload.jsonnet b/jsonnet/prometheus-operator-user-workload.jsonnet
@@ -16,8 +16,42 @@ local tlsVolumeName = 'prometheus-operator-user-workload-tls';
     '0podmonitorCustomResourceDefinition':: {},
     '0prometheusruleCustomResourceDefinition':: {},
     '0thanosrulerCustomResourceDefinition':: {},
-
+    // TODO: remove after 0.40 prometheus-operator is merged.
     clusterRole+: {
+     rules+:
+      [
+	  {
+	    "apiGroups": [
+	      "apiextensions.k8s.io"
+	    ],
+	    "resources": [
+	      "customresourcedefinitions"
+	    ],
+	    "verbs": [
+	      "create"
+	    ]
+	  },
+	  {
+	    "apiGroups": [
+	      "apiextensions.k8s.io"
+	    ],
+	    "resourceNames": [
+	      "alertmanagers.monitoring.coreos.com",
+	      "podmonitors.monitoring.coreos.com",
+	      "prometheuses.monitoring.coreos.com",
+	      "prometheusrules.monitoring.coreos.com",
+	      "servicemonitors.monitoring.coreos.com",
+	      "thanosrulers.monitoring.coreos.com"
+	    ],
+	    "resources": [
+	      "customresourcedefinitions"
+	    ],
+	    "verbs": [
+	      "get",
+	      "update"
+	    ]
+	  }
+	],
       metadata+: {
         name: 'prometheus-user-workload-operator',
       },

diff --git a/jsonnet/prometheus-operator.jsonnet b/jsonnet/prometheus-operator.jsonnet
@@ -94,6 +94,43 @@ local certsCAVolumeName = 'operator-certs-ca-bundle';
           },
         },
       },
+    // TODO: remove after 0.40 prometheus-operator is merged.
+    clusterRole+: {
+     rules+:
+      [
+	  {
+	    "apiGroups": [
+	      "apiextensions.k8s.io"
+	    ],
+	    "resources": [
+	      "customresourcedefinitions"
+	    ],
+	    "verbs": [
+	      "create"
+	    ]
+	  },
+	  {
+	    "apiGroups": [
+	      "apiextensions.k8s.io"
+	    ],
+	    "resourceNames": [
+	      "alertmanagers.monitoring.coreos.com",
+	      "podmonitors.monitoring.coreos.com",
+	      "prometheuses.monitoring.coreos.com",
+	      "prometheusrules.monitoring.coreos.com",
+	      "servicemonitors.monitoring.coreos.com",
+	      "thanosrulers.monitoring.coreos.com"
+	    ],
+	    "resources": [
+	      "customresourcedefinitions"
+	    ],
+	    "verbs": [
+	      "get",
+	      "update"
+	    ]
+	  }
+	],
+    },
 
     service+:
       service.mixin.metadata.withAnnotations({