Merge pull request #74428 from bart0sh/PR0063-kubeadm-remove-dead-code

kubeadm: remove dead code

cmd/kubeadm/app/cmd/init.go

@@ -487,17 +487,6 @@ func printJoinCommand(out io.Writer, adminKubeConfigPath, token, key string, ski
 	return initDoneTempl.Execute(out, ctx)
 }
 
-// getDirectoriesToUse returns the (in order) certificates, kubeconfig and Static Pod manifest directories, followed by a possible error
-// This behaves differently when dry-running vs the normal flow
-func getDirectoriesToUse(dryRun bool, dryRunDir string, defaultPkiDir string) (string, string, string, string, error) {
-	if dryRun {
-		// Use the same temp dir for all
-		return dryRunDir, dryRunDir, dryRunDir, dryRunDir, nil
-	}
-
-	return defaultPkiDir, kubeadmconstants.KubernetesDir, kubeadmconstants.GetStaticPodDirectory(), kubeadmconstants.KubeletRunDirectory, nil
-}
-
 // showJoinCommand prints the join command after all the phases in init have finished
 func showJoinCommand(i *initData, out io.Writer) error {
 	adminKubeConfigPath := i.KubeConfigPath()

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

@@ -63,9 +63,10 @@ func getControlPlaneJoinPhaseFlags() []string {
 // NewControlPlaneJoinPhase creates a kubeadm workflow phase that implements joining a machine as a control plane instance
 func NewControlPlaneJoinPhase() workflow.Phase {
 	return workflow.Phase{
-		Name:  "control-plane-join",
-		Short: "Joins a machine as a control plane instance",
-		Long:  cmdutil.MacroCommandLongDescription,
+		Name:    "control-plane-join",
+		Short:   "Joins a machine as a control plane instance",
+		Long:    cmdutil.MacroCommandLongDescription,
+		Example: controlPlaneJoinExample,
 		Phases: []workflow.Phase{
 			{
 				Name:           "all",

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

@@ -91,12 +91,12 @@ func newControlPlanePrepareManifestsSubphases() workflow.Phase {
 	return workflow.Phase{
 		Name:         "manifests",
 		Short:        "Generates the manifests for the new control plane components",
-		Run:          runControlPlaneSubphase,
+		Run:          runControlPlanePrepareManifestsSubphase,
 		InheritFlags: getControlPlanePreparePhaseFlags(), //NB. eventually in future we would like to break down this in sub phases for each component
 	}
 }
 
-func runControlPlaneSubphase(c workflow.RunData) error {
+func runControlPlanePrepareManifestsSubphase(c workflow.RunData) error {
 	data, ok := c.(controlPlanePrepareData)
 	if !ok {
 		return errors.New("control-plane-prepare phase invoked with an invalid data struct")
@@ -163,27 +163,3 @@ func runControlPlanePrepareKubeconfigPhaseLocal(c workflow.RunData) error {
 
 	return nil
 }
-
-func runControlPlanePrepareJoinSubphase(component string) func(c workflow.RunData) error {
-	return func(c workflow.RunData) error {
-		data, ok := c.(controlPlanePrepareData)
-		if !ok {
-			return errors.New("control-plane-prepare phase invoked with an invalid data struct")
-		}
-
-		// Skip if this is not a control plane
-		if data.Cfg().ControlPlane == nil {
-			return nil
-		}
-
-		cfg, err := data.InitCfg()
-		if err != nil {
-			return err
-		}
-
-		// Creates static pod manifests file for the control plane components to be deployed on this node
-		// Static pods will be created and managed by the kubelet as soon as it starts
-		fmt.Printf("[control-plane-prepare] Creating static Pod manifest for %q\n", component)
-		return controlplane.CreateStaticPodFiles(kubeadmconstants.GetStaticPodDirectory(), &cfg.ClusterConfiguration, &cfg.LocalAPIEndpoint, component)
-	}
-}

cmd/kubeadm/app/cmd/token_test.go

@@ -57,20 +57,6 @@ users:
   user:
     client-certificate-data:
     client-key-data:
-`
-	testConfigTokenCertAuthorityData = "certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFM01USXhOREUxTlRFek1Gb1hEVEkzTVRJeE1qRTFOVEV6TUZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTlZrCnNkT0NjRDBIOG9ycXZ5djBEZ09jZEpjRGc4aTJPNGt3QVpPOWZUanJGRHJqbDZlVXRtdlMyZ1lZd0c4TGhPV2gKb0lkZ3AvbVkrbVlDakliUUJtTmE2Ums1V2JremhJRzM1c1lseE9NVUJJR0xXMzN0RTh4SlR1RVd3V0NmZnpLcQpyaU1UT1A3REF3MUxuM2xUNlpJNGRNM09NOE1IUk9Wd3lRMDVpbWo5eUx5R1lYdTlvSncwdTVXWVpFYmpUL3VpCjJBZ2QwVDMrZGFFb044aVBJOTlVQkQxMzRkc2VGSEJEY3hHcmsvVGlQdHBpSC9IOGoxRWZaYzRzTGlONzJmL2YKYUpacTROSHFiT2F5UkpITCtJejFNTW1DRkN3cjdHOHVENWVvWWp2dEdZN2xLc1pBTlUwK3VlUnJsTitxTzhQWQpxaTZNMDFBcmV1UzFVVHFuTkM4Q0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFNbXo4Nm9LMmFLa0owMnlLSC9ZcTlzaDZZcDEKYmhLS25mMFJCaTA1clRacWdhTi9oTnROdmQxSzJxZGRLNzhIT2pVdkpNRGp3NERieXF0Wll2V01XVFRCQnQrSgpPMGNyWkg5NXlqUW42YzRlcU1FTjFhOUFKNXRlclNnTDVhREJsK0FMTWxaNVpxTzBUOUJDdTJtNXV3dGNWaFZuCnh6cGpTT3V5WVdOQ3A5bW9mV2VPUTljNXhEcElWeUlMUkFvNmZ5Z2c3N25TSDN4ckVmd0VKUHFMd1RPYVk1bTcKeEZWWWJoR3dxUGU5V0I5aTR5cnNrZUFBWlpUSzdVbklKMXFkRmlHQk9aZlRtaDhYQ3BOTHZZcFBLQW9hWWlsRwpjOW1acVhpWVlESTV6R1IxMElpc2FWNXJUY2hDenNQVWRhQzRVbnpTZG01cTdKYTAyb0poQlU1TE1FMD0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
-	testConfigTokenNoCluster         = `apiVersion: v1
-clusters:
-- cluster:
-    server:
-  name: prod
-contexts:
-- context:
-    namespace: default
-    user: default-service-account
-  name: default
-kind: Config
-preferences: {}
 `
 )
 

cmd/kubeadm/app/phases/controlplane/manifests_test.go

@@ -37,7 +37,6 @@ import (
 
 const (
 	testCertsDir = "/var/lib/certs"
-	etcdDataDir  = "/var/lib/etcd"
 )
 
 var cpVersion = kubeadmconstants.MinimumControlPlaneVersion.WithPreRelease("beta.2").String()

cmd/kubeadm/app/util/pkiutil/pki_helpers_test.go

@@ -29,24 +29,6 @@ import (
 	kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
 )
 
-// certificateRequest is an x509 certificate request in PEM encoded format
-// openssl req -new -key rsa2048.pem -sha256 -nodes -out x509certrequest.pem -subj "/C=US/CN=not-valid"
-const certificateRequest = `-----BEGIN CERTIFICATE REQUEST-----
-MIICZjCCAU4CAQAwITELMAkGA1UEBhMCVVMxEjAQBgNVBAMMCW5vdC12YWxpZDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMdoBxV0SbSS+7XrgVDF/P4x
-tqyun+DLxeRF5265ZOFRJDXCJgYH7wKlxlkEaHZQhnNmnqFiy96MHSKaiQmlkEm4
-EhlqTf38yEWx+t98A0CDbHsIPZ0/+MPCjb2kf+OfBXJJl908io0grs02jxN9lceL
-RFrKT6vaB+6i7LxbPQcOmjF7OUqWS6S2qSpShw2GY+mJz4HM7OFb9RcN4izh+GF6
-7hajYgt7pAFyWF1ua/H98Ysn4FVgIYk30rHCNBkQpJnna7EyGYuj08VuFa088W9g
-c/DCpL+VgBDwTel9tfeMxRAoLIPF9iJ8Ftr7dsRZ/Y/SnxfUJo2ed8y7dgIiLuEC
-AwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQCOjPB/4LKa2G7LarMMLAeNqvWF9SIG
-y2VGQoTn9D5blXMvnfzWSYgU6nBzf/E/32q26OwiCriuOPXfxM/cxEMOJ62u7b50
-OR52JFvQdONsCZaLgylGWppl0YeqylbTosHjsWJNlp+zjXcQHjCQ9OoLgfmrwYyD
-2MsYJR4p7JZ2ZN8FF1hgMUrDzypZ0NSBKAiQMU9TFhxgyk75RNDtmX+2K35zqLyr
-0otimyYwPCGPD2GHwNfvu1oP0A+/cT+rCPz6AlXhWEbz2JkLo6/muRfRl0QSRgHE
-Q3+eWlA1YdqEBwvp3NEQI9BtMnzxJVWA5dvYluMNllsV/q8s2IEEAFG9
------END CERTIFICATE REQUEST-----`
-
 func TestNewCertificateAuthority(t *testing.T) {
 	cert, key, err := NewCertificateAuthority(&certutil.Config{CommonName: "kubernetes"})
 

cmd/kubeadm/app/util/system/cgroup_validator_test.go

@@ -28,7 +28,6 @@ func TestValidateCgroupSubsystem(t *testing.T) {
 	}
 	cgroupSpec := []string{"system1", "system2"}
 	for desc, test := range map[string]struct {
-		cgroupSpec []string
 		subsystems []string
 		err        bool
 	}{