Merge pull request #9527 from ecordell/olm-deploy-fixes

Update release artifacts for OLM

roles/olm/files/10-tectonicocs.catalogsource.yaml

@@ -1,19 +0,0 @@
-##---
-# Source: olm/templates/10-tectonicocs.catalogsource.yaml
-
-#! validate-crd: ./deploy/chart/templates/05-catalogsource.crd.yaml
-#! parse-kind: CatalogSource
-apiVersion: app.coreos.com/v1alpha1
-kind: CatalogSource-v1
-metadata:
-  name: tectonic-ocs
-  namespace: operator-lifecycle-manager
-  annotations:
-    tectonic-operators.coreos.com/upgrade-strategy: 'DeleteAndRecreate'
-spec:
-  name: tectonic-ocs
-  sourceType: internal
-  configMap: tectonic-ocs
-  displayName: Tectonic Open Cloud Services
-  publisher: CoreOS, Inc.
-

roles/olm/files/14-alm-servicebroker.clusterservicebroker.yaml

@@ -1,20 +0,0 @@
-##---
-# Source: olm/templates/14-alm-servicebroker.clusterservicebroker.yaml
-
-apiVersion: servicecatalog.k8s.io/v1beta1
-kind: ClusterServiceBroker
-metadata:
-  finalizers:
-  - kubernetes-incubator/service-catalog
-  name: alm-service-broker
-spec:
-  authInfo:
-    bearer:
-      secretRef:
-        name: almservicebroker-client
-        namespace: operator-lifecycle-manager
-  relistBehavior: Duration
-  relistDuration: 15m0s
-  relistRequests: 0
-  url: http://alm-service-broker.operator-lifecycle-manager.svc:8005
-

roles/olm/files/15-alm-servicebroker.service.yaml

@@ -1,21 +0,0 @@
-##---
-# Source: olm/templates/15-alm-servicebroker.service.yaml
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: alm-service-broker
-  namespace: operator-lifecycle-manager
-  labels:
-    app: alm-service-broker
-    tectonic-operators.coreos.com/managed-by: tectonic-x-operator
-spec:
-  type: ClusterIP
-  ports:
-    - name: healthz
-      port: 8080
-    - name: broker
-      port: 8005
-  selector:
-    app: alm-service-broker
-

roles/olm/files/16-almservicebroker-client.secret.yaml

@@ -1,13 +0,0 @@
-##---
-# Source: olm/templates/16-almservicebroker-client.secret.yaml
-
-apiVersion: v1
-kind: Secret
-metadata:
-  name: almservicebroker-client
-  namespace: operator-lifecycle-manager
-  annotations:
-    kubernetes.io/service-account.name: alm-operator-serviceaccount
-    tectonic-operators.coreos.com/managed-by: tectonic-x-operator
-type: kubernetes.io/service-account-token
-

roles/olm/files/17-alm-servicebroker.deployment.yaml

@@ -1,44 +0,0 @@
-##---
-# Source: olm/templates/17-alm-servicebroker.deployment.yaml
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: alm-service-broker
-  namespace: operator-lifecycle-manager
-  labels:
-    app: alm-service-broker
-    tectonic-operators.coreos.com/managed-by: tectonic-x-operator
-spec:
-  strategy:
-    type: RollingUpdate
-  replicas: 1
-  selector:
-    matchLabels:
-      app: alm-service-broker
-  template:
-    metadata:
-      labels:
-        app: alm-service-broker
-    spec:
-      serviceAccountName: alm-operator-serviceaccount
-      containers:
-        - name: alm-service-broker
-          command:
-          - /bin/servicebroker
-          - '-debug'
-          image: quay.io/coreos/alm-service-broker@sha256:3f7bc4b3ead4372df6f455f4f4f791c241e6e47b5fbdf2296de257282a8aec80
-          imagePullPolicy: IfNotPresent
-          ports:
-            - containerPort: 8080
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: 8080
-          readinessProbe:
-            httpGet:
-              path: /healthz
-              port: 8080
-      imagePullSecrets:
-        - name: coreos-pull-secret
-

roles/olm/files/18-upstreamcomponents.configmap.yaml

