Merge pull request #235 from guillaumerose/master

add current profile annotations to CVO manifests

Author: openshift-merge-robot

manifests/02-namespace.yaml

@@ -3,6 +3,7 @@ kind: Namespace
 metadata:
   name: openshift-insights
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     openshift.io/node-selector: ""
   labels:
     openshift.io/cluster-monitoring: "true"

manifests/03-clusterrole.yaml

@@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: insights-operator-auth
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   kind: ClusterRole
   name: system:auth-delegator
@@ -15,6 +17,8 @@ kind: RoleBinding
 metadata:
   name: insights-operator-auth
   namespace: kube-system
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   kind: Role
   name: extension-apiserver-authentication-reader
@@ -28,6 +32,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: insights-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 # allow the operator to update cluster operator status
 - apiGroups:
@@ -68,6 +74,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: insights-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   kind: ClusterRole
   name: insights-operator
@@ -81,6 +89,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: insights-operator-gather
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
   - ""
@@ -149,6 +159,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: insights-operator-gather
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   kind: ClusterRole
   name: insights-operator-gather
@@ -162,6 +174,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: insights-operator-gather-reader
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   kind: ClusterRole
   name: cluster-reader
@@ -176,6 +190,8 @@ kind: Role
 metadata:
   name: insights-operator
   namespace: openshift-config
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
   - ""
@@ -192,6 +208,8 @@ kind: RoleBinding
 metadata:
   name: insights-operator
   namespace: openshift-config
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   kind: Role
   name: insights-operator
@@ -206,6 +224,8 @@ kind: Role
 metadata:
   name: insights-operator
   namespace: openshift-insights
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
   - ""
@@ -227,6 +247,8 @@ kind: RoleBinding
 metadata:
   name: insights-operator
   namespace: openshift-insights
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   kind: Role
   name: insights-operator

manifests/03-prometheus_role.yaml

@@ -3,6 +3,8 @@ kind: Role
 metadata:
   name: prometheus-k8s
   namespace: openshift-insights
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
   - ""

manifests/03-prometheus_rolebinding.yaml

@@ -3,6 +3,8 @@ kind: RoleBinding
 metadata:
   name: prometheus-k8s
   namespace: openshift-insights
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

manifests/04-proxy-cert-configmap.yaml

@@ -4,6 +4,7 @@ metadata:
   namespace: openshift-insights
   name: trusted-ca-bundle
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/create-only: "true"
   labels:
     config.openshift.io/inject-trusted-cabundle: "true"

manifests/04-service-ca-configmap.yaml

@@ -4,5 +4,6 @@ metadata:
   namespace: openshift-insights
   name: service-ca-bundle
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/create-only: "true"
     service.beta.openshift.io/inject-cabundle: "true"

manifests/04-serviceaccount.yaml

@@ -3,9 +3,13 @@ kind: ServiceAccount
 metadata:
   namespace: openshift-insights
   name: operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   namespace: openshift-insights
   name: gather
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"

manifests/05-service.yaml

@@ -2,8 +2,9 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    service.alpha.openshift.io/serving-cert-secret-name: openshift-insights-serving-cert
     exclude.release.openshift.io/internal-openshift-hosted: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    service.alpha.openshift.io/serving-cert-secret-name: openshift-insights-serving-cert
   labels:
     app: insights-operator
   name: metrics

manifests/06-deployment.yaml

@@ -6,6 +6,7 @@ metadata:
   annotations:
     config.openshift.io/inject-proxy: insights-operator
     exclude.release.openshift.io/internal-openshift-hosted: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   strategy:
     type: Recreate

manifests/07-cluster-operator.yaml

@@ -4,6 +4,7 @@ metadata:
   name: insights
   annotations:
     exclude.release.openshift.io/internal-openshift-hosted: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec: {}
 status:
   versions:

manifests/07-servicemonitor.yaml

@@ -5,6 +5,7 @@ metadata:
   namespace: openshift-insights
   annotations:
     exclude.release.openshift.io/internal-openshift-hosted: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   endpoints:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token