fix cert sans revision for kubeadm join

Signed-off-by: Piyush Kumar <k17piyush@gmail.com>
kairos-io · Dec 24, 2024 · a6b8451 · a6b8451
1 parent 562c289
commit a6b8451
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/stages/join.go b/stages/join.go
@@ -24,6 +24,9 @@ func GetJoinYipStagesV1Beta3(clusterCtx *domain.ClusterContext, kubeadmConfig do
 	utils.MutateClusterConfigBeta3Defaults(clusterCtx, &kubeadmConfig.ClusterConfiguration)
 	utils.MutateKubeletDefaults(clusterCtx, &kubeadmConfig.KubeletConfiguration)
 
+	clusterCtx.KubeletArgs = utils.RegenerateKubeletKubeadmArgsUsingBeta3Config(&kubeadmConfig.JoinConfiguration.NodeRegistration, clusterCtx.NodeRole)
+	clusterCtx.CertSansRevision = utils.GetCertSansRevision(kubeadmConfig.ClusterConfiguration.APIServer.CertSANs)
+
 	joinStg := []yip.Stage{
 		getKubeadmJoinConfigStage(getJoinNodeConfigurationBeta3(clusterCtx, kubeadmConfig.JoinConfiguration), clusterCtx.RootPath),
 		getKubeadmJoinStage(clusterCtx),
@@ -43,6 +46,9 @@ func GetJoinYipStagesV1Beta4(clusterCtx *domain.ClusterContext, kubeadmConfig do
 	utils.MutateClusterConfigBeta4Defaults(clusterCtx, &kubeadmConfig.ClusterConfiguration)
 	utils.MutateKubeletDefaults(clusterCtx, &kubeadmConfig.KubeletConfiguration)
 
+	clusterCtx.KubeletArgs = utils.RegenerateKubeletKubeadmArgsUsingBeta4Config(&kubeadmConfig.JoinConfiguration.NodeRegistration, clusterCtx.NodeRole)
+	clusterCtx.CertSansRevision = utils.GetCertSansRevision(kubeadmConfig.ClusterConfiguration.APIServer.CertSANs)
+
 	joinStg := []yip.Stage{
 		getKubeadmJoinConfigStage(getJoinNodeConfigurationBeta4(clusterCtx, kubeadmConfig.JoinConfiguration), clusterCtx.RootPath),
 		getKubeadmJoinStage(clusterCtx),

diff --git a/utils/kubelet.go b/utils/kubelet.go
@@ -18,11 +18,11 @@ import (
 )
 
 type kubeletFlagsOpts struct {
-	name                     string
-	pauseImage               string
-	criSocket                string
-	taints                   []v1.Taint
-	kubeletExtraArgs         map[string]string
+	name             string
+	criSocket        string
+	taints           []v1.Taint
+	kubeletExtraArgs map[string]string
+
 	registerTaintsUsingFlags bool
 }
 
@@ -72,10 +72,6 @@ func buildKubeletArgMapCommon(opts kubeletFlagsOpts) map[string]string {
 		kubeletFlags["container-runtime-endpoint"] = opts.criSocket
 	}
 
-	if opts.pauseImage != "" {
-		kubeletFlags["pod-infra-container-image"] = opts.pauseImage
-	}
-
 	if opts.registerTaintsUsingFlags && opts.taints != nil && len(opts.taints) > 0 {
 		var taintStrs []string
 		for _, taint := range opts.taints {