tmp v1.1.5

.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",

Makefile

@@ -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:

bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go

@@ -246,9 +246,10 @@ func (r *KubeadmConfigReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	// Status is ready means a config has been generated.
 	case config.Status.Ready:
 		if config.Spec.JoinConfiguration != nil && config.Spec.JoinConfiguration.Discovery.BootstrapToken != nil {
-			if !configOwner.IsInfrastructureReady() {
-				// If the BootstrapToken has been generated for a join and the infrastructure is not ready.
-				// This indicates the token in the join config has not been consumed and it may need a refresh.
+			if !configOwner.HasNodeRefs() {
+				// If the BootstrapToken has been generated for a join but the config owner has no nodeRefs,
+				// this indicates that the node has not yet joined and the token in the join config has not
+				// been consumed and it may need a refresh.
 				return r.refreshBootstrapToken(ctx, config, cluster)
 			}
 			if configOwner.IsMachinePool() {

bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_test.go

@@ -944,7 +944,7 @@ func TestBootstrapTokenTTLExtension(t *testing.T) {
 		tokenExpires[i] = item.Data[bootstrapapi.BootstrapTokenExpirationKey]
 	}
 
-	// ...until the infrastructure is marked "ready"
+	// ...the infrastructure is marked "ready", but token should still be refreshed...
 	patchHelper, err := patch.NewHelper(workerMachine, myclient)
 	g.Expect(err).ShouldNot(HaveOccurred())
 	workerMachine.Status.InfrastructureReady = true
@@ -957,6 +957,56 @@ func TestBootstrapTokenTTLExtension(t *testing.T) {
 
 	<-time.After(1 * time.Second)
 
+	for _, req := range []ctrl.Request{
+		{
+			NamespacedName: client.ObjectKey{
+				Namespace: metav1.NamespaceDefault,
+				Name:      "worker-join-cfg",
+			},
+		},
+		{
+			NamespacedName: client.ObjectKey{
+				Namespace: metav1.NamespaceDefault,
+				Name:      "control-plane-join-cfg",
+			},
+		},
+	} {
+		result, err := k.Reconcile(ctx, req)
+		g.Expect(err).NotTo(HaveOccurred())
+		g.Expect(result.RequeueAfter).NotTo(BeNumerically(">=", k.TokenTTL))
+	}
+
+	l = &corev1.SecretList{}
+	err = myclient.List(ctx, l, client.ListOption(client.InNamespace(metav1.NamespaceSystem)))
+	g.Expect(err).NotTo(HaveOccurred())
+	g.Expect(len(l.Items)).To(Equal(2))
+
+	for i, item := range l.Items {
+		g.Expect(bytes.Equal(tokenExpires[i], item.Data[bootstrapapi.BootstrapTokenExpirationKey])).To(BeFalse())
+		tokenExpires[i] = item.Data[bootstrapapi.BootstrapTokenExpirationKey]
+	}
+
+	// ...until the Nodes have actually joined the cluster and we get a nodeRef
+	patchHelper, err = patch.NewHelper(workerMachine, myclient)
+	g.Expect(err).ShouldNot(HaveOccurred())
+	workerMachine.Status.NodeRef = &corev1.ObjectReference{
+		APIVersion: "v1",
+		Kind:       "Node",
+		Name:       "worker-node",
+	}
+	g.Expect(patchHelper.Patch(ctx, workerMachine)).To(Succeed())
+
+	patchHelper, err = patch.NewHelper(controlPlaneJoinMachine, myclient)
+	g.Expect(err).ShouldNot(HaveOccurred())
+	controlPlaneJoinMachine.Status.NodeRef = &corev1.ObjectReference{
+		APIVersion: "v1",
+		Kind:       "Node",
+		Name:       "control-plane-node",
+	}
+	g.Expect(patchHelper.Patch(ctx, controlPlaneJoinMachine)).To(Succeed())
+
+	<-time.After(1 * time.Second)
+
 	for _, req := range []ctrl.Request{
 		{
 			NamespacedName: client.ObjectKey{
@@ -1068,14 +1118,46 @@ func TestBootstrapTokenRotationMachinePool(t *testing.T) {
 		tokenExpires[i] = item.Data[bootstrapapi.BootstrapTokenExpirationKey]
 	}
 
-	// ...until the infrastructure is marked "ready"
+	// ...the infrastructure is marked "ready", but token should still be refreshed...
 	patchHelper, err := patch.NewHelper(workerMachinePool, myclient)
 	g.Expect(err).ShouldNot(HaveOccurred())
 	workerMachinePool.Status.InfrastructureReady = true
 	g.Expect(patchHelper.Patch(ctx, workerMachinePool, patch.WithStatusObservedGeneration{})).To(Succeed())
 
 	<-time.After(1 * time.Second)
 
+	request = ctrl.Request{
+		NamespacedName: client.ObjectKey{
+			Namespace: metav1.NamespaceDefault,
+			Name:      "workerpool-join-cfg",
+		},
+	}
+	result, err = k.Reconcile(ctx, request)
+	g.Expect(err).NotTo(HaveOccurred())
+	g.Expect(result.RequeueAfter).NotTo(BeNumerically(">=", k.TokenTTL))
+
+	l = &corev1.SecretList{}
+	err = myclient.List(ctx, l, client.ListOption(client.InNamespace(metav1.NamespaceSystem)))
+	g.Expect(err).NotTo(HaveOccurred())
+	g.Expect(len(l.Items)).To(Equal(1))
+
+	for i, item := range l.Items {
+		g.Expect(bytes.Equal(tokenExpires[i], item.Data[bootstrapapi.BootstrapTokenExpirationKey])).To(BeFalse())
+		tokenExpires[i] = item.Data[bootstrapapi.BootstrapTokenExpirationKey]
+	}
+
+	// ...until all nodes have joined
+	workerMachinePool.Status.NodeRefs = []corev1.ObjectReference{
+		{
+			Kind:      "Node",
+			Namespace: metav1.NamespaceDefault,
+			Name:      "node-0",
+		},
+	}
+	g.Expect(patchHelper.Patch(ctx, workerMachinePool, patch.WithStatusObservedGeneration{})).To(Succeed())
+
+	<-time.After(1 * time.Second)
+
 	request = ctrl.Request{
 		NamespacedName: client.ObjectKey{
 			Namespace: metav1.NamespaceDefault,

bootstrap/util/configowner.go

@@ -47,6 +47,32 @@ func (co ConfigOwner) IsInfrastructureReady() bool {
 	return infrastructureReady
 }
 
+// HasNodeRefs checks if the config owner has nodeRefs. For a Machine this means
+// that it has a nodeRef. For a MachinePool it means that it has as many nodeRefs
+// as there are replicas.
+func (co ConfigOwner) HasNodeRefs() bool {
+	if co.IsMachinePool() {
+		numExpectedNodes, found, err := unstructured.NestedInt64(co.Object, "spec", "replicas")
+		if err != nil {
+			return false
+		}
+		// replicas default to 1 so this is what we should use if nothing is specified
+		if !found {
+			numExpectedNodes = 1
+		}
+		nodeRefs, _, err := unstructured.NestedSlice(co.Object, "status", "nodeRefs")
+		if err != nil {
+			return false
+		}
+		return len(nodeRefs) == int(numExpectedNodes)
+	}
+	nodeRef, _, err := unstructured.NestedMap(co.Object, "status", "nodeRef")
+	if err != nil {
+		return false
+	}
+	return len(nodeRef) > 0
+}
+
 // ClusterName extracts spec.clusterName from the config owner.
 func (co ConfigOwner) ClusterName() string {
 	clusterName, _, err := unstructured.NestedString(co.Object, "spec", "clusterName")