@@ -1,462 +0,0 @@
-##---
-# Source: olm/templates/18-upstreamcomponents.configmap.yaml
-
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: upstream-components
-  namespace: operator-lifecycle-manager
-  labels:
-    tectonic-operators.coreos.com/managed-by: tectonic-x-operator
-
-data:
-  customResourceDefinitions: |-
-    - apiVersion: apiextensions.k8s.io/v1beta1
-      kind: CustomResourceDefinition
-      metadata:
-        name: meterings.chargeback.coreos.com
-        annotations:
-          catalog.app.coreos.com/description: An instance of Chargeback
-          catalog.app.coreos.com/displayName: Chargeback
-      spec:
-        group: chargeback.coreos.com
-        version: v1alpha1
-        scope: Namespaced
-        names:
-          plural: meterings
-          singular: metering
-          kind: Metering
-          listKind: MeteringList
-      
-    - apiVersion: apiextensions.k8s.io/v1beta1
-      kind: CustomResourceDefinition
-      metadata:
-        name: prestotables.chargeback.coreos.com
-        annotations:
-          catalog.app.coreos.com/displayName: "Chargeback Presto Table"
-          catalog.app.coreos.com/description: "A table within PrestoDB"
-      spec:
-        group: chargeback.coreos.com
-        version: v1alpha1
-        scope: Namespaced
-        names:
-          plural: prestotables
-          singular: prestotable
-          kind: PrestoTable
-      
-    - apiVersion: apiextensions.k8s.io/v1beta1
-      kind: CustomResourceDefinition
-      metadata:
-        name: reports.chargeback.coreos.com
-        annotations:
-          catalog.app.coreos.com/displayName: "Chargeback Report"
-          catalog.app.coreos.com/description: "A chargeback report for a specific time interval"
-      spec:
-        group: chargeback.coreos.com
-        version: v1alpha1
-        scope: Namespaced
-        names:
-          plural: reports
-          kind: Report
-      
-    - apiVersion: apiextensions.k8s.io/v1beta1
-      kind: CustomResourceDefinition
-      metadata:
-        name: reportdatasources.chargeback.coreos.com
-        annotations:
-          catalog.app.coreos.com/displayName: "Chargeback data source"
-          catalog.app.coreos.com/description: "A resource describing a source of data for usage by Report Generation Queries"
-      spec:
-        group: chargeback.coreos.com
-        version: v1alpha1
-        scope: Namespaced
-        names:
-          plural: reportdatasources
-          singular: reportdatasource
-          kind: ReportDataSource
-      
-    - apiVersion: apiextensions.k8s.io/v1beta1
-      kind: CustomResourceDefinition
-      metadata:
-        name: reportgenerationqueries.chargeback.coreos.com
-        annotations:
-          catalog.app.coreos.com/displayName: "Chargeback generation query"
-          catalog.app.coreos.com/description: "A SQL query used by Chargeback to generate reports"
-      spec:
-        group: chargeback.coreos.com
-        version: v1alpha1
-        scope: Namespaced
-        names:
-          plural: reportgenerationqueries
-          singular: reportgenerationquery
-          kind: ReportGenerationQuery
-      
-    - apiVersion: apiextensions.k8s.io/v1beta1
-      kind: CustomResourceDefinition
-      metadata:
-        name: reportprometheusqueries.chargeback.coreos.com
-        annotations:
-          catalog.app.coreos.com/displayName: "Chargeback prometheus query"
-          catalog.app.coreos.com/description: "A Prometheus query by Chargeback to do metering"
-      spec:
-        group: chargeback.coreos.com
-        version: v1alpha1
-        scope: Namespaced
-        names:
-          plural: reportprometheusqueries
-          singular: reportprometheusquery
-          kind: ReportPrometheusQuery
-      
-    - apiVersion: apiextensions.k8s.io/v1beta1
-      kind: CustomResourceDefinition
-      metadata:
-        name: scheduledreports.chargeback.coreos.com
-        annotations:
-          catalog.app.coreos.com/displayName: "Chargeback Scheduled Report"
-          catalog.app.coreos.com/description: "A chargeback report that runs on a scheduled interval"
-      spec:
-        group: chargeback.coreos.com
-        version: v1alpha1
-        scope: Namespaced
-        names:
-          plural: scheduledreports
-          kind: ScheduledReport
-      
-    - apiVersion: apiextensions.k8s.io/v1beta1
-      kind: CustomResourceDefinition
-      metadata:
-        name: storagelocations.chargeback.coreos.com
-        annotations:
-          catalog.app.coreos.com/displayName: "Chargeback storage location"
-          catalog.app.coreos.com/description: "Represents a configurable storage location for Chargeback to store metering and report data"
-      spec:
-        group: chargeback.coreos.com
-        version: v1alpha1
-        scope: Namespaced
-        names:
-          plural: storagelocations
-          kind: StorageLocation
-      
-  clusterServiceVersions: |-
-    - #! validate-crd: ./deploy/chart/templates/03-clusterserviceversion.crd.yaml
-      #! parse-kind: ClusterServiceVersion
-      apiVersion: app.coreos.com/v1alpha1
-      kind: ClusterServiceVersion-v1
-      metadata:
-        name: metering-helm-operator.v0.6.0
-        namespace: placeholder
-        annotations:
-          tectonic-visibility: tectonic-feature
-        labels:
-          alm-catalog: tectonic-feature
-          operator-metering: "true"
-      spec:
-        displayName: Metering
-        description: Metering can generate reports based on historical usage data from a cluster, providing accountability for how resources have been used.
-        keywords: [metering metrics reporting coreos]
-        version: 0.6.0
-        maturity: alpha
-        maintainers:
-          - email: support@coreos.com
-            name: CoreOS, Inc
-        provider:
-          name: CoreOS, Inc
-        labels:
-          alm-owner-metering: metering-helm-operator
-          alm-status-descriptors: metering-helm-operator.v0.6.0
-        selector:
-          matchLabels:
-            alm-owner-metering: metering-helm-operator
-        install:
-          strategy: deployment
-          spec:
-            permissions:
-              - rules:
-                - apiGroups:
-                  - chargeback.coreos.com
-                  resources:
-                  - '*'
-                  verbs:
-                  - '*'
-                - apiGroups:
-                  - ""
-                  resources:
-                  - pods
-                  - pods/attach
-                  - pods/exec
-                  - pods/portforward
-                  - pods/proxy
-                  verbs:
-                  - create
-                  - delete
-                  - deletecollection
-                  - get
-                  - list
-                  - patch
-                  - update
-                  - watch
-                - apiGroups:
-                  - ""
-                  resources:
-                  - configmaps
-                  - endpoints
-                  - persistentvolumeclaims
-                  - replicationcontrollers
-                  - replicationcontrollers/scale
-                  - secrets
-                  - serviceaccounts
-                  - services
-                  - services/proxy
-                  verbs:
-                  - create
-                  - delete
-                  - deletecollection
-                  - get
-                  - list
-                  - patch
-                  - update
-                  - watch
-                - apiGroups:
-                  - ""
-                  resources:
-                  - bindings
-                  - events
-                  - limitranges
-                  - namespaces/status
-                  - pods/log
-                  - pods/status
-                  - replicationcontrollers/status
-                  - resourcequotas
-                  - resourcequotas/status
-                  verbs:
-                  - get
-                  - list
-                  - watch
-                - apiGroups:
-                  - ""
-                  resources:
-                  - events
-                  verbs:
-                  - create
-                  - update
-                  - patch
-                - apiGroups:
-                  - ""
-                  resources:
-                  - namespaces
-                  verbs:
-                  - get
-                  - list
-                  - watch
-                - apiGroups:
-                  - apps
-                  resources:
-                  - deployments
-                  - deployments/rollback
-                  - deployments/scale
-                  - statefulsets
-                  verbs:
-                  - create
-                  - delete
-                  - deletecollection
-                  - get
-                  - list
-                  - patch
-                  - update
-                  - watch
-                - apiGroups:
-                  - batch
-                  resources:
-                  - cronjobs
-                  - jobs
-                  verbs:
-                  - create
-                  - delete
-                  - deletecollection
-                  - get
-                  - list
-                  - patch
-                  - update
-                  - watch
-                - apiGroups:
-                  - extensions
-                  resources:
-                  - daemonsets
-                  - deployments
-                  - deployments/rollback
-                  - deployments/scale
-                  - replicasets
-                  - replicasets/scale
-                  - replicationcontrollers/scale
-                  verbs:
-                  - create
-                  - delete
-                  - deletecollection
-                  - get
-                  - list
-                  - patch
-                  - update
-                  - watch
-                - apiGroups:
-                  - rbac.authorization.k8s.io
-                  resources:
-                  - rolebindings
-                  - roles
-                  verbs:
-                  - create
-                  - delete
-                  - deletecollection
-                  - get
-                  - list
-                  - patch
-                  - update
-                  - watch
-                serviceAccountName: metering-helm-operator
-            deployments:
-              - name: metering-helm-operator
-                spec:
-                  replicas: 1
-                  selector:
-                    matchLabels:
-                      app: metering-helm-operator
-                  strategy:
-                    type: Recreate
-                  template:
-                    metadata:
-                      labels:
-                        app: metering-helm-operator
-                    spec:
-                      containers:
-                      - args:
-                        - run-operator.sh
-                        env:
-                        - name: HELM_RELEASE_CRD_NAME
-                          value: Metering
-                        - name: HELM_RELEASE_CRD_API_GROUP
-                          value: chargeback.coreos.com
-                        - name: HELM_CHART_PATH
-                          value: /operator-metering-0.1.0.tgz
-                        - name: MY_POD_NAME
-                          valueFrom:
-                            fieldRef:
-                              fieldPath: metadata.name
-                        - name: MY_POD_NAMESPACE
-                          valueFrom:
-                            fieldRef:
-                              fieldPath: metadata.namespace
-                        - name: HELM_HOST
-                          value: 127.0.0.1:44134
-                        - name: HELM_WAIT
-                          value: "false"
-                        - name: HELM_RECONCILE_INTERVAL_SECONDS
-                          value: "30"
-                        - name: RELEASE_HISTORY_LIMIT
-                          value: "3"
-                        image: quay.io/coreos/chargeback-helm-operator:0.6.0
-                        imagePullPolicy: Always
-                        name: metering-helm-operator
-                        resources:
-                          limits:
-                            cpu: 50m
-                            memory: 25Mi
-                          requests:
-                            cpu: 50m
-                            memory: 25Mi
-                      - args:
-                        - /tiller
-                        env:
-                        - name: TILLER_NAMESPACE
-                          valueFrom:
-                            fieldRef:
-                              fieldPath: metadata.namespace
-                        - name: TILLER_HISTORY_MAX
-                          value: "3"
-                        image: quay.io/coreos/chargeback-helm-operator:0.6.0
-                        imagePullPolicy: Always
-                        livenessProbe:
-                          failureThreshold: 3
-                          httpGet:
-                            path: /liveness
-                            port: 44135
-                            scheme: HTTP
-                          initialDelaySeconds: 1
-                          periodSeconds: 10
-                          successThreshold: 1
-                          timeoutSeconds: 1
-                        name: tiller
-                        readinessProbe:
-                          failureThreshold: 3
-                          httpGet:
-                            path: /readiness
-                            port: 44135
-                            scheme: HTTP
-                          initialDelaySeconds: 1
-                          periodSeconds: 10
-                          successThreshold: 1
-                          timeoutSeconds: 1
-                        resources:
-                          limits:
-                            cpu: 50m
-                            memory: 100Mi
-                          requests:
-                            cpu: 50m
-                            memory: 50Mi
-                      imagePullSecrets: []
-                      restartPolicy: Always
-                      securityContext:
-                        runAsNonRoot: true
-                      serviceAccount: metering-helm-operator
-                      terminationGracePeriodSeconds: 30
-        customresourcedefinitions:
-          owned:
-          - description: An instance of Metering
-            displayName: Metering
-            kind: Metering
-            name: meterings.chargeback.coreos.com
-            version: v1alpha1
-          - description: A table within PrestoDB
-            displayName: Chargeback Presto Table
-            kind: PrestoTable
-            name: prestotables.chargeback.coreos.com
-            version: v1alpha1
-          - description: A resource describing a source of data for usage by Report Generation
-              Queries
-            displayName: Chargeback data source
-            kind: ReportDataSource
-            name: reportdatasources.chargeback.coreos.com
-            version: v1alpha1
-          - description: A SQL query used by Chargeback to generate reports
-            displayName: Chargeback generation query
-            kind: ReportGenerationQuery
-            name: reportgenerationqueries.chargeback.coreos.com
-            version: v1alpha1
-          - description: A Prometheus query by Chargeback to do metering
-            displayName: Chargeback prometheus query
-            kind: ReportPrometheusQuery
-            name: reportprometheusqueries.chargeback.coreos.com
-            version: v1alpha1
-          - description: A chargeback report for a specific time interval
-            displayName: Chargeback Report
-            kind: Report
-            name: reports.chargeback.coreos.com
-            version: v1alpha1
-          - description: A chargeback report that runs on a scheduled interval
-            displayName: Chargeback Scheduled Report
-            kind: ScheduledReport
-            name: scheduledreports.chargeback.coreos.com
-            version: v1alpha1
-          - description: Represents a configurable storage location for Chargeback to store
-              metering and report data
-            displayName: Chargeback storage location
-            kind: StorageLocation
-            name: storagelocations.chargeback.coreos.com
-            version: v1alpha1
-      
-  packages: |-
-    - #! package-manifest: ./deploy/chart/catalog_resources/upstream/metering.0.6.0.clusterserviceversion.yaml
-      packageName: metering
-      channels:
-      - currentCSV: metering-helm-operator.v0.6.0
-        name: alpha
-      
-

