Update make:bundle to set OPERATOR_IMAGE_URL

This gets passed to the the operator-manager and is used
to run the controller-manager

Author: dprince

Makefile

@@ -364,6 +364,7 @@ endif
 bundle: build manifests kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
 	$(OPERATOR_SDK) generate kustomize manifests -q
 	cd config/operator/deployment/ && $(KUSTOMIZE) edit set image controller=$(IMG)
+	sed -i -e 's|operator:image|$(IMG)|' config/operator/deployment/deployment.yaml
 	$(KUSTOMIZE) build config/operator --load-restrictor='LoadRestrictionsNone' | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
 	#cp dependencies.yaml ./bundle/metadata
 	$(OPERATOR_SDK) bundle validate ./bundle

config/manager/kustomization.yaml

@@ -8,9 +8,3 @@ configMapGenerator:
 - files:
   - controller_manager_config.yaml
   name: manager-config
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-images:
-- name: controller
-  newName: quay.io/openstack-k8s-operators/openstack-operator
-  newTag: latest

config/manager/manager.yaml

@@ -44,7 +44,7 @@ spec:
         env:
         - name: OPENSTACK_RELEASE_VERSION
           value: 0.0.1
-        image: controller:latest
+        image: '{{ .OperatorImage }}'
         name: manager
         securityContext:
           allowPrivilegeEscalation: false

config/operator/deployment/deployment.yaml

@@ -46,6 +46,8 @@ spec:
           value: false
         - name: OPENSTACK_RELEASE_VERSION
           value: 0.0.1
+        - name: OPERATOR_IMAGE_URL
+          value: quay.io/openstack-k8s-operators/openstack-operator:latest
         image: controller:latest
         name: operator
         securityContext:

controllers/operator/openstack_controller.go

@@ -64,6 +64,7 @@ func (r *OpenStackReconciler) GetLogger(ctx context.Context) logr.Logger {
 var (
 	envRelatedOperatorImages (map[string]*string) // operatorName -> image
 	rabbitmqImage            string
+	operatorImage            string
 )
 
 // SetupEnv -
@@ -84,6 +85,8 @@ func SetupEnv() {
 				envRelatedOperatorImages[operatorName] = &envArr[1]
 			}
 			log.Log.Info("Found operator related image", "operator", operatorName, "image", envArr[1])
+		} else if envArr[0] == "OPERATOR_IMAGE_URL" {
+			operatorImage = envArr[1]
 		}
 	}
 }
@@ -306,6 +309,7 @@ func (r *OpenStackReconciler) applyOperator(ctx context.Context, instance *opera
 	data.Data["OperatorNamespace"] = instance.Namespace
 	data.Data["OperatorImages"] = envRelatedOperatorImages
 	data.Data["RabbitmqImage"] = rabbitmqImage
+	data.Data["OperatorImage"] = operatorImage
 	return r.renderAndApply(ctx, instance, data, "operator", true)
 }