Merge pull request #396 from makhov/makefile-release-fix

Fix clusterctl files generation
k0sproject · Jan 4, 2024 · 252c149 · 252c149
2 parents b4791b3 + ff261a6
commit 252c149
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -38,6 +38,11 @@ jobs:
       - name: Run git checkout
         uses: actions/checkout@v4
 
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.21.1'
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:

diff --git a/Makefile b/Makefile
@@ -178,17 +178,17 @@ clusterapi-manifests:
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd:generateEmbeddedObjectMeta=true webhook paths="./api/controlplane/..." output:crd:artifacts:config=config/clusterapi/controlplane/bases
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd:generateEmbeddedObjectMeta=true webhook paths="./api/infrastructure/..." output:crd:artifacts:config=config/clusterapi/infrastructure/bases
 
-bootstrap-components.yaml: clusterapi-manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
+bootstrap-components.yaml: clusterapi-manifests kustomize $(CONTROLLER_GEN)
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/clusterapi/bootstrap/ > bootstrap-components.yaml
 	git checkout config/manager/kustomization.yaml
 
-control-plane-components.yaml: clusterapi-manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
+control-plane-components.yaml: clusterapi-manifests kustomize $(CONTROLLER_GEN)
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/clusterapi/controlplane/ > control-plane-components.yaml
 	git checkout config/manager/kustomization.yaml
 
-infrastructure-components.yaml: clusterapi-manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
+infrastructure-components.yaml: clusterapi-manifests kustomize $(CONTROLLER_GEN)
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/clusterapi/infrastructure/ > infrastructure-components.yaml
 	git checkout config/manager/kustomization.yaml