Merge pull request kubernetes#74751 from fabriziopandini/cleanup-join-phases-flags

cleanup-join-phases-flags

Author: k8s-ci-robot

cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go

@@ -44,10 +44,12 @@ func getControlPlaneJoinPhaseFlags() []string {
 		options.CfgPath,
 		options.ControlPlane,
 		options.NodeName,
+		options.FileDiscovery,
 		options.TokenDiscovery,
 		options.TokenDiscoveryCAHash,
 		options.TokenDiscoverySkipCAHash,
-		options.KubeconfigPath,
+		options.TLSBootstrapToken,
+		options.TokenStr,
 	}
 }
 

cmd/kubeadm/app/cmd/phases/join/controlplaneprepare.go

@@ -41,9 +41,11 @@ func NewControlPlanePreparePhase() workflow.Phase {
 		Short: "Prepares the machine for serving a control plane.",
 		Phases: []workflow.Phase{
 			{
-				Name:           "all",
-				Short:          "Prepares the machine for serving a control plane.",
-				InheritFlags:   getControlPlanePreparePhaseFlags(),
+				Name:  "all",
+				Short: "Prepares the machine for serving a control plane.",
+				InheritFlags: append(getControlPlanePreparePhaseFlags(),
+					options.CertificateKey,
+				),
 				RunAllSiblings: true,
 			},
 			newControlPlanePrepareDownloadCertsSubphase(),
@@ -61,10 +63,12 @@ func getControlPlanePreparePhaseFlags() []string {
 		options.CfgPath,
 		options.ControlPlane,
 		options.NodeName,
+		options.FileDiscovery,
 		options.TokenDiscovery,
 		options.TokenDiscoveryCAHash,
 		options.TokenDiscoverySkipCAHash,
-		options.CertificateKey,
+		options.TLSBootstrapToken,
+		options.TokenStr,
 	}
 }
 
@@ -74,10 +78,9 @@ func newControlPlanePrepareDownloadCertsSubphase() workflow.Phase {
 		Short: fmt.Sprintf("Download certificates from %s", kubeadmconstants.KubeadmCertsSecret),
 		Long:  cmdutil.MacroCommandLongDescription,
 		Run:   runControlPlanePrepareDownloadCertsPhaseLocal,
-		InheritFlags: []string{
-			options.CfgPath,
+		InheritFlags: append(getControlPlanePreparePhaseFlags(),
 			options.CertificateKey,
-		},
+		),
 	}
 }
 

cmd/kubeadm/app/cmd/phases/join/kubelet.go

@@ -64,10 +64,11 @@ func NewKubeletStartPhase() workflow.Phase {
 			options.CfgPath,
 			options.NodeCRISocket,
 			options.NodeName,
-			options.TLSBootstrapToken,
+			options.FileDiscovery,
 			options.TokenDiscovery,
 			options.TokenDiscoveryCAHash,
 			options.TokenDiscoverySkipCAHash,
+			options.TLSBootstrapToken,
 			options.TokenStr,
 		},
 	}

cmd/kubeadm/app/cmd/phases/join/preflight.go

@@ -73,6 +73,7 @@ func NewPreflightPhase() workflow.Phase {
 			options.TokenDiscovery,
 			options.TokenDiscoveryCAHash,
 			options.TokenDiscoverySkipCAHash,
+			options.CertificateKey,
 		},
 	}
 }