Merge pull request #2736 from Nordix/lentzi90/release-artifacts

🌱 Add release manifests

Author: metal3-io-bot

.github/workflows/e2e-fixture-test.yml

@@ -29,7 +29,8 @@ jobs:
 
     - name: Build BMO e2e Docker Image
       env:
-        IMG: quay.io/metal3-io/baremetal-operator:e2e
+        IMG: quay.io/metal3-io/baremetal-operator
+        IMG_TAG: e2e
       run: make docker
 
     - name: Set Up Environment and Run BMO e2e Tests

.github/workflows/release.yaml

@@ -108,7 +108,7 @@ jobs:
         go-version: ${{ env.go_version }}
     - name: generate release artifacts
       run: |
-        make release-notes
+        make release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: get release notes
@@ -119,6 +119,7 @@ jobs:
       uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
       with:
         draft: true
+        files: out/*
         body_path: ${{ env.RELEASE_TAG }}.md
         tag_name: ${{ env.RELEASE_TAG }}
   build_bmo:

.gitignore

@@ -5,6 +5,7 @@ build/_test
 _artifacts
 artifacts*.tar.gz
 test/e2e/images
+out
 
 # Created by https://www.gitignore.io/api/go
 ### Go ###

Makefile

@@ -87,9 +87,10 @@ help:  ## Display this help
 	@echo "  DEBUG            -- debug flag, if any ($(DEBUG))"
 
 # Image URL to use all building/pushing image targets
+REGISTRY ?= quay.io/metal3-io
 IMG_NAME ?= baremetal-operator
 IMG_TAG ?= latest
-IMG ?= $(IMG_NAME):$(IMG_TAG)
+IMG ?= $(REGISTRY)/$(IMG_NAME)
 
 ## --------------------------------------
 ## Test Targets
@@ -225,10 +226,15 @@ manifests-generate: $(CONTROLLER_GEN)
 manifests-kustomize: $(KUSTOMIZE)
 	$< build config/default > config/render/capm3.yaml
 
+.PHONY: set-manifest-pull-policy
+set-manifest-pull-policy:
+	$(info Updating kustomize pull policy file for manager resource)
+	sed -i'' -e 's@imagePullPolicy: .*@imagePullPolicy: '"$(PULL_POLICY)"'@' ./config/base/manager.yaml
+
 .PHONY: set-manifest-image-bmo
 set-manifest-image-bmo: $(KUSTOMIZE) manifests
 	$(info Updating container image for BMO to use ${MANIFEST_IMG}:${MANIFEST_TAG})
-	cd config/base && $(abspath $(KUSTOMIZE)) edit set image quay.io/metal3-io/baremetal-operator=${MANIFEST_IMG}:${MANIFEST_TAG}
+	sed -i'' -e 's@image: .*@image: \"'"${MANIFEST_IMG}:$(MANIFEST_TAG)"'\"@' ./config/base/manager.yaml
 
 .PHONY: set-manifest-image-ironic
 set-manifest-image-ironic: $(KUSTOMIZE) manifests
@@ -261,21 +267,21 @@ generate: $(CONTROLLER_GEN) ## Generate code
 
 .PHONY: docker
 docker: generate manifests ## Build the docker image
-	docker build . -t ${IMG} \
+	docker build . -t ${IMG}:${IMG_TAG} \
 	--build-arg http_proxy=$(http_proxy) \
 	--build-arg https_proxy=$(https_proxy)
 
 .PHONY: docker-debug
 docker-debug: generate manifests ## Build the docker image with debug info
-	docker build . -t ${IMG} \
+	docker build . -t ${IMG}:${IMG_TAG} \
 	--build-arg http_proxy=$(http_proxy) \
 	--build-arg https_proxy=$(https_proxy) \
 	--build-arg LDFLAGS="-extldflags=-static"
 
 # Push the docker image
 .PHONY: docker-push
 docker-push:
-	docker push ${IMG}
+	docker push ${IMG}:${IMG_TAG}
 
 ## --------------------------------------
 ## CI Targets
@@ -367,6 +373,20 @@ $(RELEASE_NOTES_DIR):
 release-notes: $(RELEASE_NOTES_DIR) $(RELEASE_NOTES)
 	cd hack/tools && $(GO) run release/notes.go  --releaseTag=$(RELEASE_TAG) > $(realpath $(RELEASE_NOTES_DIR))/$(RELEASE_TAG).md
 
+.PHONY: release-manifests
+release-manifests: $(KUSTOMIZE) $(RELEASE_DIR) ## Builds the manifests to publish with a release
+	$(KUSTOMIZE) build config > $(RELEASE_DIR)/baremetal-operator.yaml
+
+.PHONY: release
+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}"
+	MANIFEST_IMG=$(IMG) MANIFEST_TAG=$(RELEASE_TAG) $(MAKE) set-manifest-image-bmo
+	PULL_POLICY=IfNotPresent $(MAKE) set-manifest-pull-policy
+	$(MAKE) release-manifests
+	$(MAKE) release-notes
+
 go-version: ## Print the go version we use to compile our binaries and images
 	@echo $(GO_VERSION)
 

hack/ci-e2e.sh

@@ -57,7 +57,7 @@ sudo apt-get update
 sudo apt-get install -y libvirt-dev pkg-config
 
 # Build the container image with e2e tag (used in tests)
-IMG=quay.io/metal3-io/baremetal-operator:e2e make docker
+IMG=quay.io/metal3-io/baremetal-operator IMG_TAG=e2e make docker
 
 if ! sudo virsh net-list --all | grep baremetal-e2e; then
     virsh -c qemu:///system net-define "${REPO_ROOT}/hack/e2e/net.xml"