roles/olm/files/19-upstreamcomponents.catalogsource.yaml

@@ -1,19 +0,0 @@
-##---
-# Source: olm/templates/19-upstreamcomponents.catalogsource.yaml
-
-#! validate-crd: ./deploy/chart/templates/05-catalogsource.crd.yaml
-#! parse-kind: CatalogSource
-apiVersion: app.coreos.com/v1alpha1
-kind: CatalogSource-v1
-metadata:
-  name: upstream-components
-  namespace: operator-lifecycle-manager
-  annotations:
-    tectonic-operators.coreos.com/upgrade-strategy: 'DeleteAndRecreate'
-spec:
-  name: upstream-components
-  sourceType: internal
-  configMap: upstream-components
-  displayName: OLM Upstream Components
-  publisher: CoreOS, Inc.
-

roles/olm/files/20-aggregated.clusterrole.yaml

@@ -1,26 +0,0 @@
-##---
-# Source: olm/templates/20-aggregated.clusterrole.yaml
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: aggregate-olm-edit
-  labels:
-    # Add these permissions to the "admin" and "edit" default roles.
-    rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    rbac.authorization.k8s.io/aggregate-to-edit: "true"
-rules:
-- apiGroups: ["operators.coreos.com"]
-  resources: ["*"]
-  verbs: ["*"]
----
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: aggregate-olm-view
-  labels:
-    # Add these permissions to the "view" default roles
-    rbac.authorization.k8s.io/aggregate-to-view: "true"
-rules:
-- apiGroups: ["operators.coreos.com"]
-  resources: ["*"]
-  verbs: ["get", "list", "watch"]

