From 68b4a6a212114d4aa3a8888378cb3c96e8843ecb Mon Sep 17 00:00:00 2001 From: Miguel Duarte Barroso Date: Mon, 10 Jun 2024 11:50:07 +0200 Subject: [PATCH 1/3] install: remove CRD things from the manifest We do not ship a CRD, thus, there's no point for this check. Signed-off-by: Miguel Duarte Barroso --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index 2492b16b..0e49c1a8 100644 --- a/Makefile +++ b/Makefile @@ -118,9 +118,6 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform .PHONY: build-installer build-installer: manifests generate kustomize ## Generate a consolidated YAML with CRDs and deployment. mkdir -p dist - @if [ -d "config/crd" ]; then \ - $(KUSTOMIZE) build config/crd > dist/install.yaml; \ - fi echo "---" >> dist/install.yaml # Add a document separator before appending cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} $(KUSTOMIZE) build config/default >> dist/install.yaml From e24caa04a9b33d686e0050ca98214409439d0df9 Mon Sep 17 00:00:00 2001 From: Miguel Duarte Barroso Date: Mon, 10 Jun 2024 11:49:14 +0200 Subject: [PATCH 2/3] install: start the install manifest from scratch Ensure we start from an empty file when generating the installation manifest. Signed-off-by: Miguel Duarte Barroso --- Makefile | 2 +- dist/install.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0e49c1a8..b8fe9c89 100644 --- a/Makefile +++ b/Makefile @@ -118,7 +118,7 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform .PHONY: build-installer build-installer: manifests generate kustomize ## Generate a consolidated YAML with CRDs and deployment. mkdir -p dist - echo "---" >> dist/install.yaml # Add a document separator before appending + echo "---" > dist/install.yaml # Add a document separator before appending cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} $(KUSTOMIZE) build config/default >> dist/install.yaml diff --git a/dist/install.yaml b/dist/install.yaml index fda523ab..335eae9b 100644 --- a/dist/install.yaml +++ b/dist/install.yaml @@ -1,4 +1,3 @@ - --- apiVersion: v1 kind: Namespace From 68d34965b2a69f07d8869fb11be284e4c5448bb3 Mon Sep 17 00:00:00 2001 From: Miguel Duarte Barroso Date: Mon, 10 Jun 2024 11:56:16 +0200 Subject: [PATCH 3/3] ci, install: generate manifest w/ correct img name Signed-off-by: Miguel Duarte Barroso --- .github/workflows/publish-img.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-img.yaml b/.github/workflows/publish-img.yaml index c6bdd2b6..564a4e7d 100644 --- a/.github/workflows/publish-img.yaml +++ b/.github/workflows/publish-img.yaml @@ -59,7 +59,7 @@ jobs: - name: Template release manifests if: startsWith(github.ref, 'refs/tags/') - run: IMG=${{ github.ref_name }} make build-installer + run: IMG=ghcr.io/${{ github.repository }}:${{ github.ref_name }} make build-installer - name: Release the kraken uses: softprops/action-gh-release@v1