Merge pull request #328 from dtantsur/release-manifest

🌱 Make the CI job run on the local source again

Author: metal3-io-bot

Makefile

@@ -72,7 +72,8 @@ ifeq ($(USE_IMAGE_DIGESTS), true)
 endif
 
 # Image URL to use all building/pushing image targets
-IMG ?= quay.io/metal3-io/ironic-standalone-operator:latest
+IMG_NO_TAG ?= quay.io/metal3-io/ironic-standalone-operator
+IMG ?= $(IMG_NO_TAG):latest
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -332,6 +333,6 @@ release:
 	@if [ -z "${RELEASE_TAG}" ]; then echo "RELEASE_TAG is not set"; exit 1; fi
 	@if ! [ -z "$$(git status --porcelain)" ]; then echo "You have uncommitted changes"; exit 1; fi
 	git checkout "${RELEASE_TAG}"
-	sed -i -Ee "/image/s/(latest|release-[0-9\\.]+)/$(RELEASE_TAG)/" ./config/default/manager_image_patch.yaml
+	cd config/manager && $(KUSTOMIZE) edit set image quay.io/metal3-io/ironic-standalone-operator="$(IMG_NO_TAG):${RELEASE_TAG}"
 	$(MAKE) release-manifests
 	$(MAKE) release-notes

config/default/kustomization.yaml

@@ -12,7 +12,6 @@ resources:
 #- ../prometheus
 
 patches:
-- path: manager_image_patch.yaml
 - path: manager_webhook_patch.yaml
 - path: webhookcainjection_patch.yaml
 

config/default/manager_image_patch.yaml

@@ -90,8 +90,8 @@ Create a development branch (e.g. `prepare-0.x`) from the newly created branch:
   branch of the Ironic image.
 
 - Change the branch of IrSO itself from `latest` to `release-0.x` in two
-  places: [IMG in Makefile][img-makefile] and in the file
-  `config/default/manager_image_patch.yaml`.
+  places: [IMG in Makefile][img-makefile] and
+  [Kustomize configuration][kustomize].
 
 - Commit your changes, push the new branch and create a pull request:
   - The commit and PR title should be
@@ -105,6 +105,7 @@ Wait for the pull request to be merged before proceeding.
 
 [default-version]: https://github.com/metal3-io/ironic-standalone-operator/blob/b630805cdd782a51845fc16086e5f64fa77e29af/pkg/ironic/version.go#L14-L15
 [img-makefile]: https://github.com/metal3-io/ironic-standalone-operator/blob/b630805cdd782a51845fc16086e5f64fa77e29af/Makefile#L74-L75
+[kustomize]: https://github.com/metal3-io/ironic-standalone-operator/blob/b630805cdd782a51845fc16086e5f64fa77e29af/config/manager/manager.yaml#L47
 
 ### Creating Release Notes