From 14044b15e08d45ca242538c7bdc9e12e5169202f Mon Sep 17 00:00:00 2001
From: Joel Speed <Joel.speed@hotmail.co.uk>
Date: Thu, 25 Mar 2021 20:40:23 +0000
Subject: [PATCH] Revert "Add images config map"

---
 .../main.go                                          | 12 +-----------
 controllers/clusteroperator_controller.go            |  1 -
 hack/example-images.json                             |  4 ----
 ...troller-manager-operator_01_images.configmap.yaml | 11 -----------
 ...ud-controller-manager-operator_11_deployment.yaml |  9 ---------
 manifests/image-references                           |  8 --------
 6 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 hack/example-images.json
 delete mode 100644 manifests/0000_26_cloud-controller-manager-operator_01_images.configmap.yaml

diff --git a/cmd/cluster-cloud-controller-manager-operator/main.go b/cmd/cluster-cloud-controller-manager-operator/main.go
index d7dcb700d..0b707c159 100644
--- a/cmd/cluster-cloud-controller-manager-operator/main.go
+++ b/cmd/cluster-cloud-controller-manager-operator/main.go
@@ -48,10 +48,7 @@ var (
 	retryPeriod   = 90 * time.Second
 )
 
-const (
-	defaultManagedNamespace = "openshift-cloud-controller-manager"
-	defaultImagesLocation   = "/etc/cloud-controller-manager-config/images.json"
-)
+const defaultManagedNamespace = "openshift-cloud-controller-manager"
 
 func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
@@ -100,12 +97,6 @@ func main() {
 		"The namespace for managed objects, where out-of-tree CCM binaries will run.",
 	)
 
-	imagesFile := flag.String(
-		"images-json",
-		defaultImagesLocation,
-		"The location of images file to use by operator for managed CCM binaries.",
-	)
-
 	flag.Parse()
 
 	ctrl.SetLogger(klogr.New().WithName("CCMOperator"))
@@ -134,7 +125,6 @@ func main() {
 		Client:           mgr.GetClient(),
 		Scheme:           mgr.GetScheme(),
 		ManagedNamespace: *managedNamespace,
-		ImagesFile:       *imagesFile,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "ClusterOperator")
 		os.Exit(1)
diff --git a/controllers/clusteroperator_controller.go b/controllers/clusteroperator_controller.go
index 939ad91ba..7c1d0550a 100644
--- a/controllers/clusteroperator_controller.go
+++ b/controllers/clusteroperator_controller.go
@@ -59,7 +59,6 @@ type CloudOperatorReconciler struct {
 	Scheme           *runtime.Scheme
 	watcher          ObjectWatcher
 	ManagedNamespace string
-	ImagesFile       string
 }
 
 // +kubebuilder:rbac:groups=config.openshift.io,resources=clusteroperators,verbs=get;list;watch;create;update;patch;delete
diff --git a/hack/example-images.json b/hack/example-images.json
deleted file mode 100644
index abab9243f..000000000
--- a/hack/example-images.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "cloudControllerManagerAWS": "registry.svc.ci.openshift.org/openshift:aws-cloud-controller-manager",
-    "cloudControllerManagerOpenStack": "registry.svc.ci.openshift.org/openshift:openstack-cloud-controller-manager"
-}
diff --git a/manifests/0000_26_cloud-controller-manager-operator_01_images.configmap.yaml b/manifests/0000_26_cloud-controller-manager-operator_01_images.configmap.yaml
deleted file mode 100644
index 43e90fa2c..000000000
--- a/manifests/0000_26_cloud-controller-manager-operator_01_images.configmap.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: cloud-controller-manager-images
-  namespace: openshift-cloud-controller-manager-operator
-data:
-  images.json: >
-    {
-      "cloudControllerManagerAWS": "registry.svc.ci.openshift.org/openshift:aws-cloud-controller-manager",
-      "cloudControllerManagerOpenStack": "registry.svc.ci.openshift.org/openshift:openstack-cloud-controller-manager"
-    }
diff --git a/manifests/0000_26_cloud-controller-manager-operator_11_deployment.yaml b/manifests/0000_26_cloud-controller-manager-operator_11_deployment.yaml
index b61ad5bb5..7eadebc8d 100644
--- a/manifests/0000_26_cloud-controller-manager-operator_11_deployment.yaml
+++ b/manifests/0000_26_cloud-controller-manager-operator_11_deployment.yaml
@@ -27,7 +27,6 @@ spec:
         - "/cluster-controller-manager-operator"
         args:
         - --leader-elect
-        - "--images-json=/etc/cloud-controller-manager-config/images.json"
         env:
         - name: RELEASE_VERSION
           value: "0.0.1-snapshot"
@@ -35,9 +34,6 @@ spec:
           requests:
             cpu: 10m
             memory: 50Mi
-        volumeMounts:
-        - name: images
-          mountPath: /etc/cloud-controller-manager-config/
       nodeSelector:
         node-role.kubernetes.io/master: ""
       restartPolicy: Always
@@ -53,8 +49,3 @@ spec:
         operator: "Exists"
         effect: "NoExecute"
         tolerationSeconds: 120
-      volumes:
-      - name: images
-        configMap:
-          defaultMode: 420
-          name: machine-api-operator-images
diff --git a/manifests/image-references b/manifests/image-references
index b266bffa4..0a9935da8 100644
--- a/manifests/image-references
+++ b/manifests/image-references
@@ -6,11 +6,3 @@ spec:
     from:
       kind: DockerImage
       name: registry.svc.ci.openshift.org/openshift:cluster-cloud-controller-manager-operator
-  - name: aws-machine-controllers
-    from:
-      kind: DockerImage
-      name: registry.svc.ci.openshift.org/openshift:aws-cloud-controller-manager
-  - name: openstack-machine-controllers
-    from:
-      kind: DockerImage
-      name: registry.svc.ci.openshift.org/openshift:openstack-cloud-controller-manager