bundle: Use kustomize to set the controller-manager images

Author: dprince

Makefile

@@ -367,8 +367,8 @@ 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) && \
-	$(KUSTOMIZE) edit add patch --kind Deployment --name openstack-operator-controller-operator --namespace system --patch "[{\"op\": \"replace\", \"path\": \"/spec/template/spec/containers/0/env/0\", \"value\": {\"name\": \"OPENSTACK_RELEASE_VERSION\", \"value\": \"$(OPENSTACK_RELEASE_VERSION)\"}}]"
-	sed -i -e 's|operator:image|$(IMG)|' config/operator/deployment/deployment.yaml
+	$(KUSTOMIZE) edit add patch --kind Deployment --name openstack-operator-controller-operator --namespace system --patch "[{\"op\": \"replace\", \"path\": \"/spec/template/spec/containers/0/env/0\", \"value\": {\"name\": \"OPENSTACK_RELEASE_VERSION\", \"value\": \"$(OPENSTACK_RELEASE_VERSION)\"}}]" && \
+	$(KUSTOMIZE) edit add patch --kind Deployment --name openstack-operator-controller-operator --namespace system --patch "[{\"op\": \"replace\", \"path\": \"/spec/template/spec/containers/0/env/1\", \"value\": {\"name\": \"OPERATOR_IMAGE_URL\", \"value\": \"$(IMG)\"}}]"
 	$(KUSTOMIZE) build config/operator --load-restrictor='LoadRestrictionsNone' | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
 	$(OPERATOR_SDK) bundle validate ./bundle
 

config/operator/deployment/deployment.yaml

@@ -42,12 +42,13 @@ spec:
         args:
         - --leader-elect
         env:
+        # we use kustomize to replace the first 2 envs here so do not reorder these
         - name: OPENSTACK_RELEASE_VERSION
           value: 0.0.1
-        - name: ENABLE_WEBHOOKS
-          value: false
         - name: OPERATOR_IMAGE_URL
           value: quay.io/openstack-k8s-operators/openstack-operator:latest
+        - name: ENABLE_WEBHOOKS
+          value: false
         image: controller:latest
         name: operator
         securityContext: