From f54856952fe7b39df273a4e21af8be7ddc06b825 Mon Sep 17 00:00:00 2001 From: yanghaichao12 Date: Thu, 15 Aug 2019 17:38:08 +0800 Subject: [PATCH] remove defaultedInternalConfig fromr kubeadm remove defaultedInternalConfig from kubeadm --- cmd/kubeadm/app/util/config/initconfiguration.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/cmd/kubeadm/app/util/config/initconfiguration.go b/cmd/kubeadm/app/util/config/initconfiguration.go index 57c2549f6a4..bd2a8e02491 100644 --- a/cmd/kubeadm/app/util/config/initconfiguration.go +++ b/cmd/kubeadm/app/util/config/initconfiguration.go @@ -315,18 +315,6 @@ func documentMapToInitConfiguration(gvkmap map[schema.GroupVersionKind][]byte, a return initcfg, nil } -func defaultedInternalConfig() *kubeadmapi.ClusterConfiguration { - externalcfg := &kubeadmapiv1beta2.ClusterConfiguration{} - internalcfg := &kubeadmapi.ClusterConfiguration{} - - kubeadmscheme.Scheme.Default(externalcfg) - kubeadmscheme.Scheme.Convert(externalcfg, internalcfg, nil) - - // Default the embedded ComponentConfig structs - componentconfigs.Known.Default(internalcfg) - return internalcfg -} - // MarshalInitConfigurationToBytes marshals the internal InitConfiguration object to bytes. It writes the embedded // ClusterConfiguration object with ComponentConfigs out as separate YAML documents func MarshalInitConfigurationToBytes(cfg *kubeadmapi.InitConfiguration, gv schema.GroupVersion) ([]byte, error) {