Merge pull request #234 from paulfantom/fix_service_monitor

openshift-merge-robot · web-flow · commit 015b9df4f83d · 2019-08-13T15:57:22.000+02:00
Bug 1738527: install: add role bindings for prometheus service account
diff --git a/install/0000_90_cluster-version-operator_00_prometheusrole.yaml b/install/0000_90_cluster-version-operator_00_prometheusrole.yaml
@@ -0,0 +1,16 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: prometheus-k8s
+  namespace: openshift-cluster-version
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - services
+  - endpoints
+  - pods
+  verbs:
+  - get
+  - list
+  - watch
diff --git a/install/0000_90_cluster-version-operator_01_prometheusrolebinding.yaml b/install/0000_90_cluster-version-operator_01_prometheusrolebinding.yaml
@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: prometheus-k8s
+  namespace: openshift-cluster-version
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: prometheus-k8s
+subjects:
+- kind: ServiceAccount
+  name: prometheus-k8s
+  namespace: openshift-monitoring
diff --git a/install/0000_90_cluster-version-operator_02_servicemonitor.yaml b/install/0000_90_cluster-version-operator_02_servicemonitor.yaml
diff --git a/pkg/payload/render.go b/pkg/payload/render.go
@@ -34,7 +34,9 @@ func Render(outputDir, releaseImage string) error {
 		odir: oManifestsDir,
 		skipFiles: sets.NewString(
 			"image-references",
-			"0000_90_cluster-version-operator_00_servicemonitor.yaml",
+			"0000_90_cluster-version-operator_00_prometheusrole.yaml",
+			"0000_90_cluster-version-operator_01_prometheusrolebinding.yaml",
+			"0000_90_cluster-version-operator_02_servicemonitor.yaml",
 		),
 	}, {
 		idir:      bootstrapDir,
