🌱 Add multiple controlplane class support to v1.11.6

.github/workflows/pr-golangci-lint.yaml

@@ -1,4 +1,4 @@
-name: PR CI
+name: PR golangci-lint
 
 on:
   pull_request:
@@ -34,51 +34,3 @@ jobs:
           working-directory: ${{matrix.working-directory}}
       - name: Lint API
         run: make lint-api
-
-  unit-tests:
-    name: unit-tests (${{ matrix.name }})
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: cluster-api
-            target: test-junit
-          - name: docker-infrastructure
-            target: test-docker-infrastructure-junit
-          - name: test-extension
-            target: test-test-extension-junit
-          - name: test-framework
-            target: test-framework-junit
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
-      - name: Calculate go version
-        id: vars
-        run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT
-      - name: Set up Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # tag=v5.5.0
-        with:
-          go-version: ${{ steps.vars.outputs.go_version }}
-      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # tag=v4.2.3
-        name: Restore go cache
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-            hack/tools/bin
-          key: ${{ runner.os }}-go-${{ steps.vars.outputs.go_version }}-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-${{ steps.vars.outputs.go_version }}-
-            ${{ runner.os }}-go-
-      - name: Create artifacts directory
-        run: mkdir -p _artifacts
-      - name: Run unit tests
-        run: make ${{ matrix.target }}
-      - name: Upload test artifacts
-        if: failure()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag=v4.6.2
-        with:
-          name: unit-tests-${{ matrix.name }}
-          path: _artifacts
-          if-no-files-found: ignore
-          retention-days: 7

.github/workflows/release.yaml

@@ -1,4 +1,4 @@
-name: Create Release
+name: Push Release Tags
 
 on:
   push:
@@ -8,13 +8,11 @@ on:
       - 'CHANGELOG/*.md'
 
 permissions:
-  contents: write # Allow to push a tag, create a release branch and publish a draft release.
+  contents: write # Allow to push a tag and create a release branch.
 
 jobs:
   push_release_tags:
     runs-on: ubuntu-latest
-    outputs:
-      release_tag: ${{ steps.release-version.outputs.release_version }}
     steps:
       - name: Checkout code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
@@ -78,37 +76,3 @@ jobs:
           git push origin ${RELEASE_VERSION}
           git push origin test/${RELEASE_VERSION}
           echo "Created tags $RELEASE_VERSION and test/${RELEASE_VERSION}"
