chore(deploy): remove packageserver subscription and catalog from chart

this has several advantages: - deploy artifacts are simpler - faster install/startup time - simpler integration with CVO - unblocking using kustomize for our release scripts
operator-framework · Jul 3, 2019 · a61428c · a61428c
1 parent e974cc6
commit a61428c
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 424 deletions.
diff --git a/deploy/chart/templates/0000_50_olm_11-olm-operators.configmap.yaml b/deploy/chart/templates/0000_50_olm_11-olm-operators.configmap.yaml
diff --git a/deploy/chart/templates/0000_50_olm_12-olm-operators.catalogsource.yaml b/deploy/chart/templates/0000_50_olm_12-olm-operators.catalogsource.yaml
diff --git a/deploy/chart/templates/0000_50_olm_14-packageserver.subscription.yaml b/deploy/chart/templates/0000_50_olm_14-packageserver.subscription.yaml
diff --git a/deploy/chart/templates/0000_50_olm_15-packageserver.clusterserviceversion.yaml b/deploy/chart/templates/0000_50_olm_15-packageserver.clusterserviceversion.yaml
@@ -1,3 +1 @@
-{{ if and .Values.installType (eq .Values.installType "ocp") }}
 {{- include "packageserver.clusterserviceversion" . }}
-{{- end }}
diff --git a/deploy/chart/templates/0000_50_olm_16-packageserver.deployment.yaml b/deploy/chart/templates/0000_50_olm_16-packageserver.deployment.yaml
diff --git a/...lates/0000_50_olm_18-service-monitor.yaml → ...lates/0000_90_olm_00-service-monitor.yaml b/...lates/0000_50_olm_18-service-monitor.yaml → ...lates/0000_90_olm_00-service-monitor.yaml
diff --git a/deploy/chart/templates/_packageserver.clusterserviceversion.yaml b/deploy/chart/templates/_packageserver.clusterserviceversion.yaml
@@ -34,7 +34,7 @@ spec:
     strategy: deployment
     spec:
       clusterPermissions:
-      - serviceAccountName: packageserver
+      - serviceAccountName: olm-operator-serviceaccount
         rules:
         - apiGroups:
             - authorization.k8s.io

diff --git a/deploy/chart/templates/_packageserver.deployment-spec.yaml b/deploy/chart/templates/_packageserver.deployment-spec.yaml
@@ -11,7 +11,7 @@ spec:
       labels:
         app: packageserver
     spec:
-      serviceAccountName: packageserver
+      serviceAccountName: olm-operator-serviceaccount
       {{- if and .Values.installType (eq .Values.installType "ocp") }}
       priorityClassName: "system-cluster-critical"
       {{- end }}

diff --git a/manifests/0000_50_olm_11-olm-operators.configmap.yaml b/manifests/0000_50_olm_11-olm-operators.configmap.yaml
diff --git a/manifests/0000_50_olm_12-olm-operators.catalogsource.yaml b/manifests/0000_50_olm_12-olm-operators.catalogsource.yaml
diff --git a/manifests/0000_50_olm_14-packageserver.subscription.yaml b/manifests/0000_50_olm_14-packageserver.subscription.yaml
diff --git a/manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml b/manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml
@@ -9,7 +9,6 @@ spec:
   displayName: Package Server
   description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion.
   minKubeVersion: 1.11.0
-  replaces: packageserver.v0.9.0
   keywords: ['packagemanifests', 'olm', 'packages']
   maintainers:
   - name: Red Hat
@@ -32,7 +31,7 @@ spec:
     strategy: deployment
     spec:
       clusterPermissions:
-      - serviceAccountName: packageserver
+      - serviceAccountName: olm-operator-serviceaccount
         rules:
         - apiGroups:
             - authorization.k8s.io
@@ -78,7 +77,7 @@ spec:
               labels:
                 app: packageserver
             spec:
-              serviceAccountName: packageserver
+              serviceAccountName: olm-operator-serviceaccount
               priorityClassName: "system-cluster-critical"
               nodeSelector:
                 beta.kubernetes.io/os: linux