🌱 Update docker distribution

.github/workflows/golangci-lint.yml

@@ -13,9 +13,12 @@ jobs:
           - test
           - hack/tools
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.17
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3.1.0
         with:
           version: v1.43.0
           working-directory: ${{matrix.working-directory}}

.github/workflows/verify.yml

@@ -9,6 +9,6 @@ jobs:
     steps:
     - name: Verifier action
       id: verifier
-      uses: kubernetes-sigs/kubebuilder-release-tools@v0.1
+      uses: kubernetes-sigs/kubebuilder-release-tools@v0.2.0
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -61,6 +61,8 @@ vendor
 # User-supplied Tiltfile extensions, settings, and builds
 tilt.d
 tilt-settings.json
+tilt-settings.yaml
+tilt_modules
 .tiltbuild
 
 # User-supplied clusterctl hacks settings
@@ -74,4 +76,4 @@ out
 _releasenotes
 
 # Helm
-.helm
+.helm

.markdownlinkcheck.json

@@ -1,10 +1,15 @@
 {
-    "ignorePatterns": [
-        {
+    "ignorePatterns": [{
         "pattern": "^http://localhost"
+    }],
+    "httpHeaders": [{
+        "comment": "Workaround as suggested here: https://github.com/tcort/markdown-link-check/issues/201",
+        "urls": ["https://docs.github.com/"],
+        "headers": {
+            "Accept-Encoding": "zstd, br, gzip, deflate"
         }
-],
-    "timeout": "5s",
+    }],
+    "timeout": "10s",
     "retryOn429": true,
     "retryCount": 5,
     "fallbackRetryDelay": "30s",

CONTRIBUTING.md

@@ -111,11 +111,12 @@ this should generally not be the case.
 
 Cluster API maintains the most recent release branch for all supported API and contract versions. Support for this section refers to the ability to backport and release patch versions.
 
-| API Version   | Branch | Supported Until |
-| ------------- | ----------- | ---------- |
-| **v1beta1**   | release-1.0 | current stable |
-| **v1alpha4**  | release-0.4 | 2022-04-06 |
-| **v1alpha3**  | release-0.3 | 2022-02-23 |
+| API Version   | Branch      | Supported Until |
+| ------------- |-------------|-----------------|
+| **v1beta1**   | release-1.1 | current stable  |
+| **v1beta1**   | release-1.0 | 2022-02-02      |
+| **v1alpha4**  | release-0.4 | 2022-04-06      |
+| **v1alpha3**  | release-0.3 | 2022-02-23      |
 
 - The API version is determined from the GroupVersion defined in the top-level `api/` package.
 - The EOL date is determined from the last release available once a new API version is published.
@@ -391,10 +392,10 @@ Examples:
 ```bash
 $ kubectl get kubeadmcontrolplane
 NAMESPACE            NAME                               INITIALIZED   API SERVER AVAILABLE   REPLICAS   READY   UPDATED   UNAVAILABLE   AGE     VERSION
-quick-start-d5ufye   quick-start-ntysk0-control-plane   true          true                   1          1       1                       2m44s   v1.23.0
+quick-start-d5ufye   quick-start-ntysk0-control-plane   true          true                   1          1       1                       2m44s   v1.23.3
 $ kubectl get machinedeployment
 NAMESPACE            NAME                      CLUSTER              REPLICAS   READY   UPDATED   UNAVAILABLE   PHASE       AGE     VERSION
-quick-start-d5ufye   quick-start-ntysk0-md-0   quick-start-ntysk0   1                  1         1             ScalingUp   3m28s   v1.23.0
+quick-start-d5ufye   quick-start-ntysk0-md-0   quick-start-ntysk0   1                  1         1             ScalingUp   3m28s   v1.23.3
 ```
 
 ## Google Doc Viewing Permissions

Makefile

@@ -39,7 +39,7 @@ export GO111MODULE=on
 #
 # Kubebuilder.
 #
-export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.23.1
+export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.23.3
 export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
 export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
 
@@ -309,11 +309,7 @@ lint-fix: $(GOLANGCI_LINT) ## Lint the codebase and run auto-fixers if supported
 apidiff: $(GO_APIDIFF) ## Check for API differences
 	$(GO_APIDIFF) $(shell git rev-parse origin/main) --print-compatible
 
-.PHONY: format-tiltfile
-format-tiltfile: ## Format the Tiltfile
-	./hack/verify-starlark.sh fix
-
-ALL_VERIFY_CHECKS = doctoc boilerplate shellcheck tiltfile modules gen conversions docker-provider book-links
+ALL_VERIFY_CHECKS = doctoc boilerplate shellcheck tiltfile modules gen conversions docker-provider
 
 .PHONY: verify
 verify: $(addprefix verify-,$(ALL_VERIFY_CHECKS)) ## Run all verify-* targets
@@ -361,10 +357,6 @@ verify-docker-provider:
 	@echo "Verifying CAPD"
 	cd $(CAPD_DIR); $(MAKE) verify
 
-.PHONY: verify-book-links
-verify-book-links: ## Verify book links
-	$(MAKE) -C docs/book verify
-
 ## --------------------------------------
 ## Binaries
 ## --------------------------------------
@@ -426,6 +418,14 @@ docker-build-kubeadm-control-plane: ## Build the docker image for kubeadm contro
 e2e-framework: ## Builds the CAPI e2e framework
 	cd $(E2E_FRAMEWORK_DIR); go build ./...
 
+.PHONY: build-book
+build-book: ## Build the book
+	$(MAKE) -C docs/book build
+
+.PHONY: serve-book
+serve-book: ## Build and serve the book (with live-reload)
+	$(MAKE) -C docs/book serve
+
 ## --------------------------------------
 ## Testing
 ## --------------------------------------
@@ -757,4 +757,4 @@ $(KUSTOMIZE): # Download kustomize using hack script into tools folder.
 $(GOLANGCI_LINT): .github/workflows/golangci-lint.yml # Download golanci-lint using hack script into tools folder.
 	hack/ensure-golangci-lint.sh \
 		-b $(TOOLS_DIR)/$(BIN_DIR) \
-		$(shell cat .github/workflows/golangci-lint.yml | grep version | sed 's/.*version: //')
+		$(shell cat .github/workflows/golangci-lint.yml | grep [[:space:]]version | sed 's/.*version: //')

OWNERS_ALIASES

@@ -22,6 +22,7 @@ aliases:
   - CecileRobertMichon
   - enxebre
   - fabriziopandini
+  - sbueringer
   - vincepri
 
   # folks who can review and LGTM any PRs in the repo
@@ -45,6 +46,7 @@ aliases:
 
   cluster-api-bootstrap-provider-kubeadm-maintainers:
   cluster-api-bootstrap-provider-kubeadm-reviewers:
+    - killianmuldoon
 
   # -----------------------------------------------------------
   # OWNER_ALIASES for bootstrap/kubeadm/internal/ignition
@@ -69,14 +71,14 @@ aliases:
 
   cluster-api-clusterctl-maintainers:
   cluster-api-clusterctl-reviewers:
+  - ykakarap
 
   # -----------------------------------------------------------
   # OWNER_ALIASES for test
   # -----------------------------------------------------------
 
   cluster-api-test-reviewers:
   cluster-api-test-maintainers:
-  - sbueringer
 
   # -----------------------------------------------------------
   # OWNER_ALIASES for test/framework
@@ -97,4 +99,5 @@ aliases:
   # -----------------------------------------------------------
 
   cluster-api-docs-reviewers:
+    - killianmuldoon
   cluster-api-docs-maintainers:

api/v1alpha4/conversion.go

@@ -38,8 +38,14 @@ func (src *Cluster) ConvertTo(dstRaw conversion.Hub) error {
 	}
 
 	if restored.Spec.Topology != nil {
+		if dst.Spec.Topology == nil {
+			dst.Spec.Topology = &clusterv1.Topology{}
+		}
 		dst.Spec.Topology.Variables = restored.Spec.Topology.Variables
 		if restored.Spec.Topology.Workers != nil {
+			if dst.Spec.Topology.Workers == nil {
+				dst.Spec.Topology.Workers = &clusterv1.WorkersTopology{}
+			}
 			for i := range restored.Spec.Topology.Workers.MachineDeployments {
 				dst.Spec.Topology.Workers.MachineDeployments[i].FailureDomain = restored.Spec.Topology.Workers.MachineDeployments[i].FailureDomain
 				dst.Spec.Topology.Workers.MachineDeployments[i].Variables = restored.Spec.Topology.Workers.MachineDeployments[i].Variables

bootstrap/kubeadm/api/v1alpha3/conversion.go

@@ -54,9 +54,15 @@ func (src *KubeadmConfig) ConvertTo(dstRaw conversion.Hub) error {
 
 	dst.Spec.Ignition = restored.Spec.Ignition
 	if restored.Spec.InitConfiguration != nil {
+		if dst.Spec.InitConfiguration == nil {
+			dst.Spec.InitConfiguration = &bootstrapv1.InitConfiguration{}
+		}
 		dst.Spec.InitConfiguration.Patches = restored.Spec.InitConfiguration.Patches
 	}
 	if restored.Spec.JoinConfiguration != nil {
+		if dst.Spec.JoinConfiguration == nil {
+			dst.Spec.JoinConfiguration = &bootstrapv1.JoinConfiguration{}
+		}
 		dst.Spec.JoinConfiguration.Patches = restored.Spec.JoinConfiguration.Patches
 	}
 
@@ -119,9 +125,15 @@ func (src *KubeadmConfigTemplate) ConvertTo(dstRaw conversion.Hub) error {
 
 	dst.Spec.Template.Spec.Ignition = restored.Spec.Template.Spec.Ignition
 	if restored.Spec.Template.Spec.InitConfiguration != nil {
+		if dst.Spec.Template.Spec.InitConfiguration == nil {
+			dst.Spec.Template.Spec.InitConfiguration = &bootstrapv1.InitConfiguration{}
+		}
 		dst.Spec.Template.Spec.InitConfiguration.Patches = restored.Spec.Template.Spec.InitConfiguration.Patches
 	}
 	if restored.Spec.Template.Spec.JoinConfiguration != nil {
+		if dst.Spec.Template.Spec.JoinConfiguration == nil {
+			dst.Spec.Template.Spec.JoinConfiguration = &bootstrapv1.JoinConfiguration{}
+		}
 		dst.Spec.Template.Spec.JoinConfiguration.Patches = restored.Spec.Template.Spec.JoinConfiguration.Patches
 	}
 

bootstrap/kubeadm/api/v1alpha4/conversion.go

@@ -39,9 +39,15 @@ func (src *KubeadmConfig) ConvertTo(dstRaw conversion.Hub) error {
 
 	dst.Spec.Ignition = restored.Spec.Ignition
 	if restored.Spec.InitConfiguration != nil {
+		if dst.Spec.InitConfiguration == nil {
+			dst.Spec.InitConfiguration = &bootstrapv1.InitConfiguration{}
+		}
 		dst.Spec.InitConfiguration.Patches = restored.Spec.InitConfiguration.Patches
 	}
 	if restored.Spec.JoinConfiguration != nil {
+		if dst.Spec.JoinConfiguration == nil {
+			dst.Spec.JoinConfiguration = &bootstrapv1.JoinConfiguration{}
+		}
 		dst.Spec.JoinConfiguration.Patches = restored.Spec.JoinConfiguration.Patches
 	}
 
@@ -85,9 +91,15 @@ func (src *KubeadmConfigTemplate) ConvertTo(dstRaw conversion.Hub) error {
 
 	dst.Spec.Template.Spec.Ignition = restored.Spec.Template.Spec.Ignition
 	if restored.Spec.Template.Spec.InitConfiguration != nil {
+		if dst.Spec.Template.Spec.InitConfiguration == nil {
+			dst.Spec.Template.Spec.InitConfiguration = &bootstrapv1.InitConfiguration{}
+		}
 		dst.Spec.Template.Spec.InitConfiguration.Patches = restored.Spec.Template.Spec.InitConfiguration.Patches
 	}
 	if restored.Spec.Template.Spec.JoinConfiguration != nil {
+		if dst.Spec.Template.Spec.JoinConfiguration == nil {
+			dst.Spec.Template.Spec.JoinConfiguration = &bootstrapv1.JoinConfiguration{}
+		}
 		dst.Spec.Template.Spec.JoinConfiguration.Patches = restored.Spec.Template.Spec.JoinConfiguration.Patches
 	}
 

bootstrap/kubeadm/config/manager/manager.yaml

@@ -41,3 +41,5 @@ spec:
       tolerations:
         - effect: NoSchedule
           key: node-role.kubernetes.io/master
+        - effect: NoSchedule
+          key: node-role.kubernetes.io/control-plane

cmd/clusterctl/client/cluster/assets/topology-test/new-clusterclass-and-cluster.yaml

@@ -1,3 +1,9 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: default
+spec: {}
+---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: ClusterClass
 metadata:

cmd/clusterctl/client/cluster/components.go

@@ -212,12 +212,18 @@ func (p *providerComponents) Delete(options DeleteOptions) error {
 
 		// Otherwise delete the object
 		log.V(5).Info("Deleting", logf.UnstructuredToValues(obj)...)
-		if err := cs.Delete(ctx, &obj); err != nil {
-			if apierrors.IsNotFound(err) {
-				// Tolerate IsNotFound error that might happen because we are not enforcing a deletion order
-				// that considers relation across objects (e.g. Deployments -> ReplicaSets -> Pods)
-				continue
+		deleteBackoff := newWriteBackoff()
+		if err := retryWithExponentialBackoff(deleteBackoff, func() error {
+			if err := cs.Delete(ctx, &obj); err != nil {
+				if apierrors.IsNotFound(err) {
+					// Tolerate IsNotFound error that might happen because we are not enforcing a deletion order
+					// that considers relation across objects (e.g. Deployments -> ReplicaSets -> Pods)
+					return nil
+				}
+				return err
 			}
+			return nil
+		}); err != nil {
 			errList = append(errList, errors.Wrapf(err, "Error deleting object %s, %s/%s", obj.GroupVersionKind(), obj.GetNamespace(), obj.GetName()))
 		}
 	}

cmd/clusterctl/client/cluster/proxy.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/pkg/errors"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -359,11 +358,13 @@ func listObjByGVK(c client.Client, groupVersion, kind string, options []client.L
 	objList.SetAPIVersion(groupVersion)
 	objList.SetKind(kind)
 
-	if err := c.List(ctx, objList, options...); err != nil {
-		if !apierrors.IsNotFound(err) {
-			return nil, errors.Wrapf(err, "failed to list objects for the %q GroupVersionKind", objList.GroupVersionKind())
-		}
+	resourceListBackoff := newReadBackoff()
+	if err := retryWithExponentialBackoff(resourceListBackoff, func() error {
+		return c.List(ctx, objList, options...)
+	}); err != nil {
+		return nil, errors.Wrapf(err, "failed to list objects for the %q GroupVersionKind", objList.GroupVersionKind())
 	}
+
 	return objList, nil
 }