Support CAPI in-place version updates

Signed-off-by: apedriza <adripedriza@gmail.com>

Author: apedriza

.dockerignore

@@ -2,3 +2,4 @@
 # Ignore build and test binaries.
 bin/
 testbin/
+extensions/config

.github/workflows/capi-smoke-tests.yml

@@ -58,8 +58,8 @@ jobs:
         uses: supplypike/setup-bin@v4
         with:
           name: clusterctl
-          version: v1.11.4
-          uri: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.4/clusterctl-linux-amd64
+          version: v1.12.1
+          uri: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.12.1/clusterctl-linux-amd64
 
       - name: Download cluster-api components
         uses: actions/download-artifact@v5

.github/workflows/go.yml

@@ -89,6 +89,16 @@ jobs:
         with:
           name: install-standalone-yaml
           path: install-standalone.yaml
+      
+      - name: Generate inplace-extension install yaml
+        run: |
+          make release-extension-webhook
+
+      - name: Upload inplace-extension yaml
+        uses: actions/upload-artifact@v4
+        with:
+          name: extension-webhook-install-yaml
+          path: extension-webhook-install.yaml
 
   unittest:
     name: Unit tests
@@ -262,6 +272,7 @@ jobs:
           - TestControlplaneRemediation
           - TestControlplaneConditions
           - TestWorkloadClusterInplaceUpgrade
+          - TestWorkloadClusterCAPIInplaceUpgrade
           - TestWorkloadClusterRecreateUpgrade
           - TestWorkloadClusterRecreateDeleteFirstUpgrade
           - TestAdmissionWebhookRecreateStrategyInSingleMode

.github/workflows/publish-docs.yml

@@ -96,11 +96,14 @@ jobs:
           STABLE=${{ steps.set_versions.outputs.STABLE }}
           make release IMG=quay.io/k0sproject/k0smotron:${STABLE}
           make release-standalone IMG=quay.io/k0sproject/k0smotron:${STABLE}
+          make release-extension-webhook IMG=quay.io/k0sproject/k0smotron:${STABLE}
           cp install.yaml /tmp/install.yaml
           cp install-standalone.yaml /tmp/install-standalone.yaml
+          cp extension-webhook-install.yaml /tmp/extension-webhook-install.yaml
           git checkout gh-pages
           cp /tmp/install.yaml ${STABLE}/install.yaml
           cp /tmp/install-standalone.yaml ${STABLE}/install-standalone.yaml
-          git add ${STABLE}/install.yaml ${STABLE}/install-standalone.yaml && git update-index --refresh
-          git diff-index --quiet HEAD -- || git commit -m "Update install.yaml and install-standalone.yaml to ${STABLE}"
+          cp /tmp/extension-webhook-install.yaml ${STABLE}/extension-webhook-install.yaml
+          git add ${STABLE}/install.yaml ${STABLE}/install-standalone.yaml ${STABLE}/extension-webhook-install.yaml && git update-index --refresh
+          git diff-index --quiet HEAD -- || git commit -m "Update install.yaml, install-standalone.yaml, and extension-webhook-install.yaml to ${STABLE}"
           git push origin gh-pages

.gitignore

@@ -1,6 +1,7 @@
 # Generated files
 install.yaml
 install-standalone.yaml
+extension-webhook-install.yaml
 bootstrap-components.yaml
 control-plane-components.yaml
 infrastructure-components.yaml

Dockerfile

@@ -17,6 +17,7 @@ RUN go mod download
 COPY cmd/main.go cmd/main.go
 COPY api/ api/
 COPY internal/ internal/
+COPY extensions/ extensions/
 
 
 # Build
@@ -25,12 +26,13 @@ COPY internal/ internal/
 # the docker BUILDPLATFORM arg will be linux/arm64 when for Apple x86 it will be linux/amd64. Therefore,
 # by leaving it empty we can ensure that the container and binary shipped on it will have the same platform.
 RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o manager cmd/main.go
-
+RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -tags extension -o extension-webhook-server extensions/main.go
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM gcr.io/distroless/static:nonroot
 WORKDIR /
 COPY --from=builder /workspace/manager .
+COPY --from=builder /workspace/extension-webhook-server .
 USER 65532:65532
 
 ENTRYPOINT ["/manager"]

Makefile

@@ -160,6 +160,7 @@ generate-e2e-templates-main: $(KUSTOMIZE)
 	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/main/cluster-template-machinedeployment --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/main/cluster-template-machinedeployment.yaml
 	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/main/cluster-template-remote-hcp --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/main/cluster-template-remote-hcp.yaml
 	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/main/cluster-template-ingress --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/main/cluster-template-ingress.yaml
+	$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/main/cluster-template-inplace-extension --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/main/cluster-template-inplace-extension.yaml
 
 AWS_TEMPLATES := e2e/data/infrastructure-aws
 
@@ -257,6 +258,12 @@ release-standalone: manifests-standalone kustomize ## Generate install yaml for
 	$(KUSTOMIZE) build config/standalone > install-standalone.yaml
 	git checkout config/manager/kustomization.yaml
 
+.PHONY: release-extension-webhook
+release-extension-webhook: docker-build kustomize
+	cd extensions/config/webhook && $(KUSTOMIZE) edit set image extension-webhook=${IMG}
+	$(KUSTOMIZE) build extensions/config/default > extension-webhook-install.yaml
+	git checkout extensions/config/webhook/kustomization.yaml
+
 bootstrap-components.yaml: $(CONTROLLER_GEN) manifests-bootstrap kustomize
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/clusterapi/bootstrap/ > bootstrap-components.yaml

api/bootstrap/v1beta1/k0s_types.go

@@ -104,7 +104,6 @@ type K0sWorkerConfigSpec struct {
 	// UseSystemHostname specifies whether to use the system hostname for the kubernetes node name.
 	// By default, k0smotron will use Machine name as a node name. If true, it will pick it from `hostname` command output.
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default=false
 	UseSystemHostname bool `json:"useSystemHostname,omitempty"`
 
 	// Files specifies extra files to be passed to user_data upon creation.

cmd/main.go

@@ -36,6 +36,8 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	"k8s.io/client-go/rest"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
+	runtimev1 "sigs.k8s.io/cluster-api/api/runtime/v1beta2"
+	clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
 	"sigs.k8s.io/cluster-api/util/flags"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
@@ -92,6 +94,8 @@ func init() {
 	utilruntime.Must(clusterv1.AddToScheme(scheme))
 	utilruntime.Must(cpv1beta1.AddToScheme(scheme))
 	utilruntime.Must(infrastructurev1beta1.AddToScheme(scheme))
+	utilruntime.Must(runtimev1.AddToScheme(scheme))
+	utilruntime.Must(clusterctlv1.AddToScheme(scheme))
 	//+kubebuilder:scaffold:scheme
 }
 

config/clusterapi/all/rbac/role.yaml

@@ -138,6 +138,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - clusterctl.cluster.x-k8s.io
+  resources:
+  - providers
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - controlplane.cluster.x-k8s.io
   resources:
@@ -213,6 +221,14 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - runtime.cluster.x-k8s.io
+  resources:
+  - extensionconfigs
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - storage.k8s.io
   resources: