fix(init): move cleanup to olm startup

init container is not getting a serviceaccount token mounted for some
reason, this sidesteps the issue.

previous commit remains in case we can switch back to an init container
at some point

Author: ecordell

Dockerfile

@@ -32,7 +32,6 @@ LABEL io.openshift.release.operator=true
 COPY --from=builder /build/bin/olm /bin/olm
 COPY --from=builder /build/bin/catalog /bin/catalog
 COPY --from=builder /build/bin/package-server /bin/package-server
-COPY --from=builder /build/bin/init /bin/init
 
 # This image doesn't need to run as root user.
 USER 1001

cmd/init/main.go

@@ -0,0 +1,117 @@
+package main
+
+import (
+	"time"
+
+	"github.com/sirupsen/logrus"
+	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/wait"
+
+	"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned"
+	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
+)
+
+const (
+	pollInterval = 1 * time.Second
+	pollDuration = 5 * time.Minute
+)
+
+type checkResourceFunc func() error
+type deleteResourceFunc func() error
+
+func cleanup(logger *logrus.Logger, c operatorclient.ClientInterface, crc versioned.Interface) {
+	if err := waitForDelete(checkCatalogSource(crc, "olm-operators"), deleteCatalogSource(crc, "olm-operators")); err != nil {
+		logger.WithError(err).Fatal("couldn't clean previous release")
+	}
+
+	if err := waitForDelete(checkConfigMap(c, "olm-operators"), deleteConfigMap(c, "olm-operators")); err != nil {
+		logger.WithError(err).Fatal("couldn't clean previous release")
+	}
+
+	if err := waitForDelete(checkSubscription(crc, "packageserver"), deleteSubscription(crc, "packageserver")); err != nil {
+		logger.WithError(err).Fatal("couldn't clean previous release")
+	}
+
+	if err := waitForDelete(checkClusterServiceVersion(crc, "packageserver.v0.10.0"), deleteClusterServiceVersion(crc, "packageserver.v0.10.0")); err != nil {
+		logger.WithError(err).Fatal("couldn't clean previous release")
+	}
+
+	if err := waitForDelete(checkClusterServiceVersion(crc, "packageserver.v0.9.0"), deleteClusterServiceVersion(crc, "packageserver.v0.9.0")); err != nil {
+		logger.WithError(err).Fatal("couldn't clean previous release")
+	}
+}
+
+func waitForDelete(checkResource checkResourceFunc, deleteResource deleteResourceFunc) error {
+	if err := checkResource(); err != nil && errors.IsNotFound(err) {
+		return nil
+	}
+	if err := deleteResource(); err != nil {
+		return err
+	}
+	var err error
+	err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
+		err := checkResource()
+		if errors.IsNotFound(err) {
+			return true, nil
+		}
+		if err != nil {
+			return false, err
+		}
+		return false, nil
+	})
+
+	return err
+}
+
+func checkClusterServiceVersion(crc versioned.Interface, name string) checkResourceFunc {
+	return func() error {
+		_, err := crc.OperatorsV1alpha1().ClusterServiceVersions(*namespace).Get(name, metav1.GetOptions{})
+		return err
+	}
+}
+
+func deleteClusterServiceVersion(crc versioned.Interface, name string) deleteResourceFunc {
+	return func() error {
+		return crc.OperatorsV1alpha1().ClusterServiceVersions(*namespace).Delete(name, metav1.NewDeleteOptions(0))
+	}
+}
+
+func checkSubscription(crc versioned.Interface, name string) checkResourceFunc {
+	return func() error {
+		_, err := crc.OperatorsV1alpha1().Subscriptions(*namespace).Get(name, metav1.GetOptions{})
+		return err
+	}
+}
+
+func deleteSubscription(crc versioned.Interface, name string) deleteResourceFunc {
+	return func() error {
+		return crc.OperatorsV1alpha1().Subscriptions(*namespace).Delete(name, metav1.NewDeleteOptions(0))
+	}
+}
+
+func checkConfigMap(c operatorclient.ClientInterface, name string) checkResourceFunc {
+	return func() error {
+		_, err := c.KubernetesInterface().CoreV1().ConfigMaps(*namespace).Get(name, metav1.GetOptions{})
+		return err
+	}
+}
+
+func deleteConfigMap(c operatorclient.ClientInterface, name string) deleteResourceFunc {
+	return func() error {
+		return c.KubernetesInterface().CoreV1().ConfigMaps(*namespace).Delete(name, metav1.NewDeleteOptions(0))
+	}
+}
+
+func checkCatalogSource(crc versioned.Interface, name string) checkResourceFunc {
+	return func() error {
+		_, err := crc.OperatorsV1alpha1().CatalogSources(*namespace).Get(name, metav1.GetOptions{})
+		return err
+	}
+}
+
+func deleteCatalogSource(crc versioned.Interface, name string) deleteResourceFunc {
+	return func() error {
+		return crc.OperatorsV1alpha1().CatalogSources(*namespace).Delete(name, metav1.NewDeleteOptions(0))
+	}
+}

