Start oadp-cli on server startup

Signed-off-by: Joseph <jvaikath@redhat.com>

Author: Joeavaikath

bundle/manifests/oadp-operator.clusterserviceversion.yaml

@@ -1147,6 +1147,8 @@ spec:
                   value: registry.redhat.io/oadp/oadp-mustgather-rhel8:v1.2
                 - name: RELATED_IMAGE_NON_ADMIN_CONTROLLER
                   value: quay.io/konveyor/oadp-non-admin:latest
+                - name: RELATED_IMAGE_CONSOLE_CLI_DOWNLOAD
+                  value: quay.io/konveyor/console-cli-download:latest
                 image: quay.io/konveyor/oadp-operator:latest
                 imagePullPolicy: Always
                 livenessProbe:
@@ -1202,40 +1204,6 @@ spec:
                       path: token
               - emptyDir: {}
                 name: tmp-dir
-      - label:
-          app: oadp-cli
-        name: openshift-adp-oadp-cli-server
-        spec:
-          replicas: 1
-          selector:
-            matchLabels:
-              app: oadp-cli
-          strategy: {}
-          template:
-            metadata:
-              labels:
-                app: oadp-cli
-            spec:
-              containers:
-              - image: quay.io/konveyor/oadp-cli-binaries
-                name: oadp-cli-server
-                resources:
-                  limits:
-                    cpu: 100m
-                    memory: 64Mi
-                  requests:
-                    cpu: 50m
-                    memory: 32Mi
-                securityContext:
-                  allowPrivilegeEscalation: false
-                  capabilities:
-                    drop:
-                    - ALL
-                  readOnlyRootFilesystem: true
-              securityContext:
-                runAsNonRoot: true
-              serviceAccountName: openshift-adp-controller-manager
-              terminationGracePeriodSeconds: 10
       permissions:
       - rules:
         - apiGroups:
@@ -1343,4 +1311,6 @@ spec:
     name: mustgather
   - image: quay.io/konveyor/oadp-non-admin:latest
     name: non-admin-controller
+  - image: quay.io/konveyor/console-cli-download:latest
+    name: console-cli-download
   version: 99.0.0

bundle/manifests/openshift-adp-cli-server_v1_service.yaml

@@ -270,15 +270,18 @@ func main() {
 		setupLog.Error(err, "unable to create controller", "controller", "DataProtectionTest")
 		os.Exit(1)
 	}
-	if err = (&controller.OADPCLIReconciler{
-		Client:    mgr.GetClient(),
-		Scheme:    mgr.GetScheme(),
-		Namespace: watchNamespace,
-	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "OADPCLI")
+	//+kubebuilder:scaffold:builder
+
+	// Add CLI download setup runnable
+	if err := mgr.Add(&controller.CLIDownloadSetup{
+		Client:            mgr.GetClient(),
+		Namespace:         watchNamespace,
+		OperatorName:      "openshift-adp-controller-manager",
+		OperatorNamespace: watchNamespace,
+	}); err != nil {
+		setupLog.Error(err, "unable to add CLI download setup")
 		os.Exit(1)
 	}
-	//+kubebuilder:scaffold:builder
 
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up health check")

cmd/main.go

@@ -18,7 +18,6 @@ resources:
 - ../crd
 - ../rbac
 - ../manager
-- ../oadp-cli
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
 # crd/kustomization.yaml
 #- ../webhook

config/default/kustomization.yaml

@@ -88,6 +88,8 @@ spec:
               value: registry.redhat.io/oadp/oadp-mustgather-rhel8:v1.2
             - name: RELATED_IMAGE_NON_ADMIN_CONTROLLER
               value: quay.io/konveyor/oadp-non-admin:latest
+            - name: RELATED_IMAGE_CONSOLE_CLI_DOWNLOAD
+              value: quay.io/konveyor/oadp-cli-binaries:latest
           args:
             - --leader-elect
           image: controller:latest