support centos bootstrapping (kubermatic#1105)

moadqassem · web-flow · commit fe856b902a68 · 2021-11-18T05:10:05.000+01:00
Signed-off-by: Moath Qasim &lt;moad.qassem@gmail.com&gt;

Signed-off-by: Moath Qasim &lt;moad.qassem@gmail.com&gt;
diff --git a/pkg/controller/machine/bootstrap.go b/pkg/controller/machine/bootstrap.go
@@ -116,14 +116,29 @@ func getOSMBootstrapUserDataForCloudInit(ctx context.Context, req plugin.UserDat
 		ServerURL:   req.Kubeconfig.Clusters[clusterName].Server,
 		MachineName: req.MachineSpec.Name,
 	}
-	bsScript, err := template.New("bootstrap-cloud-init").Parse(bootstrapBinContentTemplate)
-	if err != nil {
-		return "", fmt.Errorf("failed to parse bootstrapBinContentTemplate template: %v", err)
+
+	var (
+		bsScript *template.Template
+		err      error
+	)
+
+	switch pconfig.OperatingSystem {
+	case providerconfigtypes.OperatingSystemUbuntu:
+		bsScript, err = template.New("bootstrap-cloud-init").Parse(bootstrapAptBinContentTemplate)
+		if err != nil {
+			return "", fmt.Errorf("failed to parse bootstrapAptBinContentTemplate template: %v", err)
+		}
+	case providerconfigtypes.OperatingSystemCentOS:
+		bsScript, err = template.New("bootstrap-cloud-init").Parse(bootstrapYumBinContentTemplate)
+		if err != nil {
+			return "", fmt.Errorf("failed to parse bootstrapYumBinContentTemplate template: %v", err)
+		}
 	}
+
 	script := &bytes.Buffer{}
 	err = bsScript.Execute(script, data)
 	if err != nil {
-		return "", fmt.Errorf("failed to execute bootstrapBinContentTemplate template: %v", err)
+		return "", fmt.Errorf("failed to execute bootstrap script template: %v", err)
 	}
 	bsCloudInit, err := template.New("bootstrap-cloud-init").Parse(cloudInitTemplate)
 	if err != nil {
@@ -170,7 +185,7 @@ func useIgnition(p *providerconfigtypes.Config) bool {
 }
 
 const (
-	bootstrapBinContentTemplate = `#!/bin/bash
+	bootstrapAptBinContentTemplate = `#!/bin/bash
 set -xeuo pipefail
 apt update && apt install -y curl jq
 curl -s -k -v --header 'Authorization: Bearer {{ .Token }}'	{{ .ServerURL }}/api/v1/namespaces/cloud-init-settings/secrets/{{ .SecretName }} | jq '.data["cloud-config"]' -r| base64 -d > /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg
@@ -182,6 +197,19 @@ systemctl restart kubelet.service
 systemctl restart kubelet-healthcheck.service
 	`
 
+	bootstrapYumBinContentTemplate = `#!/bin/bash
+set -xeuo pipefail
+yum install epel-release -y
+yum install -y curl jq
+curl -s -k -v --header 'Authorization: Bearer {{ .Token }}'	{{ .ServerURL }}/api/v1/namespaces/cloud-init-settings/secrets/{{ .SecretName }} | jq '.data["cloud-config"]' -r| base64 -d > /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg
+cloud-init clean
+cloud-init --file /etc/cloud/cloud.cfg.d/{{ .SecretName }}.cfg init
+systemctl daemon-reload
+systemctl restart setup.service
+systemctl restart kubelet.service
+systemctl restart kubelet-healthcheck.service
+	`
+
 	bootstrapServiceContentTemplate = `[Install]
 WantedBy=multi-user.target
 
diff --git a/pkg/controller/machine/machine_controller.go b/pkg/controller/machine/machine_controller.go
@@ -35,6 +35,7 @@ import (
 	cloudprovidererrors "github.com/kubermatic/machine-controller/pkg/cloudprovider/errors"
 	"github.com/kubermatic/machine-controller/pkg/cloudprovider/instance"
 	cloudprovidertypes "github.com/kubermatic/machine-controller/pkg/cloudprovider/types"
+	"github.com/kubermatic/machine-controller/pkg/cloudprovider/util"
 	"github.com/kubermatic/machine-controller/pkg/containerruntime"
 	kuberneteshelper "github.com/kubermatic/machine-controller/pkg/kubernetes"
 	"github.com/kubermatic/machine-controller/pkg/node/eviction"
@@ -755,7 +756,7 @@ func (r *Reconciler) ensureInstanceExistsForMachine(
 
 				// It is important to check if the secret holding cloud-config exists
 				if err := r.client.Get(ctx,
-					types.NamespacedName{Name: cloudConfigSecretName, Namespace: "kube-system"},
+					types.NamespacedName{Name: cloudConfigSecretName, Namespace: util.CloudInitNamespace},
 					&corev1.Secret{}); err != nil {
 					klog.Errorf("Cloud init configurations for machine: %v is not ready yet", machine.Name)
 					return nil, err