roles/olm/tasks/install.yaml

@@ -116,15 +116,6 @@
     files:
       - "{{ mktemp.stdout }}/20-aggregated-edit.clusterrole.yaml"
 
-- name: Apply aggregate-olm-edit ClusterRole manifest
-  oc_obj:
-    state: present
-    kind: ClusterRole
-    name: aggregate-olm-edit
-    namespace: operator-lifecycle-manager
-    files:
-      - "{{ mktemp.stdout }}/20-aggregated.clusterrole.yaml"
-
 - name: Apply aggregate-olm-view ClusterRole manifest
   oc_obj:
     state: present

roles/olm/tasks/remove_components.yaml

@@ -1,84 +1,84 @@
 ---
-- name: Remove alm-operator-serviceaccount ServiceAccount manifest
+- name: Remove olm-operator-serviceaccount ServiceAccount manifest
   oc_obj:
     state: absent
     kind: ServiceAccount
-    name: alm-operator-serviceaccount
+    name: olm-operator-serviceaccount
     namespace: operator-lifecycle-manager
 
-- name: Remove alm-operator-binding ClusterRoleBinding manifest
+- name: Remove olm-operator-binding-operator-lifecycle-manager ClusterRoleBinding manifest
   oc_obj:
     state: absent
     kind: ClusterRoleBinding
