Merge pull request #334 from guillaumerose/master

add current profile annotations to CVO manifests

manifests/01-namespace.yaml

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

manifests/010-prometheus-rules.yaml

@@ -5,6 +5,8 @@ metadata:
     name: samples-operator-alerts
   name: samples-operator-alerts
   namespace: openshift-cluster-samples-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   groups:
   - name: SamplesOperator

manifests/02-sa.yaml

@@ -4,3 +4,5 @@ kind: ServiceAccount
 metadata:
   name: cluster-samples-operator
   namespace: openshift-cluster-samples-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"

manifests/03-rbac-proxies-role-binding.yaml

@@ -2,6 +2,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-samples-operator-proxy-reader
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 subjects:
   - kind: ServiceAccount
     name: cluster-samples-operator

manifests/03-rbac-proxies-role.yaml

@@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: cluster-samples-operator-proxy-reader
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
   - apiGroups:
       - config.openshift.io

manifests/03-rbac.yaml

@@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-samples-operator
   namespace: openshift-cluster-samples-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
   - ""
@@ -32,6 +34,8 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-samples-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
   - samples.operator.openshift.io
@@ -56,6 +60,8 @@ metadata:
   labels:
     rbac.authorization.k8s.io/aggregate-to-cluster-reader: "true"
   name: system:openshift:cluster-samples-operator:cluster-reader
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
   - samples.operator.openshift.io
@@ -74,6 +80,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-samples-operator
   namespace: openshift-cluster-samples-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 subjects:
 - kind: ServiceAccount
   name: cluster-samples-operator
@@ -88,6 +96,8 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-samples-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 subjects:
 - kind: ServiceAccount
   name: cluster-samples-operator

manifests/04-openshift-rbac.yaml

@@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-samples-operator-openshift-edit
   namespace: openshift
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 subjects:
 - kind: ServiceAccount
   name: cluster-samples-operator

manifests/05-kube-system-rbac.yaml

@@ -3,6 +3,8 @@ kind: Role
 metadata:
   name: coreos-pull-secret-reader
   namespace: openshift-config
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
   - ""
@@ -20,6 +22,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cluster-samples-operator-openshift-config-secret-reader
   namespace: openshift-config
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 subjects:
 - kind: ServiceAccount
   name: cluster-samples-operator

manifests/06-metricsservice.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
     service.beta.openshift.io/serving-cert-secret-name: samples-operator-tls
   labels:
     name: cluster-samples-operator

manifests/06-operator.yaml

@@ -3,6 +3,8 @@ kind: Deployment
 metadata:
   name: cluster-samples-operator
   namespace: openshift-cluster-samples-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   replicas: 1
   selector:

manifests/06-servicemonitor.yaml

@@ -4,6 +4,8 @@ kind: ServiceMonitor
 metadata:
   name: cluster-samples-operator
   namespace: openshift-cluster-samples-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   endpoints:
   - targetPort: 60000

manifests/07-clusteroperator.yaml

@@ -2,6 +2,8 @@ apiVersion: config.openshift.io/v1
 kind: ClusterOperator
 metadata:
   name: openshift-samples
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec: {}
 status:
   versions:

manifests/08-openshift-imagestreams.yaml

@@ -6,6 +6,8 @@ apiVersion: image.openshift.io/v1
 metadata:
   namespace: openshift
   name: cli
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
   - name: latest
@@ -20,6 +22,8 @@ apiVersion: image.openshift.io/v1
 metadata:
   namespace: openshift
   name: cli-artifacts
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
   - name: latest
@@ -34,6 +38,8 @@ apiVersion: image.openshift.io/v1
 metadata:
   namespace: openshift
   name: installer
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
   - name: latest
@@ -48,6 +54,8 @@ apiVersion: image.openshift.io/v1
 metadata:
   namespace: openshift
   name: installer-artifacts
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
   - name: latest
@@ -62,6 +70,8 @@ apiVersion: image.openshift.io/v1
 metadata:
   namespace: openshift
   name: tests
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
   - name: latest
@@ -76,6 +86,8 @@ apiVersion: image.openshift.io/v1
 metadata:
   namespace: openshift
   name: tools
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
   - name: latest
@@ -90,6 +102,8 @@ apiVersion: image.openshift.io/v1
 metadata:
   namespace: openshift
   name: must-gather
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
     - name: latest
@@ -104,6 +118,8 @@ apiVersion: image.openshift.io/v1
 metadata:
   namespace: openshift
   name: oauth-proxy
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
     - name: v4.4
@@ -118,6 +134,8 @@ apiVersion: image.openshift.io/v1
 metadata:
   namespace: openshift
   name: hello-openshift
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   tags:
   - name: latest

manifests/09-servicemonitor-rbac.yaml

@@ -4,6 +4,8 @@ kind: Role
 metadata:
   name: prometheus-k8s
   namespace: openshift-cluster-samples-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
 - apiGroups:
   - ""
@@ -21,6 +23,8 @@ kind: RoleBinding
 metadata:
   name: prometheus-k8s
   namespace: openshift-cluster-samples-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role