Add join token to SANs (#47)

canonical · Aug 28, 2024 · b532314 · b532314
1 parent f9d6a96
commit b532314
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/bootstrap/controllers/ck8sconfig_controller.go b/bootstrap/controllers/ck8sconfig_controller.go
@@ -232,9 +232,15 @@ func (r *CK8sConfigReconciler) joinControlplane(ctx context.Context, scope *Scop
 		return fmt.Errorf("failed to request join token: %w", err)
 	}
 
+	controlPlaneConfig := scope.Config.Spec.ControlPlaneConfig
+	// Adding the join token name to the extra SANs is required because the token name
+	// and kubelet name diverge in the CAPI context.
+	// See https://github.com/canonical/k8s-snap/pull/629 for more details.
+	controlPlaneConfig.ExtraSANs = append(controlPlaneConfig.ExtraSANs, scope.Config.Name)
+
 	configStruct := ck8s.GenerateJoinControlPlaneConfig(ck8s.JoinControlPlaneConfig{
 		ControlPlaneEndpoint: scope.Cluster.Spec.ControlPlaneEndpoint.Host,
-		ControlPlaneConfig:   scope.Config.Spec.ControlPlaneConfig,
+		ControlPlaneConfig:   controlPlaneConfig,
 	})
 	joinConfig, err := kubeyaml.Marshal(configStruct)
 	if err != nil {