Skip to content

Commit e5e3bc4

Browse files
fix: make the bundle in the release pipeline (#69)
remove bundle build from the build workflow since we can't use the latest tag Signed-off-by: Harikrishnan Balagopal <[email protected]>
1 parent 92cc8e7 commit e5e3bc4

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

.github/workflows/build.yml

-2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ jobs:
2525
- name: build container image
2626
run: |
2727
VERSION='${{ steps.image_tag.outputs.tag }}' make docker-build
28-
VERSION='${{ steps.image_tag.outputs.tag }}' make bundle-build
2928
- name: push images to quay
3029
run: |
3130
VERSION='${{ steps.image_tag.outputs.tag }}' make docker-push
32-
VERSION='${{ steps.image_tag.outputs.tag }}' make bundle-push
3331
- name: success slack notification
3432
uses: rtCamp/action-slack-notify@v2
3533
env:

.github/workflows/release.yml

+7
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,16 @@ jobs:
104104
- uses: actions/checkout@v2
105105
with:
106106
ref: ${{ github.event.inputs.commit_ref }}
107+
- name: install-yq
108+
run: |
109+
echo "installing yq..."
110+
curl -L https://github.com/mikefarah/yq/releases/download/v4.13.5/yq_linux_amd64 -o /usr/local/bin/yq && chmod +x /usr/local/bin/yq
111+
echo "yq installed"
107112
- name: build
108113
run: |
109114
VERSION=${{ github.event.inputs.tag }} make docker-build
115+
rm -rf bundle/
116+
VERSION=${{ github.event.inputs.tag }} make bundle
110117
VERSION=${{ github.event.inputs.tag }} make bundle-build
111118
- run: echo "${{ secrets.QUAY_BOT_PASSWORD }}" | docker login --username "${{ secrets.QUAY_BOT_USERNAME }}" --password-stdin quay.io
112119
- name: push the image to quay

Makefile

+5
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,11 @@ endif
182182

183183
.PHONY: bundle
184184
bundle: kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
185+
@echo 'changing the image tag to '${VERSION}' in "containerImage" field in the CSV using yq'
186+
@cat config/manifests/bases/move2kube-operator.clusterserviceversion.yaml
187+
yq eval --exit-status --inplace ".metadata.annotations.containerImage=\"quay.io/konveyor/move2kube-operator:${VERSION}\"" config/manifests/bases/move2kube-operator.clusterserviceversion.yaml
188+
@echo 'after editting the CSV'
189+
@cat config/manifests/bases/move2kube-operator.clusterserviceversion.yaml
185190
$(OPERATOR_SDK) generate kustomize manifests -q
186191
cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
187192
$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)

bundle/manifests/move2kube-operator.clusterserviceversion.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ metadata:
8080
capabilities: Seamless Upgrades
8181
categories: Modernization & Migration
8282
containerImage: quay.io/konveyor/move2kube-operator:v0.3.9
83-
createdAt: "2023-08-23T19:28:57Z"
83+
createdAt: "2023-08-24T14:46:14Z"
8484
description: Konveyor Move2Kube is an open source tool that helps migrate your
8585
app to run on Kubernetes/Openshift.
8686
operators.operatorframework.io/builder: operator-sdk-v1.31.0

0 commit comments

Comments
 (0)