-  release:
-    name: create draft release
-    runs-on: ubuntu-latest
-    needs: push_release_tags
-    steps:
-      - name: Set env
-        run:  echo "RELEASE_TAG=${RELEASE_TAG}" >> $GITHUB_ENV
-        env:
-          RELEASE_TAG: ${{needs.push_release_tags.outputs.release_tag}}
-      - name: checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
-        with:
-          fetch-depth: 0
-          ref: ${{ env.RELEASE_TAG }}
-      - name: Calculate go version
-        run: echo "go_version=$(make go-version)" >> $GITHUB_ENV
-      - name: Set up Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # tag=v5.5.0
-        with:
-          go-version: ${{ env.go_version }}
-      - name: generate release artifacts
-        run: |
-          make release
-      - name: get release notes
-        run: |
-          curl -L "https://raw.githubusercontent.com/${{ github.repository }}/main/CHANGELOG/${{ env.RELEASE_TAG }}.md" \
-          -o "${{ env.RELEASE_TAG }}.md"
-      - name: Release
-        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # tag=v2.3.2
-        with:
-          draft: true
-          files: out/*
-          body_path: ${{ env.RELEASE_TAG }}.md
-          tag_name: ${{ env.RELEASE_TAG }}

.github/workflows/tag-release.yaml

@@ -0,0 +1,36 @@
+name: Create Release
+
+on:
+  push:
+    tags:
+      - "v*"
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    name: create draft release
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
+        with:
+          fetch-depth: 0
+          ref: ${{ github.ref_name }}
+      - name: Calculate go version
+        run: echo "go_version=$(make go-version)" >> $GITHUB_ENV
+      - name: Set up Go
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # tag=v5.5.0
+        with:
+          go-version: ${{ env.go_version }}
+      - name: generate release artifacts
+        run: |
+          make release
+      - name: Release
+        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # tag=v2.3.2
+        with:
+          draft: true
+          files: out/*
+          name: ${{ github.ref_name }}
+          tag_name: ${{ github.ref_name }}

Makefile

@@ -214,11 +214,14 @@ TILT_PREPARE_BIN := tilt-prepare
 TILT_PREPARE := $(abspath $(TOOLS_BIN_DIR)/$(TILT_PREPARE_BIN))
 
 # Define Docker related variables. Releases should modify and double check these vars.
-REGISTRY ?= gcr.io/$(shell gcloud config get-value project)
+REGISTRY ?= gcr.io/xxxxxx
+
+# For string inside YAML files (in "out" directory)
 PROD_REGISTRY ?= registry.k8s.io/cluster-api
 
+# For string inside YAML files (in "out" directory)
 STAGING_REGISTRY ?= gcr.io/k8s-staging-cluster-api
-STAGING_BUCKET ?= k8s-staging-cluster-api
+#STAGING_BUCKET ?= k8s-staging-cluster-api
 
 # core
 IMAGE_NAME ?= cluster-api-controller
@@ -252,7 +255,7 @@ CAPI_KIND_CLUSTER_NAME ?= capi-test
 
 TAG ?= dev
 ARCH ?= $(shell go env GOARCH)
-ALL_ARCH ?= amd64 arm arm64 ppc64le s390x
+ALL_ARCH ?= amd64
 
 # Allow overriding the imagePullPolicy
 PULL_POLICY ?= Always
@@ -851,10 +854,11 @@ docker-build-%:
 
 # Choice of images to build/push
 ALL_DOCKER_BUILD ?= core kubeadm-bootstrap kubeadm-control-plane docker-infrastructure test-extension clusterctl
+SYSELF_RELEVANT_DOCKER_BUILD ?= core
 
 .PHONY: docker-build
 docker-build: docker-pull-prerequisites ## Run docker-build-* targets for all the images
-	$(MAKE) ARCH=$(ARCH) $(addprefix docker-build-,$(ALL_DOCKER_BUILD))
+	$(MAKE) ARCH=$(ARCH) $(addprefix docker-build-,$(SYSELF_RELEVANT_DOCKER_BUILD))
 
 ALL_DOCKER_BUILD_E2E = core kubeadm-bootstrap kubeadm-control-plane docker-infrastructure test-extension
 
@@ -1069,9 +1073,9 @@ $(RELEASE_NOTES_DIR):
 
 .PHONY: release
 release: clean-release ## Build and push container images using the latest git tag for the commit
-	@if [ -z "${RELEASE_TAG}" ]; then echo "RELEASE_TAG is not set"; exit 1; fi
-	@if ! [ -z "$$(git status --porcelain)" ]; then echo "Your local git repository contains uncommitted changes, use git clean before proceeding."; exit 1; fi
-	git checkout "${RELEASE_TAG}"
+	#@if [ -z "${RELEASE_TAG}" ]; then echo "RELEASE_TAG is not set"; exit 1; fi
+	#@if ! [ -z "$$(git status --porcelain)" ]; then echo "Your local git repository contains uncommitted changes, use git clean before proceeding."; exit 1; fi
+	#git checkout "${RELEASE_TAG}"
 	# Build binaries first.
 	GIT_VERSION=$(RELEASE_TAG) $(MAKE) release-binaries
 	# Set the manifest images to the staging/production bucket and Builds the manifests to publish with a release.
@@ -1147,11 +1151,11 @@ release-manifests-dev: $(RELEASE_DIR) $(KUSTOMIZE) ## Build the development mani
 .PHONY: release-binaries
 release-binaries: ## Build the binaries to publish with a release
 	RELEASE_BINARY=clusterctl-linux-amd64 BUILD_PATH=./cmd/clusterctl GOOS=linux GOARCH=amd64 $(MAKE) release-binary
-	RELEASE_BINARY=clusterctl-linux-arm64 BUILD_PATH=./cmd/clusterctl GOOS=linux GOARCH=arm64 $(MAKE) release-binary
-	RELEASE_BINARY=clusterctl-darwin-amd64 BUILD_PATH=./cmd/clusterctl GOOS=darwin GOARCH=amd64 $(MAKE) release-binary
-	RELEASE_BINARY=clusterctl-darwin-arm64 BUILD_PATH=./cmd/clusterctl GOOS=darwin GOARCH=arm64 $(MAKE) release-binary
-	RELEASE_BINARY=clusterctl-windows-amd64.exe BUILD_PATH=./cmd/clusterctl GOOS=windows GOARCH=amd64 $(MAKE) release-binary
-	RELEASE_BINARY=clusterctl-linux-ppc64le BUILD_PATH=./cmd/clusterctl GOOS=linux GOARCH=ppc64le $(MAKE) release-binary
+# 	RELEASE_BINARY=clusterctl-linux-arm64 BUILD_PATH=./cmd/clusterctl GOOS=linux GOARCH=arm64 $(MAKE) release-binary
+# 	RELEASE_BINARY=clusterctl-darwin-amd64 BUILD_PATH=./cmd/clusterctl GOOS=darwin GOARCH=amd64 $(MAKE) release-binary
+# 	RELEASE_BINARY=clusterctl-darwin-arm64 BUILD_PATH=./cmd/clusterctl GOOS=darwin GOARCH=arm64 $(MAKE) release-binary
+# 	RELEASE_BINARY=clusterctl-windows-amd64.exe BUILD_PATH=./cmd/clusterctl GOOS=windows GOARCH=amd64 $(MAKE) release-binary
+# 	RELEASE_BINARY=clusterctl-linux-ppc64le BUILD_PATH=./cmd/clusterctl GOOS=linux GOARCH=ppc64le $(MAKE) release-binary
 
 .PHONY: release-binary
 release-binary: $(RELEASE_DIR)
@@ -1160,9 +1164,11 @@ release-binary: $(RELEASE_DIR)
 		-e CGO_ENABLED=0 \
 		-e GOOS=$(GOOS) \
 		-e GOARCH=$(GOARCH) \
-		-e GOCACHE=/tmp/ \
+		-e GOCACHE=/go/build-cache/ \
 		--user $$(id -u):$$(id -g) \
 		-v "$$(pwd):/workspace$(DOCKER_VOL_OPTS)" \
+		-v "$$(go env GOMODCACHE):/go/pkg/mod" \
+		-v "$$(go env GOCACHE):/go/build-cache" \
 		-w /workspace \
 		golang:$(GO_VERSION) \
 		go build -a -trimpath -ldflags "$(LDFLAGS) -extldflags '-static'" \
@@ -1184,7 +1190,8 @@ release-staging: ## Build and push container images to the staging bucket
 	$(MAKE) release-manifests-dev
 	# Example manifest location: https://storage.googleapis.com/k8s-staging-cluster-api/components/main/core-components.yaml
 	# Please note that these files are deleted after a certain period, at the time of this writing 60 days after file creation.
-	gsutil cp $(RELEASE_DIR)/* gs://$(STAGING_BUCKET)/components/$(RELEASE_ALIAS_TAG)
+
+	##gsutil cp $(RELEASE_DIR)/* gs://$(STAGING_BUCKET)/components/$(RELEASE_ALIAS_TAG)
 
 .PHONY: release-staging-nightly
 release-staging-nightly: ## Tag and push container images to the staging bucket. Example image tag: cluster-api-controller:nightly_main_20210121
@@ -1201,16 +1208,17 @@ release-staging-nightly: ## Tag and push container images to the staging bucket.
 	$(MAKE) release-manifests-dev
 	# Example manifest location: https://storage.googleapis.com/k8s-staging-cluster-api/components/nightly_main_20240425/core-components.yaml
 	# Please note that these files are deleted after a certain period, at the time of this writing 60 days after file creation.
-	gsutil cp $(RELEASE_DIR)/* gs://$(STAGING_BUCKET)/components/$(NEW_RELEASE_ALIAS_TAG)
+	#gsutil cp $(RELEASE_DIR)/* gs://$(STAGING_BUCKET)/components/$(NEW_RELEASE_ALIAS_TAG)
 
 .PHONY: release-alias-tag
 release-alias-tag: ## Add the release alias tag to the last build tag
-	gcloud container images add-tag $(CONTROLLER_IMG):$(TAG) $(CONTROLLER_IMG):$(RELEASE_ALIAS_TAG)
-	gcloud container images add-tag $(KUBEADM_BOOTSTRAP_CONTROLLER_IMG):$(TAG) $(KUBEADM_BOOTSTRAP_CONTROLLER_IMG):$(RELEASE_ALIAS_TAG)
-	gcloud container images add-tag $(KUBEADM_CONTROL_PLANE_CONTROLLER_IMG):$(TAG) $(KUBEADM_CONTROL_PLANE_CONTROLLER_IMG):$(RELEASE_ALIAS_TAG)
-	gcloud container images add-tag $(CLUSTERCTL_IMG):$(TAG) $(CLUSTERCTL_IMG):$(RELEASE_ALIAS_TAG)
-	gcloud container images add-tag $(CAPD_CONTROLLER_IMG):$(TAG) $(CAPD_CONTROLLER_IMG):$(RELEASE_ALIAS_TAG)
-	gcloud container images add-tag $(TEST_EXTENSION_IMG):$(TAG) $(TEST_EXTENSION_IMG):$(RELEASE_ALIAS_TAG)
+	echo "Syself: skipping"
+# 	gcloud container images add-tag $(CONTROLLER_IMG):$(TAG) $(CONTROLLER_IMG):$(RELEASE_ALIAS_TAG)
+# 	gcloud container images add-tag $(KUBEADM_BOOTSTRAP_CONTROLLER_IMG):$(TAG) $(KUBEADM_BOOTSTRAP_CONTROLLER_IMG):$(RELEASE_ALIAS_TAG)
+# 	gcloud container images add-tag $(KUBEADM_CONTROL_PLANE_CONTROLLER_IMG):$(TAG) $(KUBEADM_CONTROL_PLANE_CONTROLLER_IMG):$(RELEASE_ALIAS_TAG)
+# 	gcloud container images add-tag $(CLUSTERCTL_IMG):$(TAG) $(CLUSTERCTL_IMG):$(RELEASE_ALIAS_TAG)
+# 	gcloud container images add-tag $(CAPD_CONTROLLER_IMG):$(TAG) $(CAPD_CONTROLLER_IMG):$(RELEASE_ALIAS_TAG)
+# 	gcloud container images add-tag $(TEST_EXTENSION_IMG):$(TAG) $(TEST_EXTENSION_IMG):$(RELEASE_ALIAS_TAG)
 
 .PHONY: release-notes-tool
 release-notes-tool:
@@ -1246,13 +1254,13 @@ docker-image-verify: ## Verifies all built images to contain the correct binary
 
 .PHONY: docker-push-all
 docker-push-all: $(addprefix docker-push-,$(ALL_ARCH))  ## Push the docker images to be included in the release for all architectures + related multiarch manifests
-	$(MAKE) ALL_ARCH="$(ALL_ARCH)" $(addprefix docker-push-manifest-,$(ALL_DOCKER_BUILD))
+	$(MAKE) ALL_ARCH="$(ALL_ARCH)" $(addprefix docker-push-manifest-,$(SYSELF_RELEVANT_DOCKER_BUILD))
 
 docker-push-%:
 	$(MAKE) ARCH=$* docker-push
 
 .PHONY: docker-push
-docker-push: $(addprefix docker-push-,$(ALL_DOCKER_BUILD)) ## Push the docker images to be included in the release
+docker-push: $(addprefix docker-push-,$(SYSELF_RELEVANT_DOCKER_BUILD)) ## Push the docker images to be included in the release
 
 .PHONY: docker-push-core
 docker-push-core: ## Push the core docker image

README.md

@@ -62,4 +62,23 @@ Participation in the Kubernetes community is governed by the [Kubernetes Code of
 [Good first issue]: https://github.com/kubernetes-sigs/cluster-api/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22
 [Help wanted]: https://github.com/kubernetes-sigs/cluster-api/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22+
 
-<!-- ANCHOR_END: Community -->
+# Release/Development (Syself Fork)
+
+```console
+export RELEASE_TAG=v1.11.6-syself.XX && git tag  -a $RELEASE_TAG -m $RELEASE_TAG && git push origin $RELEASE_TAG
+```
+
+Then a Github Action starts and builds a draft release.
+
+You can get notified when the action is finished like this:
+
+```console
+gh run watch -i 20 ; music
+```
+
+Then open Git repo `autopilot`. Use branch `main` for deploy to prod and branch `syself/oci` for
+deploy to testing-cluster.
+
+Update the capi version.
+
+Follow the Autpilot release docs: [autopilot README](https://github.com/syself/autopilot/).

api/core/v1beta1/cluster_types.go

@@ -597,6 +597,15 @@ type ControlPlaneTopology struct {
 	// +optional
 	Metadata ObjectMeta `json:"metadata,omitempty"`
 
+	// class is the name of the ControlPlaneClass used to create the set of control plane nodes.
+	// This should match one of the control plane classes defined in the ClusterClass object.
+	// If left empty `clusterclass.Spec.ControlPlane` is used.
+	// syself new field.
+	// +optional
+	// +kubebuilder:validation:MinLength=1
+	// +kubebuilder:validation:MaxLength=256
+	Class string `json:"class,omitempty"`
+
 	// replicas is the number of control plane nodes.
 	// If the value is nil, the ControlPlane object is created without the number of Replicas
 	// and it's assumed that the control plane controller does not implement support for this field.