diff --git a/cmd/kubeadm/app/cmd/certs.go b/cmd/kubeadm/app/cmd/certs.go index 037b314edba..ae361528734 100644 --- a/cmd/kubeadm/app/cmd/certs.go +++ b/cmd/kubeadm/app/cmd/certs.go @@ -134,7 +134,7 @@ func (o *genCSRConfig) addFlagSet(flagSet *pflag.FlagSet) { func (o *genCSRConfig) load() (err error) { o.kubeadmConfig, err = configutil.LoadOrDefaultInitConfiguration( o.kubeadmConfigPath, - cmdutil.DefaultInitConfiguration(), + &kubeadmapiv1.InitConfiguration{}, &kubeadmapiv1.ClusterConfiguration{}, true, /* skipCRIDetect */ ) @@ -354,7 +354,7 @@ func getInternalCfg(cfgPath string, kubeconfigPath string, cfg kubeadmapiv1.Clus } // Read config from --config if provided. Otherwise, use the default configuration - return configutil.LoadOrDefaultInitConfiguration(cfgPath, cmdutil.DefaultInitConfiguration(), &cfg, true /* skipCRIDetect */) + return configutil.LoadOrDefaultInitConfiguration(cfgPath, &kubeadmapiv1.InitConfiguration{}, &cfg, true /* skipCRIDetect */) } // newCmdCertsExpiration creates a new `cert check-expiration` command. diff --git a/cmd/kubeadm/app/cmd/config.go b/cmd/kubeadm/app/cmd/config.go index d8e25b88e1f..8f01154ef0d 100644 --- a/cmd/kubeadm/app/cmd/config.go +++ b/cmd/kubeadm/app/cmd/config.go @@ -442,7 +442,7 @@ func newCmdConfigImagesList(out io.Writer, mockK8sVersion *string) *cobra.Comman // NewImagesList returns the underlying struct for the "kubeadm config images list" command func NewImagesList(cfgPath string, cfg *kubeadmapiv1old.ClusterConfiguration) (*ImagesList, error) { - initcfg, err := configutil.LoadOrDefaultInitConfiguration(cfgPath, cmdutil.DefaultInitConfiguration(), cfg, true /* skipCRIDetect */) + initcfg, err := configutil.LoadOrDefaultInitConfiguration(cfgPath, &kubeadmapiv1old.InitConfiguration{}, cfg, true /* skipCRIDetect */) if err != nil { return nil, errors.Wrap(err, "could not convert cfg to an internal cfg") } diff --git a/cmd/kubeadm/app/cmd/config_test.go b/cmd/kubeadm/app/cmd/config_test.go index 7cf01f19790..6ff0f00df8c 100644 --- a/cmd/kubeadm/app/cmd/config_test.go +++ b/cmd/kubeadm/app/cmd/config_test.go @@ -82,13 +82,8 @@ func TestImagesListRunWithCustomConfigPath(t *testing.T) { }, configContents: []byte(dedent.Dedent(fmt.Sprintf(` apiVersion: %s -kind: InitConfiguration -nodeRegistration: - criSocket: %s ---- -apiVersion: %[1]s kind: ClusterConfiguration -kubernetesVersion: %[3]s`, kubeadmapiv1.SchemeGroupVersion.String(), constants.UnknownCRISocket, constants.CurrentKubernetesVersion))), +kubernetesVersion: %s`, kubeadmapiv1.SchemeGroupVersion.String(), constants.CurrentKubernetesVersion))), }, { name: "use coredns", @@ -98,13 +93,8 @@ kubernetesVersion: %[3]s`, kubeadmapiv1.SchemeGroupVersion.String(), constants.U }, configContents: []byte(dedent.Dedent(fmt.Sprintf(` apiVersion: %s -kind: InitConfiguration -nodeRegistration: - criSocket: %s ---- -apiVersion: %[1]s kind: ClusterConfiguration -kubernetesVersion: %[3]s`, kubeadmapiv1.SchemeGroupVersion.String(), constants.UnknownCRISocket, constants.MinimumControlPlaneVersion))), +kubernetesVersion: %s`, kubeadmapiv1.SchemeGroupVersion.String(), constants.MinimumControlPlaneVersion))), }, } diff --git a/cmd/kubeadm/app/cmd/kubeconfig.go b/cmd/kubeadm/app/cmd/kubeconfig.go index bb323bf5225..c3e3e908320 100644 --- a/cmd/kubeadm/app/cmd/kubeconfig.go +++ b/cmd/kubeadm/app/cmd/kubeconfig.go @@ -65,7 +65,7 @@ func newCmdKubeConfigUtility(out io.Writer) *cobra.Command { // newCmdUserKubeConfig returns sub commands for kubeconfig phase func newCmdUserKubeConfig(out io.Writer) *cobra.Command { - initCfg := cmdutil.DefaultInitConfiguration() + initCfg := &kubeadmapiv1.InitConfiguration{} clusterCfg := &kubeadmapiv1.ClusterConfiguration{} var ( diff --git a/cmd/kubeadm/app/cmd/kubeconfig_test.go b/cmd/kubeadm/app/cmd/kubeconfig_test.go index 1f3c8fb639a..2b067d24ecb 100644 --- a/cmd/kubeadm/app/cmd/kubeconfig_test.go +++ b/cmd/kubeadm/app/cmd/kubeconfig_test.go @@ -45,9 +45,6 @@ func generateTestKubeadmConfig(dir, id, certDir, clusterName string) (string, er AdvertiseAddress: "1.2.3.4", BindPort: 1234, }, - NodeRegistration: kubeadmapiv1.NodeRegistrationOptions{ - CRISocket: kubeadmconstants.UnknownCRISocket, - }, } clusterCfg := kubeadmapiv1.ClusterConfiguration{ TypeMeta: metav1.TypeMeta{ diff --git a/cmd/kubeadm/app/cmd/phases/init/certs.go b/cmd/kubeadm/app/cmd/phases/init/certs.go index b499819dcf9..258af8b38f4 100644 --- a/cmd/kubeadm/app/cmd/phases/init/certs.go +++ b/cmd/kubeadm/app/cmd/phases/init/certs.go @@ -138,11 +138,12 @@ func getCertPhaseFlags(name string) []string { } func getSANDescription(certSpec *certsphase.KubeadmCert) string { - //Defaulted config we will use to get SAN certs - defaultConfig := cmdutil.DefaultInitConfiguration() - // GetAPIServerAltNames errors without an AdvertiseAddress; this is as good as any. - defaultConfig.LocalAPIEndpoint = kubeadmapiv1.APIEndpoint{ - AdvertiseAddress: "127.0.0.1", + // Defaulted config we will use to get SAN certs + defaultConfig := &kubeadmapiv1.InitConfiguration{ + LocalAPIEndpoint: kubeadmapiv1.APIEndpoint{ + // GetAPIServerAltNames errors without an AdvertiseAddress; this is as good as any. + AdvertiseAddress: "127.0.0.1", + }, } defaultInternalConfig := &kubeadmapi.InitConfiguration{} diff --git a/cmd/kubeadm/app/cmd/token.go b/cmd/kubeadm/app/cmd/token.go index e8a5355d482..0a6208e9148 100644 --- a/cmd/kubeadm/app/cmd/token.go +++ b/cmd/kubeadm/app/cmd/token.go @@ -90,7 +90,7 @@ func newCmdToken(out io.Writer, errW io.Writer) *cobra.Command { tokenCmd.PersistentFlags().BoolVar(&dryRun, options.DryRun, dryRun, "Whether to enable dry-run mode or not") - cfg := cmdutil.DefaultInitConfiguration() + cfg := &kubeadmapiv1.InitConfiguration{} // Default values for the cobra help text kubeadmscheme.Scheme.Default(cfg) diff --git a/cmd/kubeadm/app/cmd/token_test.go b/cmd/kubeadm/app/cmd/token_test.go index 5e3e31dbf77..71d75fee1a2 100644 --- a/cmd/kubeadm/app/cmd/token_test.go +++ b/cmd/kubeadm/app/cmd/token_test.go @@ -36,7 +36,6 @@ import ( outputapischeme "k8s.io/kubernetes/cmd/kubeadm/app/apis/output/scheme" outputapiv1alpha2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/output/v1alpha2" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/util/output" ) @@ -173,9 +172,6 @@ func TestRunCreateToken(t *testing.T) { Groups: tc.extraGroups, }, }, - NodeRegistration: kubeadmapiv1.NodeRegistrationOptions{ - CRISocket: constants.UnknownCRISocket, - }, } err = RunCreateToken(&buf, fakeClient, "", cfg, tc.printJoin, "", "") diff --git a/cmd/kubeadm/app/cmd/util/cmdutil.go b/cmd/kubeadm/app/cmd/util/cmdutil.go index 6ee8d2d6ae3..63e7b0ca178 100644 --- a/cmd/kubeadm/app/cmd/util/cmdutil.go +++ b/cmd/kubeadm/app/cmd/util/cmdutil.go @@ -31,7 +31,6 @@ import ( "k8s.io/client-go/tools/clientcmd" "k8s.io/klog/v2" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" @@ -103,17 +102,6 @@ func AddCRISocketFlag(flagSet *pflag.FlagSet, criSocket *string) { ) } -// DefaultInitConfiguration return default InitConfiguration. Avoid running the CRI auto-detection -// code as we don't need it. -func DefaultInitConfiguration() *kubeadmapiv1.InitConfiguration { - initCfg := &kubeadmapiv1.InitConfiguration{ - NodeRegistration: kubeadmapiv1.NodeRegistrationOptions{ - CRISocket: kubeadmconstants.UnknownCRISocket, // avoid CRI detection - }, - } - return initCfg -} - // InteractivelyConfirmAction asks the user whether they _really_ want to take the action. func InteractivelyConfirmAction(action, question string, r io.Reader) error { fmt.Printf("[%s] %s [y/N]: ", action, question) diff --git a/cmd/kubeadm/app/preflight/checks_test.go b/cmd/kubeadm/app/preflight/checks_test.go index 91c4bc77c78..8bbb9b395c1 100644 --- a/cmd/kubeadm/app/preflight/checks_test.go +++ b/cmd/kubeadm/app/preflight/checks_test.go @@ -1072,9 +1072,6 @@ func TestJoinIPCheck(t *testing.T) { t.Skip("not a privileged user") } internalcfg, err := configutil.DefaultedJoinConfiguration(&kubeadmapiv1.JoinConfiguration{ - NodeRegistration: kubeadmapiv1.NodeRegistrationOptions{ - CRISocket: constants.UnknownCRISocket, - }, Discovery: kubeadmapiv1.Discovery{ BootstrapToken: &kubeadmapiv1.BootstrapTokenDiscovery{ Token: configutil.PlaceholderToken.Token.String(), diff --git a/cmd/kubeadm/app/util/config/cluster_test.go b/cmd/kubeadm/app/util/config/cluster_test.go index 0fcd93963e0..9232aa5e0e5 100644 --- a/cmd/kubeadm/app/util/config/cluster_test.go +++ b/cmd/kubeadm/app/util/config/cluster_test.go @@ -49,9 +49,7 @@ var cfgFiles = map[string][]byte{ "InitConfiguration_v1beta3": []byte(fmt.Sprintf(` apiVersion: %s kind: InitConfiguration -nodeRegistration: - criSocket: %s -`, kubeadmapiv1.SchemeGroupVersion.String(), kubeadmconstants.UnknownCRISocket)), +`, kubeadmapiv1.SchemeGroupVersion.String())), "ClusterConfiguration_v1beta3": []byte(fmt.Sprintf(` apiVersion: %s kind: ClusterConfiguration diff --git a/cmd/kubeadm/app/util/config/initconfiguration_test.go b/cmd/kubeadm/app/util/config/initconfiguration_test.go index 44a6997ccb5..33d78089671 100644 --- a/cmd/kubeadm/app/util/config/initconfiguration_test.go +++ b/cmd/kubeadm/app/util/config/initconfiguration_test.go @@ -126,9 +126,6 @@ func TestDefaultTaintsMarshaling(t *testing.T) { APIVersion: kubeadmapiv1.SchemeGroupVersion.String(), Kind: constants.InitConfigurationKind, }, - NodeRegistration: kubeadmapiv1.NodeRegistrationOptions{ - CRISocket: constants.UnknownCRISocket, - }, }, expectedTaintCnt: 1, }, @@ -139,9 +136,6 @@ func TestDefaultTaintsMarshaling(t *testing.T) { APIVersion: kubeadmapiv1.SchemeGroupVersion.String(), Kind: constants.InitConfigurationKind, }, - NodeRegistration: kubeadmapiv1.NodeRegistrationOptions{ - CRISocket: constants.UnknownCRISocket, - }, }, expectedTaintCnt: 1, }, @@ -153,8 +147,7 @@ func TestDefaultTaintsMarshaling(t *testing.T) { Kind: constants.InitConfigurationKind, }, NodeRegistration: kubeadmapiv1.NodeRegistrationOptions{ - Taints: []v1.Taint{}, - CRISocket: constants.UnknownCRISocket, + Taints: []v1.Taint{}, }, }, expectedTaintCnt: 0, @@ -171,7 +164,6 @@ func TestDefaultTaintsMarshaling(t *testing.T) { {Key: "taint1"}, {Key: "taint2"}, }, - CRISocket: constants.UnknownCRISocket, }, }, expectedTaintCnt: 2,