cmd/olm/cleanup.go

@@ -63,6 +63,9 @@ var (
 
 	profiling = flag.Bool(
 		"profiling", false, "serve profiling data (on port 8080)")
+
+	namespace = flag.String(
+		"namespace", "", "namespace where cleanup runs")
 )
 
 func init() {
@@ -165,6 +168,8 @@ func main() {
 		log.Fatalf("error configuring client: %s", err.Error())
 	}
 
+	cleanup(logger, opClient, crClient)
+
 	// Create a new instance of the operator.
 	op, err := olm.NewOperator(
 		ctx,

cmd/olm/main.go

@@ -21,25 +21,13 @@ spec:
       {{- if and .Values.installType (eq .Values.installType "ocp") }}
       priorityClassName: "system-cluster-critical"
       {{- end }}
-      initContainers:
-      - name: init
-        command:
-        - /bin/init
-        - -namespace
-        - ${NAMESPACE}
-        image: {{ .Values.olm.image.ref }}
-        imagePullPolicy: {{ .Values.olm.image.pullPolicy }}
-        terminationMessagePolicy: FallbackToLogsOnError
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
       containers:
         - name: olm-operator
           command:
           - /bin/olm
           args:
+          - -namespace
+          - ${OPERATOR_NAMESPACE}
           {{- if .Values.watchedNamespaces }}
           - -watchedNamespaces
           - {{ .Values.watchedNamespaces }}

deploy/chart/templates/0000_50_olm_07-olm-operator.deployment.yaml

@@ -21,7 +21,6 @@ WORKDIR /
 COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/olm /bin/olm
 COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/catalog /bin/catalog
 COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/package-server /bin/package-server
-COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/build/bin/init /bin/init
 EXPOSE 8080
 EXPOSE 5443
 CMD ["/bin/olm"]

e2e.Dockerfile

@@ -3,7 +3,6 @@ WORKDIR /
 COPY olm /bin/olm
 COPY catalog /bin/catalog
 COPY package-server /bin/package-server
-COPY init /bin/init
 EXPOSE 8080
 EXPOSE 5443
 CMD ["/bin/olm"]

local.Dockerfile

@@ -19,25 +19,13 @@ spec:
     spec:
       serviceAccountName: olm-operator-serviceaccount
       priorityClassName: "system-cluster-critical"
-      initContainers:
-        - name: init
-          command:
-            - /bin/init
-            - -namespace
-            - ${NAMESPACE}
-          image: quay.io/operator-framework/olm@sha256:f965474776bada158e4bf7be5c84b54460843e7478f06060990d2fdeb31b0b90
-          imagePullPolicy: IfNotPresent
-          terminationMessagePolicy: FallbackToLogsOnError
-          env:
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
       containers:
         - name: olm-operator
           command:
           - /bin/olm
           args:
+          - -namespace
+          - ${OPERATOR_NAMESPACE}
           - -writeStatusName
           - operator-lifecycle-manager
           - -writePackageServerStatusName