Merge pull request #81 from lpiwowar/lpiwowar/address-gorkas-comment

Keep deployment patches in kustomization

Author: openshift-merge-bot[bot]

Makefile

@@ -332,7 +332,6 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada
 	cd config/manager && $(KUSTOMIZE) edit add patch --kind Deployment --name controller-manager --patch "[{\"op\": \"replace\", \"path\": \"/spec/template/spec/containers/0/env/0/value\", \"value\": \"$(OPENSHIFT_LIGHTSPEED_OPERATOR_VERSION)\"}]"
 	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
 	$(OPERATOR_SDK) bundle validate ./bundle
-	cd config/manager && $(KUSTOMIZE) edit remove patch --kind Deployment --name controller-manager --patch "[{\"op\": \"replace\", \"path\": \"/spec/template/spec/containers/0/env/0/value\", \"value\": \"$(OPENSHIFT_LIGHTSPEED_OPERATOR_VERSION)\"}]"
 
 .PHONY: bundle-build
 bundle-build: ## Build the bundle image.

config/manager/kustomization.yaml

@@ -6,3 +6,9 @@ images:
 - name: controller
   newName: quay.io/openstack-lightspeed/operator
   newTag: latest
+patches:
+- patch: '[{"op": "replace", "path": "/spec/template/spec/containers/0/env/0/value",
+    "value": "latest"}]'
+  target:
+    kind: Deployment
+    name: controller-manager