-    name: alm-operator-binding
+    name: olm-operator-binding-operator-lifecycle-manager
     namespace: operator-lifecycle-manager
 
-- name: Remove tectonic-ocs ConfigMap manifest
+- name: Remove clusterserviceversions.operators.coreos.com CustomResourceDefinition manifest
   oc_obj:
     state: absent
-    kind: ConfigMap
-    name: tectonic-ocs
+    kind: CustomResourceDefinition
+    name: clusterserviceversions.operators.coreos.com
     namespace: operator-lifecycle-manager
 
-- name: Remove tectonic-ocs CatalogSource-v1 manifest
+- name: Remove catalogsources.operators.coreos.com CustomResourceDefinition manifest
   oc_obj:
     state: absent
-    kind: CatalogSource-v1
-    name: tectonic-ocs
+    kind: CustomResourceDefinition
+    name: catalogsources.operators.coreos.com
     namespace: operator-lifecycle-manager
 
-- name: Remove alm-operator Deployment manifest
+- name: Remove installplans.operators.coreos.com CustomResourceDefinition manifest
   oc_obj:
     state: absent
-    kind: Deployment
-    name: alm-operator
+    kind: CustomResourceDefinition
+    name: installplans.operators.coreos.com
     namespace: operator-lifecycle-manager
 
-- name: Remove catalog-operator Deployment manifest
+- name: Remove subscriptions.operators.coreos.com CustomResourceDefinition manifest
   oc_obj:
     state: absent
-    kind: Deployment
-    name: catalog-operator
+    kind: CustomResourceDefinition
+    name: subscriptions.operators.coreos.com
     namespace: operator-lifecycle-manager
 
-- name: Remove upstream-components ConfigMap manifest
+- name: Remove ocs ConfigMap manifest
   oc_obj:
     state: absent
     kind: ConfigMap
-    name: upstream-components
+    name: ocs
     namespace: operator-lifecycle-manager
 
-- name: Remove upstream-components CatalogSource-v1 manifest
+- name: Remove ocs CatalogSource manifest
   oc_obj:
     state: absent
-    kind: CatalogSource-v1
-    name: upstream-components
+    kind: CatalogSource
+    name: ocs
     namespace: operator-lifecycle-manager
 
-- name: Remove clusterserviceversion-v1s.app.coreos.com CustomResourceDefinition manifest
+- name: Remove alm-operator Deployment manifest
   oc_obj:
     state: absent
-    kind: CustomResourceDefinition
-    name: clusterserviceversion-v1s.app.coreos.com
+    kind: Deployment
+    name: alm-operator
     namespace: operator-lifecycle-manager
 
-- name: Remove catalogsource-v1s.app.coreos.com CustomResourceDefinition manifest
+- name: Remove catalog-operator Deployment manifest
   oc_obj:
     state: absent
-    kind: CustomResourceDefinition
-    name: catalogsource-v1s.app.coreos.com
+    kind: Deployment
+    name: catalog-operator
     namespace: operator-lifecycle-manager
 
-- name: Remove installplan-v1s.app.coreos.com CustomResourceDefinition manifest
+- name: Remove aggregate-olm-edit ClusterRole manifest
   oc_obj:
     state: absent
-    kind: CustomResourceDefinition
-    name: installplan-v1s.app.coreos.com
+    kind: ClusterRole
+    name: aggregate-olm-edit
     namespace: operator-lifecycle-manager
 
-- name: Remove subscription-v1s.app.coreos.com CustomResourceDefinition manifest
+- name: Remove aggregate-olm-view ClusterRole manifest
   oc_obj:
     state: absent
-    kind: CustomResourceDefinition
-    name: subscription-v1s.app.coreos.com
+    kind: ClusterRole
+    name: aggregate-olm-view
     namespace: operator-lifecycle-manager