feat(package-server): self-host package-server with CSV

- Adds package-server CSV helm template
- Uses package-server CSV to self-host

Author: njhale

deploy/chart/templates/0000_30_13-packageserver.csv.yaml

@@ -0,0 +1,78 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: ClusterServiceVersion
+metadata:
+  name: packageserver.v8.0.0
+  namespace: {{ .Values.namespace }}
+spec:
+  displayName: Package Server
+  description: Package Server is kubernetes APIService that provides the PackageManifest resource
+  keywords: ['packagemanifests', 'olm', 'packages']
+  maintainers:
+  - name: Red Hat
+    email: [email protected]
+  provider:
+    name: Red Hat
+  links:
+  - name: Package Server
+    url: https://github.com/operator-framework/operator-lifecycle-manager/tree/master/pkg/package-server
+  install:
+    strategy: deployment
+    spec:
+      deployments:
+      - name: package-server
+        spec:
+          replicas: {{ .Values.package.replicaCount }}
+          strategy:
+            type: RollingUpdate
+          selector:
+            matchLabels:
+              app: package-server
+          template:
+            metadata:
+              labels:
+                app: package-server
+            spec:
+              serviceAccountName: olm-operator-serviceaccount
+              containers:
+              - name: package-server
+                command:
+                - /bin/package-server
+                - -v=4
+                {{- if .Values.watchedNamespaces }}
+                - --watched-namespaces
+                - {{ .Values.watchedNamespaces }}
+                {{- end }}
+                - --secure-port={{ .Values.package.service.internalPort }}
+                - --global-namespace
+                - {{ .Values.namespace }}
+                {{- if .Values.debug }}
+                - --debug
+                {{- end }}
+                {{- if .Values.package.commandArgs }}
+                - {{ .Values.package.commandArgs }}
+                {{- end }}
+                image: {{ .Values.package.image.ref }}
+                imagePullPolicy: {{ .Values.package.image.pullPolicy }}
+                ports:
+                - containerPort: {{ .Values.package.service.internalPort }}
+                livenessProbe:
+                    httpGet:
+                      scheme: HTTPS
+                      path: /healthz
+                      port: {{ .Values.package.service.internalPort }}
+                readinessProbe:
+                    httpGet:
+                      scheme: HTTPS
+                      path: /healthz
+                      port: {{ .Values.package.service.internalPort }}
+  maturity: alpha
+  version: 8.0.0
+  apiservicedefinitions:
+    owned:
+    - group: packages.apps.redhat.com
+      version: v1alpha1
+      kind: PackageManifest
+      displayName: PackageManifest
+      description: A PackageManifest is a resource generated from existing CatalogSources and their ConfigMaps
+      deploymentName: package-server
+      containerPort: {{ .Values.package.service.internalPort }}

deploy/chart/templates/0000_30_13-packageserver.yaml

@@ -468,7 +468,7 @@ func (a *Operator) installAPIServiceRequirements(desc v1alpha1.APIServiceDescrip
 		ownerutil.AddNonBlockingOwner(secretRoleBinding, csv)
 		_, err = a.OpClient.CreateRoleBinding(secretRoleBinding)
 		if err != nil {
-			log.Warnf("could not create secret rolebinding %s", secretRoleBinding.GetName())
+			log.Warnf("could not create secret rolebinding with dep spec: %+v", depSpec)
 			return nil, err
 		}
 	} else {

pkg/controller/operators/olm/apiservices.go

@@ -871,6 +871,8 @@ func (a *Operator) requeueOwnerCSVs(ownee metav1.Object) {
 		csvSet[csv.GetUID()] = csv
 	}
 
+	logger.Infof("CSV set: %+v", csvSet)
+
 	// Requeue existing owner CSVs
 	for _, owner := range owners {
 		csv, ok := csvSet[owner.UID]

pkg/controller/operators/olm/operator.go

@@ -625,6 +625,7 @@ func TestCreateCSVRequirementsMetCRD(t *testing.T) {
 		UID: fetchedCSV.GetUID(),
 	}})
 	cleanupCRD, err := createCRD(c, crd)
+	defer cleanupCRD()
 	require.NoError(t, err)
 
 	// Create Role/Cluster Roles and RoleBindings

test/e2e/csv_e2e_test.go

@@ -39,6 +39,7 @@ const (
 	expectedEtcdNodes      = 3
 	expectedPrometheusSize = 3
 	ocsConfigMap           = "rh-operators"
+	packageServerCSV 	   = "packageserver.v8.0.0"
 )
 
 var (
@@ -49,6 +50,8 @@ var (
 	nonPersistentCatalogsFieldSelector   = createFieldNotEqualSelector("metadata.name", persistentCatalogNames...)
 	persistentConfigMapNames             = []string{ocsConfigMap}
 	nonPersistentConfigMapsFieldSelector = createFieldNotEqualSelector("metadata.name", persistentConfigMapNames...)
+	persistentCSVNames 				     = []string{packageServerCSV}
+	nonPersistentCSVFieldSelector        = createFieldNotEqualSelector("metadata.name", persistentCSVNames...)
 )
 
 type namespaceCleaner struct {
@@ -282,7 +285,7 @@ func cleanupOLM(t *testing.T, namespace string) {
 	t.Log("cleaning up any remaining non persistent resources...")
 	deleteOptions := &metav1.DeleteOptions{GracePeriodSeconds: &immediate}
 	listOptions := metav1.ListOptions{}
-	require.NoError(t, crc.OperatorsV1alpha1().ClusterServiceVersions(namespace).DeleteCollection(deleteOptions, listOptions))
+	require.NoError(t, crc.OperatorsV1alpha1().ClusterServiceVersions(namespace).DeleteCollection(deleteOptions, metav1.ListOptions{FieldSelector: nonPersistentCSVFieldSelector}))
 	require.NoError(t, crc.OperatorsV1alpha1().InstallPlans(namespace).DeleteCollection(deleteOptions, listOptions))
 	require.NoError(t, crc.OperatorsV1alpha1().Subscriptions(namespace).DeleteCollection(deleteOptions, listOptions))
 	require.NoError(t, crc.OperatorsV1alpha1().CatalogSources(namespace).DeleteCollection(deleteOptions, metav1.ListOptions{FieldSelector: nonPersistentCatalogsFieldSelector}))