Merge pull request #1887 from guillaumerose/master

Bug 1907329: Update /manifests with default cluster profile annotation

Author: openshift-merge-robot

manifests/0000_50_olm_00-catalogsources.crd.yaml

@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
+    include.release.openshift.io/self-managed-high-availability: "true"
   creationTimestamp: null
   name: catalogsources.operators.coreos.com
 spec:
@@ -164,4 +165,3 @@ spec:
       storage: true
       subresources:
         status: {}
-

manifests/0000_50_olm_00-clusterserviceversions.crd.yaml

@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
+    include.release.openshift.io/self-managed-high-availability: "true"
   creationTimestamp: null
   name: clusterserviceversions.operators.coreos.com
 spec:
@@ -4779,4 +4780,3 @@ spec:
       storage: true
       subresources:
         status: {}
-

manifests/0000_50_olm_00-installplans.crd.yaml

@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
+    include.release.openshift.io/self-managed-high-availability: "true"
   creationTimestamp: null
   name: installplans.operators.coreos.com
 spec:
@@ -253,4 +254,3 @@ spec:
       storage: true
       subresources:
         status: {}
-

manifests/0000_50_olm_00-namespace.yaml

@@ -2,9 +2,9 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: openshift-operator-lifecycle-manager
-  
   annotations:
     openshift.io/node-selector: ""
+    include.release.openshift.io/self-managed-high-availability: "true"
   labels:
     openshift.io/scc: "anyuid"
     openshift.io/cluster-monitoring: "true"
@@ -13,8 +13,8 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: openshift-operators
-  
   annotations:
     openshift.io/node-selector: ""
+    include.release.openshift.io/self-managed-high-availability: "true"
   labels:
     openshift.io/scc: "anyuid"

manifests/0000_50_olm_00-operatorconditions.crd.yaml

@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
+    include.release.openshift.io/self-managed-high-availability: "true"
   creationTimestamp: null
   name: operatorconditions.operators.coreos.com
 spec:
@@ -135,4 +136,3 @@ spec:
       storage: true
       subresources:
         status: {}
-

manifests/0000_50_olm_00-operatorgroups.crd.yaml

@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
+    include.release.openshift.io/self-managed-high-availability: "true"
   creationTimestamp: null
   name: operatorgroups.operators.coreos.com
 spec:
@@ -230,4 +231,3 @@ spec:
       storage: false
       subresources:
         status: {}
-

manifests/0000_50_olm_00-operators.crd.yaml

@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
+    include.release.openshift.io/self-managed-high-availability: "true"
   creationTimestamp: null
   name: operators.operators.coreos.com
 spec:
@@ -135,4 +136,3 @@ spec:
       storage: true
       subresources:
         status: {}
-

manifests/0000_50_olm_00-subscriptions.crd.yaml

@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
+    include.release.openshift.io/self-managed-high-availability: "true"
   creationTimestamp: null
   name: subscriptions.operators.coreos.com
 spec:
@@ -1339,4 +1340,3 @@ spec:
       storage: true
       subresources:
         status: {}
-

manifests/0000_50_olm_01-olm-operator.serviceaccount.yaml

@@ -3,27 +3,33 @@ apiVersion: v1
 metadata:
   name: olm-operator-serviceaccount
   namespace: openshift-operator-lifecycle-manager
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: system:controller:operator-lifecycle-manager
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 rules:
-- apiGroups: ["*"]
-  resources: ["*"]
-  verbs: ["*"]
-- nonResourceURLs: ["*"]
-  verbs: ["*"]
+  - apiGroups: ["*"]
+    resources: ["*"]
+    verbs: ["*"]
+  - nonResourceURLs: ["*"]
+    verbs: ["*"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: olm-operator-binding-openshift-operator-lifecycle-manager
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: system:controller:operator-lifecycle-manager
 subjects:
-- kind: ServiceAccount
-  name: olm-operator-serviceaccount
-  namespace: openshift-operator-lifecycle-manager
+  - kind: ServiceAccount
+    name: olm-operator-serviceaccount
+    namespace: openshift-operator-lifecycle-manager

manifests/0000_50_olm_02-services.yaml

@@ -5,15 +5,16 @@ metadata:
   namespace: openshift-operator-lifecycle-manager
   annotations:
     service.alpha.openshift.io/serving-cert-secret-name: olm-operator-serving-cert
+    include.release.openshift.io/self-managed-high-availability: "true"
   labels:
     app: olm-operator
 spec:
   type: ClusterIP
   ports:
-  - name: https-metrics
-    port: 8081
-    protocol: TCP
-    targetPort: metrics
+    - name: https-metrics
+      port: 8081
+      protocol: TCP
+      targetPort: metrics
   selector:
     app: olm-operator
 ---
@@ -24,14 +25,15 @@ metadata:
   namespace: openshift-operator-lifecycle-manager
   annotations:
     service.alpha.openshift.io/serving-cert-secret-name: catalog-operator-serving-cert
+    include.release.openshift.io/self-managed-high-availability: "true"
   labels:
     app: catalog-operator
 spec:
   type: ClusterIP
   ports:
-  - name: https-metrics
-    port: 8081
-    protocol: TCP
-    targetPort: metrics
+    - name: https-metrics
+      port: 8081
+      protocol: TCP
+      targetPort: metrics
   selector:
     app: catalog-operator