From 8729cade98eb24c4e87aedbe32230e01430b3e8b Mon Sep 17 00:00:00 2001 From: RA489 Date: Mon, 8 Oct 2018 14:12:17 +0530 Subject: [PATCH] util/config` packages; filenames and methods should be updated to use new names --- cmd/kubeadm/app/cmd/config.go | 2 +- cmd/kubeadm/app/cmd/join.go | 2 +- cmd/kubeadm/app/cmd/phases/preflight.go | 2 +- cmd/kubeadm/app/util/config/BUILD | 8 ++++---- cmd/kubeadm/app/util/config/common.go | 2 +- .../util/config/{masterconfig.go => initconfiguration.go} | 0 .../{masterconfig_test.go => initconfiguration_test.go} | 0 .../util/config/{nodeconfig.go => joinconfiguration.go} | 4 ++-- .../{nodeconfig_test.go => joinconfiguration_test.go} | 8 ++++---- 9 files changed, 14 insertions(+), 14 deletions(-) rename cmd/kubeadm/app/util/config/{masterconfig.go => initconfiguration.go} (100%) rename cmd/kubeadm/app/util/config/{masterconfig_test.go => initconfiguration_test.go} (100%) rename cmd/kubeadm/app/util/config/{nodeconfig.go => joinconfiguration.go} (96%) rename cmd/kubeadm/app/util/config/{nodeconfig_test.go => joinconfiguration_test.go} (93%) diff --git a/cmd/kubeadm/app/cmd/config.go b/cmd/kubeadm/app/cmd/config.go index 9fc59c3283..6ce9d29e14 100644 --- a/cmd/kubeadm/app/cmd/config.go +++ b/cmd/kubeadm/app/cmd/config.go @@ -194,7 +194,7 @@ func getDefaultInitConfigBytes(kind string) ([]byte, error) { } func getDefaultNodeConfigBytes() ([]byte, error) { - internalcfg, err := configutil.NodeConfigFileAndDefaultsToInternalConfig("", &kubeadmapiv1beta1.JoinConfiguration{ + internalcfg, err := configutil.JoinConfigFileAndDefaultsToInternalConfig("", &kubeadmapiv1beta1.JoinConfiguration{ Token: sillyToken.Token.String(), DiscoveryTokenAPIServers: []string{"kube-apiserver:6443"}, DiscoveryTokenUnsafeSkipCAVerification: true, // TODO: DiscoveryTokenUnsafeSkipCAVerification: true needs to be set for validation to pass, but shouldn't be recommended as the default diff --git a/cmd/kubeadm/app/cmd/join.go b/cmd/kubeadm/app/cmd/join.go index e24d11b1ed..03233588e5 100644 --- a/cmd/kubeadm/app/cmd/join.go +++ b/cmd/kubeadm/app/cmd/join.go @@ -274,7 +274,7 @@ func NewJoin(cfgPath string, args []string, defaultcfg *kubeadmapiv1beta1.JoinCo glog.V(1).Infoln("[join] found advertiseAddress empty; using default interface's IP address as advertiseAddress") } - internalcfg, err := configutil.NodeConfigFileAndDefaultsToInternalConfig(cfgPath, defaultcfg) + internalcfg, err := configutil.JoinConfigFileAndDefaultsToInternalConfig(cfgPath, defaultcfg) if err != nil { return nil, err } diff --git a/cmd/kubeadm/app/cmd/phases/preflight.go b/cmd/kubeadm/app/cmd/phases/preflight.go index d1710e8e93..662499b8e3 100644 --- a/cmd/kubeadm/app/cmd/phases/preflight.go +++ b/cmd/kubeadm/app/cmd/phases/preflight.go @@ -128,7 +128,7 @@ func NewCmdPreFlightNode(cfgPath *string, ignorePreflightErrors *[]string) *cobr cfg := &kubeadmapiv1beta1.JoinConfiguration{} kubeadmscheme.Scheme.Default(cfg) - internalcfg, err := configutil.NodeConfigFileAndDefaultsToInternalConfig(*cfgPath, cfg) + internalcfg, err := configutil.JoinConfigFileAndDefaultsToInternalConfig(*cfgPath, cfg) kubeadmutil.CheckErr(err) err = configutil.VerifyAPIServerBindAddress(internalcfg.APIEndpoint.AdvertiseAddress) kubeadmutil.CheckErr(err) diff --git a/cmd/kubeadm/app/util/config/BUILD b/cmd/kubeadm/app/util/config/BUILD index 80e26e8f47..b16d3636c0 100644 --- a/cmd/kubeadm/app/util/config/BUILD +++ b/cmd/kubeadm/app/util/config/BUILD @@ -11,8 +11,8 @@ go_library( srcs = [ "cluster.go", "common.go", - "masterconfig.go", - "nodeconfig.go", + "initconfiguration.go", + "joinconfiguration.go", ], importpath = "k8s.io/kubernetes/cmd/kubeadm/app/util/config", deps = [ @@ -43,8 +43,8 @@ go_test( srcs = [ "cluster_test.go", "common_test.go", - "masterconfig_test.go", - "nodeconfig_test.go", + "initconfiguration_test.go", + "joinconfiguration_test.go", ], data = glob(["testdata/**"]), embed = [":go_default_library"], diff --git a/cmd/kubeadm/app/util/config/common.go b/cmd/kubeadm/app/util/config/common.go index 63a5ab5777..fd9cdc954d 100644 --- a/cmd/kubeadm/app/util/config/common.go +++ b/cmd/kubeadm/app/util/config/common.go @@ -51,7 +51,7 @@ func AnyConfigFileAndDefaultsToInternal(cfgPath string) (runtime.Object, error) return ConfigFileAndDefaultsToInternalConfig(cfgPath, &kubeadmapiv1beta1.InitConfiguration{}) } if kubeadmutil.GroupVersionKindsHasJoinConfiguration(gvks...) { - return NodeConfigFileAndDefaultsToInternalConfig(cfgPath, &kubeadmapiv1beta1.JoinConfiguration{}) + return JoinConfigFileAndDefaultsToInternalConfig(cfgPath, &kubeadmapiv1beta1.JoinConfiguration{}) } return nil, fmt.Errorf("didn't recognize types with GroupVersionKind: %v", gvks) } diff --git a/cmd/kubeadm/app/util/config/masterconfig.go b/cmd/kubeadm/app/util/config/initconfiguration.go similarity index 100% rename from cmd/kubeadm/app/util/config/masterconfig.go rename to cmd/kubeadm/app/util/config/initconfiguration.go diff --git a/cmd/kubeadm/app/util/config/masterconfig_test.go b/cmd/kubeadm/app/util/config/initconfiguration_test.go similarity index 100% rename from cmd/kubeadm/app/util/config/masterconfig_test.go rename to cmd/kubeadm/app/util/config/initconfiguration_test.go diff --git a/cmd/kubeadm/app/util/config/nodeconfig.go b/cmd/kubeadm/app/util/config/joinconfiguration.go similarity index 96% rename from cmd/kubeadm/app/util/config/nodeconfig.go rename to cmd/kubeadm/app/util/config/joinconfiguration.go index f10cf6fea6..b4b414d06a 100644 --- a/cmd/kubeadm/app/util/config/nodeconfig.go +++ b/cmd/kubeadm/app/util/config/joinconfiguration.go @@ -45,8 +45,8 @@ func SetJoinDynamicDefaults(cfg *kubeadmapi.JoinConfiguration) error { return nil } -// NodeConfigFileAndDefaultsToInternalConfig -func NodeConfigFileAndDefaultsToInternalConfig(cfgPath string, defaultversionedcfg *kubeadmapiv1beta1.JoinConfiguration) (*kubeadmapi.JoinConfiguration, error) { +// JoinConfigFileAndDefaultsToInternalConfig +func JoinConfigFileAndDefaultsToInternalConfig(cfgPath string, defaultversionedcfg *kubeadmapiv1beta1.JoinConfiguration) (*kubeadmapi.JoinConfiguration, error) { internalcfg := &kubeadmapi.JoinConfiguration{} if cfgPath != "" { diff --git a/cmd/kubeadm/app/util/config/nodeconfig_test.go b/cmd/kubeadm/app/util/config/joinconfiguration_test.go similarity index 93% rename from cmd/kubeadm/app/util/config/nodeconfig_test.go rename to cmd/kubeadm/app/util/config/joinconfiguration_test.go index 065a294785..5ce23dbff3 100644 --- a/cmd/kubeadm/app/util/config/nodeconfig_test.go +++ b/cmd/kubeadm/app/util/config/joinconfiguration_test.go @@ -37,13 +37,13 @@ const ( node_invalidYAML = "testdata/validation/invalid_nodecfg.yaml" ) -func TestNodeConfigFileAndDefaultsToInternalConfig(t *testing.T) { +func TestJoinConfigFileAndDefaultsToInternalConfig(t *testing.T) { var tests = []struct { name, in, out string groupVersion schema.GroupVersion expectedErr bool }{ - // These tests are reading one file, loading it using NodeConfigFileAndDefaultsToInternalConfig that all of kubeadm is using for unmarshal of our API types, + // These tests are reading one file, loading it using JoinConfigFileAndDefaultsToInternalConfig that all of kubeadm is using for unmarshal of our API types, // and then marshals the internal object to the expected groupVersion { // v1alpha3 -> internal name: "v1alpha3ToInternal", @@ -69,7 +69,7 @@ func TestNodeConfigFileAndDefaultsToInternalConfig(t *testing.T) { out: node_v1beta1YAML, groupVersion: kubeadmapiv1beta1.SchemeGroupVersion, }, - // These tests are reading one file that has only a subset of the fields populated, loading it using NodeConfigFileAndDefaultsToInternalConfig, + // These tests are reading one file that has only a subset of the fields populated, loading it using JoinConfigFileAndDefaultsToInternalConfig, // and then marshals the internal object to the expected groupVersion { // v1beta1 -> default -> validate -> internal -> v1beta1 name: "incompleteYAMLToDefaultedv1beta1", @@ -87,7 +87,7 @@ func TestNodeConfigFileAndDefaultsToInternalConfig(t *testing.T) { for _, rt := range tests { t.Run(rt.name, func(t2 *testing.T) { - internalcfg, err := NodeConfigFileAndDefaultsToInternalConfig(rt.in, &kubeadmapiv1beta1.JoinConfiguration{}) + internalcfg, err := JoinConfigFileAndDefaultsToInternalConfig(rt.in, &kubeadmapiv1beta1.JoinConfiguration{}) if err != nil { if rt.expectedErr { return