Update /manifests with default cluster profile annotation

Updated with `make release`
operator-framework · Dec 23, 2020 · 4ee846a · 4ee846a
1 parent 1ed93cf
commit 4ee846a
Show file tree

Hide file tree

Showing 18 changed files with 294 additions and 268 deletions.
diff --git a/manifests/0000_50_olm_00-catalogsources.crd.yaml b/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: {}
-
diff --git a/manifests/0000_50_olm_00-clusterserviceversions.crd.yaml b/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: {}
-
diff --git a/manifests/0000_50_olm_00-installplans.crd.yaml b/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: {}
-
diff --git a/manifests/0000_50_olm_00-namespace.yaml b/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"
diff --git a/manifests/0000_50_olm_00-operatorconditions.crd.yaml b/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: {}
-
diff --git a/manifests/0000_50_olm_00-operatorgroups.crd.yaml b/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: {}
-
diff --git a/manifests/0000_50_olm_00-operators.crd.yaml b/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: {}
-
diff --git a/manifests/0000_50_olm_00-subscriptions.crd.yaml b/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: {}
-
diff --git a/manifests/0000_50_olm_01-olm-operator.serviceaccount.yaml b/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
diff --git a/manifests/0000_50_olm_02-services.yaml b/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
diff --git a/manifests/0000_50_olm_07-olm-operator.deployment.yaml b/manifests/0000_50_olm_07-olm-operator.deployment.yaml
@@ -5,6 +5,8 @@ metadata:
   namespace: openshift-operator-lifecycle-manager
   labels:
     app: olm-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   strategy:
     type: RollingUpdate
@@ -22,18 +24,18 @@ spec:
       containers:
         - name: olm-operator
           command:
-          - /bin/olm
+            - /bin/olm
           args:
-          - --namespace
-          - $(OPERATOR_NAMESPACE)
-          - --writeStatusName
-          - operator-lifecycle-manager
-          - --writePackageServerStatusName
-          - operator-lifecycle-manager-packageserver
-          - --tls-cert
-          - /var/run/secrets/serving-cert/tls.crt
-          - --tls-key
-          - /var/run/secrets/serving-cert/tls.key
+            - --namespace
+            - $(OPERATOR_NAMESPACE)
+            - --writeStatusName
+            - operator-lifecycle-manager
+            - --writePackageServerStatusName
+            - operator-lifecycle-manager-packageserver
+            - --tls-cert
+            - /var/run/secrets/serving-cert/tls.crt
+            - --tls-key
+            - /var/run/secrets/serving-cert/tls.key
           image: quay.io/operator-framework/olm@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607
           imagePullPolicy: IfNotPresent
           ports:
@@ -51,43 +53,37 @@ spec:
               port: 8080
           terminationMessagePolicy: FallbackToLogsOnError
           env:
-
-          - name: RELEASE_VERSION
-            value: "0.0.1-snapshot"
-
-          - name: OPERATOR_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-          - name: OPERATOR_NAME
-            value: olm-operator
+            - name: RELEASE_VERSION
+              value: "0.0.1-snapshot"
+            - name: OPERATOR_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: OPERATOR_NAME
+              value: olm-operator
           resources:
             requests:
               cpu: 10m
               memory: 160Mi
-
           volumeMounts:
-          - mountPath: /var/run/secrets/serving-cert
-            name: serving-cert
-
-
+            - mountPath: /var/run/secrets/serving-cert
+              name: serving-cert
       volumes:
-      - name: serving-cert
-        secret:
-          secretName: olm-operator-serving-cert
-
+        - name: serving-cert
+          secret:
+            secretName: olm-operator-serving-cert
       nodeSelector:
         kubernetes.io/os: linux
         node-role.kubernetes.io/master: ""
       tolerations:
-      - effect: NoSchedule
-        key: node-role.kubernetes.io/master
-        operator: Exists
-      - effect: NoExecute
-        key: node.kubernetes.io/unreachable
-        operator: Exists
-        tolerationSeconds: 120
-      - effect: NoExecute
-        key: node.kubernetes.io/not-ready
-        operator: Exists
-        tolerationSeconds: 120
+        - effect: NoSchedule
+          key: node-role.kubernetes.io/master
+          operator: Exists
+        - effect: NoExecute
+          key: node.kubernetes.io/unreachable
+          operator: Exists
+          tolerationSeconds: 120
+        - effect: NoExecute
+          key: node.kubernetes.io/not-ready
+          operator: Exists
+          tolerationSeconds: 120
diff --git a/manifests/0000_50_olm_08-catalog-operator.deployment.yaml b/manifests/0000_50_olm_08-catalog-operator.deployment.yaml
@@ -5,6 +5,8 @@ metadata:
   namespace: openshift-operator-lifecycle-manager
   labels:
     app: catalog-operator
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
 spec:
   strategy:
     type: RollingUpdate
@@ -22,19 +24,19 @@ spec:
       containers:
         - name: catalog-operator
           command:
-          - /bin/catalog
+            - /bin/catalog
           args:
-          - '-namespace'
-          - openshift-marketplace
-          - -configmapServerImage=quay.io/operator-framework/configmap-operator-registry:latest
-          - -util-image
-          -  quay.io/operator-framework/olm@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607
-          - -writeStatusName
-          - operator-lifecycle-manager-catalog
-          - -tls-cert
-          - /var/run/secrets/serving-cert/tls.crt
-          - -tls-key
-          - /var/run/secrets/serving-cert/tls.key
+            - '-namespace'
+            - openshift-marketplace
+            - -configmapServerImage=quay.io/operator-framework/configmap-operator-registry:latest
+            - -util-image
+            - quay.io/operator-framework/olm@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607
+            - -writeStatusName
+            - operator-lifecycle-manager-catalog
+            - -tls-cert
+            - /var/run/secrets/serving-cert/tls.crt
+            - -tls-key
+            - /var/run/secrets/serving-cert/tls.key
           image: quay.io/operator-framework/olm@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607
           imagePullPolicy: IfNotPresent
           ports:
@@ -52,37 +54,31 @@ spec:
               port: 8080
           terminationMessagePolicy: FallbackToLogsOnError
           env:
-
-          - name: RELEASE_VERSION
-            value: "0.0.1-snapshot"
-
+            - name: RELEASE_VERSION
+              value: "0.0.1-snapshot"
           resources:
             requests:
               cpu: 10m
               memory: 80Mi
-
           volumeMounts:
-          - mountPath: /var/run/secrets/serving-cert
-            name: serving-cert
-
-
+            - mountPath: /var/run/secrets/serving-cert
+              name: serving-cert
       volumes:
-      - name: serving-cert
-        secret:
-          secretName: catalog-operator-serving-cert
-
+        - name: serving-cert
+          secret:
+            secretName: catalog-operator-serving-cert
       nodeSelector:
         kubernetes.io/os: linux
         node-role.kubernetes.io/master: ""
       tolerations:
-      - effect: NoSchedule
-        key: node-role.kubernetes.io/master
-        operator: Exists
-      - effect: NoExecute
-        key: node.kubernetes.io/unreachable
-        operator: Exists
-        tolerationSeconds: 120
-      - effect: NoExecute
-        key: node.kubernetes.io/not-ready
-        operator: Exists
-        tolerationSeconds: 120
+        - effect: NoSchedule
+          key: node-role.kubernetes.io/master
+          operator: Exists
+        - effect: NoExecute
+          key: node.kubernetes.io/unreachable
+          operator: Exists
+          tolerationSeconds: 120
+        - effect: NoExecute
+          key: node.kubernetes.io/not-ready
+          operator: Exists
+          tolerationSeconds: 120