github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #72884 from rojkov/minor-cleanups 

kubeadm: reduce visibility of funcs and vars to the code they are relevant to
pull/564/head
Kubernetes Prow Robot 2019-01-14 06:46:59 -08:00 committed by GitHub
parent 35bd2a5e88 8c87ef51b8
commit 3ed638b233
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kubeadm/app/cmd/upgrade/apply.go
View File

@ -114,7 +114,7 @@ func NewCmdApply(apf *applyPlanFlags) *cobra.Command {
err = SetImplicitFlags(flags) err = SetImplicitFlags(flags)
kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(err)
err = RunApply(flags) err = runApply(flags)
kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(err)
}, },
} }
@ -132,7 +132,7 @@ func NewCmdApply(apf *applyPlanFlags) *cobra.Command {
return cmd return cmd
} }
// RunApply takes care of the actual upgrade functionality // runApply takes care of the actual upgrade functionality
// It does the following things: // It does the following things:
// - Checks if the cluster is healthy // - Checks if the cluster is healthy
// - Gets the configuration from the kubeadm-config ConfigMap in the cluster // - Gets the configuration from the kubeadm-config ConfigMap in the cluster
@ -144,7 +144,7 @@ func NewCmdApply(apf *applyPlanFlags) *cobra.Command {
// - Creating the RBAC rules for the bootstrap tokens and the cluster-info ConfigMap // - Creating the RBAC rules for the bootstrap tokens and the cluster-info ConfigMap
// - Applying new kube-dns and kube-proxy manifests // - Applying new kube-dns and kube-proxy manifests
// - Uploads the newly used configuration to the cluster ConfigMap // - Uploads the newly used configuration to the cluster ConfigMap
func RunApply(flags *applyFlags) error { func runApply(flags *applyFlags) error {
// Start with the basics, verify that the cluster is healthy and get the configuration from the cluster (using the ConfigMap) // Start with the basics, verify that the cluster is healthy and get the configuration from the cluster (using the ConfigMap)
klog.V(1).Infof("[upgrade/apply] verifying health of cluster") klog.V(1).Infof("[upgrade/apply] verifying health of cluster")

6
cmd/kubeadm/app/cmd/upgrade/plan.go
View File

@ -75,7 +75,7 @@ func NewCmdPlan(apf *applyPlanFlags) *cobra.Command {
flags.newK8sVersionStr = args[0] flags.newK8sVersionStr = args[0]
} }
err = RunPlan(flags) err = runPlan(flags)
kubeadmutil.CheckErr(err) kubeadmutil.CheckErr(err)
}, },
} }
@ -85,8 +85,8 @@ func NewCmdPlan(apf *applyPlanFlags) *cobra.Command {
return cmd return cmd
} }
// RunPlan takes care of outputting available versions to upgrade to for the user // runPlan takes care of outputting available versions to upgrade to for the user
func RunPlan(flags *planFlags) error { func runPlan(flags *planFlags) error {
// Start with the basics, verify that the cluster is healthy, build a client and a versionGetter. Never dry-run when planning. // Start with the basics, verify that the cluster is healthy, build a client and a versionGetter. Never dry-run when planning.
klog.V(1).Infof("[upgrade/plan] verifying health of cluster") klog.V(1).Infof("[upgrade/plan] verifying health of cluster")
klog.V(1).Infof("[upgrade/plan] retrieving configuration from cluster") klog.V(1).Infof("[upgrade/plan] retrieving configuration from cluster")

6
cmd/kubeadm/app/util/config/initconfiguration.go
View File

@ -214,8 +214,7 @@ func BytesToInternalConfig(b []byte) (*kubeadmapi.InitConfiguration, error) {
// Try to get the registration for the ComponentConfig based on the kind // Try to get the registration for the ComponentConfig based on the kind
regKind := componentconfigs.RegistrationKind(gvk.Kind) regKind := componentconfigs.RegistrationKind(gvk.Kind)
registration, found := componentconfigs.Known[regKind] if registration, found := componentconfigs.Known[regKind]; found {
if found {
// Unmarshal the bytes from the YAML document into a runtime.Object containing the ComponentConfiguration struct // Unmarshal the bytes from the YAML document into a runtime.Object containing the ComponentConfiguration struct
obj, err := registration.Unmarshal(fileContent) obj, err := registration.Unmarshal(fileContent)
if err != nil { if err != nil {
@ -269,8 +268,7 @@ func BytesToInternalConfig(b []byte) (*kubeadmapi.InitConfiguration, error) {
// Save the loaded ComponentConfig objects in the initcfg object // Save the loaded ComponentConfig objects in the initcfg object
for kind, obj := range decodedComponentConfigObjects { for kind, obj := range decodedComponentConfigObjects {
registration, found := componentconfigs.Known[kind] if registration, found := componentconfigs.Known[kind]; found {
if found {
if ok := registration.SetToInternalConfig(obj, &initcfg.ClusterConfiguration); !ok { if ok := registration.SetToInternalConfig(obj, &initcfg.ClusterConfiguration); !ok {
return nil, errors.Errorf("couldn't save componentconfig value for kind %q", string(kind)) return nil, errors.Errorf("couldn't save componentconfig value for kind %q", string(kind))
} }