Merge pull request #123 from canonical/KU-3797/enable-addons-on-joining-control-planes

chore: run addon enabling script on joining control plane nodes

Author: rapour

controllers/cloudinit/controlplane_join.go

@@ -49,6 +49,8 @@ type ControlPlaneJoinInput struct {
 	ContainerdNoProxy string
 	// IPinIP defines whether Calico will use IPinIP mode for cluster networking.
 	IPinIP bool
+	// Addons is the list of addons to enable.
+	Addons []string
 	// JoinNodeIPs is the IP addresses of the nodes to join.
 	JoinNodeIPs []string
 	// Confinement specifies a classic or strict deployment of microk8s snap.
@@ -94,6 +96,12 @@ func NewJoinControlPlane(input *ControlPlaneJoinInput) (*CloudConfig, error) {
 		endpointType = "IP"
 	}
 
+	// quote addons to add to the command-line later
+	addons := make([]string, 0, len(input.Addons))
+	for _, addon := range input.Addons {
+		addons = append(addons, fmt.Sprintf("%q", addon))
+	}
+
 	// figure out snap channel from KubernetesVersion
 	kubernetesVersion, err := version.ParseSemantic(input.KubernetesVersion)
 	if err != nil {
@@ -152,6 +160,13 @@ func NewJoinControlPlane(input *ControlPlaneJoinInput) (*CloudConfig, error) {
 		scriptPath(configureAPIServerScript),
 		fmt.Sprintf("microk8s add-node --token-ttl %v --token %q", input.TokenTTL, input.Token),
 	)
+
+	if len(addons) > 0 {
+		cloudConfig.RunCommands = append(cloudConfig.RunCommands,
+			fmt.Sprintf("%s %s", scriptPath(microk8sEnableScript), strings.Join(addons, " ")),
+		)
+	}
+
 	cloudConfig.RunCommands = append(cloudConfig.RunCommands, input.PostRunCommands...)
 
 	return cloudConfig, nil

controllers/cloudinit/controlplane_join_test.go

@@ -74,4 +74,56 @@ func TestControlPlaneJoin(t *testing.T) {
 		_, err = cloudinit.GenerateCloudConfig(cloudConfig)
 		g.Expect(err).ToNot(HaveOccurred())
 	})
+
+	t.Run("WithAddons", func(t *testing.T) {
+		g := NewWithT(t)
+
+		authToken := "capi-auth-token"
+		cloudConfig, err := cloudinit.NewJoinControlPlane(&cloudinit.ControlPlaneJoinInput{
+			AuthToken:            authToken,
+			ControlPlaneEndpoint: "k8s.my-domain.com",
+			KubernetesVersion:    "v1.25.2",
+			ClusterAgentPort:     "30000",
+			DqlitePort:           "2379",
+			IPinIP:               true,
+			DisableDefaultCNI:    true,
+			Token:                strings.Repeat("a", 32),
+			TokenTTL:             10000,
+			Addons:               []string{"cis-hardening"},
+			JoinNodeIPs:          []string{"10.0.3.39", "10.0.3.40", "10.0.3.41"},
+		})
+		g.Expect(err).NotTo(HaveOccurred())
+
+		g.Expect(cloudConfig.RunCommands).To(Equal([]string{
+			`set -x`,
+			`/capi-scripts/00-configure-snapstore-http-proxy.sh "" ""`,
+			`/capi-scripts/00-configure-snapstore-proxy.sh "http" "" ""`,
+			`/capi-scripts/00-disable-host-services.sh`,
+			`/capi-scripts/00-install-microk8s.sh "--channel 1.25 --classic" true`,
+			`/capi-scripts/10-configure-containerd-proxy.sh "" "" ""`,
+			`/capi-scripts/10-configure-kubelet.sh`,
+			`/capi-scripts/50-wait-apiserver.sh`,
+			`/capi-scripts/10-configure-calico-ipip.sh true`,
+			`/capi-scripts/10-configure-cluster-agent-port.sh "30000"`,
+			`/capi-scripts/10-configure-dqlite-port.sh "2379"`,
+			`/capi-scripts/50-wait-apiserver.sh`,
+			`/capi-scripts/10-configure-cert-for-lb.sh "DNS" "k8s.my-domain.com"`,
+			`/capi-scripts/20-microk8s-join.sh no "10.0.3.39:30000/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "10.0.3.40:30000/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "10.0.3.41:30000/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"`,
+			`/capi-scripts/10-configure-apiserver.sh`,
+			`microk8s add-node --token-ttl 10000 --token "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"`,
+			`/capi-scripts/20-microk8s-enable.sh "cis-hardening"`,
+		}))
+
+		g.Expect(cloudConfig.WriteFiles).To(ContainElements(
+			cloudinit.File{
+				Content:     authToken,
+				Path:        cloudinit.CAPIAuthTokenPath,
+				Permissions: "0600",
+				Owner:       "root:root",
+			},
+		))
+
+		_, err = cloudinit.GenerateCloudConfig(cloudConfig)
+		g.Expect(err).ToNot(HaveOccurred())
+	})
 }

controllers/microk8sconfig_controller.go

@@ -430,6 +430,7 @@ func (r *MicroK8sConfigReconciler) handleJoiningControlPlaneNode(ctx context.Con
 		ClusterAgentPort:     portOfNodeToConnectTo,
 		DqlitePort:           portOfDqlite,
 		IPinIP:               microk8sConfig.Spec.InitConfiguration.IPinIP,
+		Addons:               microk8sConfig.Spec.InitConfiguration.Addons,
 		ContainerdHTTPProxy:  microk8sConfig.Spec.InitConfiguration.HTTPProxy,
 		ContainerdHTTPSProxy: microk8sConfig.Spec.InitConfiguration.HTTPSProxy,
 		ContainerdNoProxy:    microk8sConfig.Spec.InitConfiguration.NoProxy,