From a19fb935e44d4477898405262d98a996487da200 Mon Sep 17 00:00:00 2001 From: tanjunchen <2799194073@qq.com> Date: Tue, 29 Oct 2019 14:06:12 +0800 Subject: [PATCH] fix-up static-check --- nodeup/pkg/model/cloudconfig.go | 10 +++++----- nodeup/pkg/model/kube_apiserver.go | 2 +- nodeup/pkg/model/kube_proxy.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nodeup/pkg/model/cloudconfig.go b/nodeup/pkg/model/cloudconfig.go index ca718799c9..9bb762aa4b 100644 --- a/nodeup/pkg/model/cloudconfig.go +++ b/nodeup/pkg/model/cloudconfig.go @@ -76,7 +76,7 @@ func (b *CloudConfigBuilder) Build(c *fi.ModelBuilderContext) error { lines = append(lines, "ElbSecurityGroup = "+*cloudConfig.ElbSecurityGroup) } case "vsphere": - vm_uuid, err := getVMUUID(b.Cluster.Spec.KubernetesVersion) + VMUUID, err := getVMUUID(b.Cluster.Spec.KubernetesVersion) if err != nil { return err } @@ -99,8 +99,8 @@ func (b *CloudConfigBuilder) Build(c *fi.ModelBuilderContext) error { if cloudConfig.VSphereDatastore != nil { lines = append(lines, "datastore = "+*cloudConfig.VSphereDatastore) } - if vm_uuid != "" { - lines = append(lines, "vm-uuid = "+strings.Trim(vm_uuid, "\n")) + if VMUUID != "" { + lines = append(lines, "vm-uuid = "+strings.Trim(VMUUID, "\n")) } // Disk Config for vSphere CloudProvider // We need this to support Kubernetes vSphere CloudProvider < v1.5.3 @@ -198,11 +198,11 @@ func getVMUUID(kubernetesVersion string) (string, error) { defer try.CloseFile(file) - vm_uuid, err := bufio.NewReader(file).ReadString('\n') + VMUUID, err := bufio.NewReader(file).ReadString('\n') if err != nil { return "", err } - return vm_uuid, err + return VMUUID, err } return "", err diff --git a/nodeup/pkg/model/kube_apiserver.go b/nodeup/pkg/model/kube_apiserver.go index 8a691096a7..df7c12b4f6 100644 --- a/nodeup/pkg/model/kube_apiserver.go +++ b/nodeup/pkg/model/kube_apiserver.go @@ -503,7 +503,7 @@ func (b *KubeAPIServerBuilder) buildAnnotations() map[string]string { annotations := make(map[string]string) if b.Cluster.Spec.API != nil { - if b.Cluster.Spec.API.LoadBalancer == nil || b.Cluster.Spec.API.LoadBalancer.UseForInternalApi != true { + if b.Cluster.Spec.API.LoadBalancer == nil || !b.Cluster.Spec.API.LoadBalancer.UseForInternalApi { annotations["dns.alpha.kubernetes.io/internal"] = b.Cluster.Spec.MasterInternalName } diff --git a/nodeup/pkg/model/kube_proxy.go b/nodeup/pkg/model/kube_proxy.go index 1b8b06461a..faae7e95f1 100644 --- a/nodeup/pkg/model/kube_proxy.go +++ b/nodeup/pkg/model/kube_proxy.go @@ -44,7 +44,7 @@ var _ fi.ModelBuilder = &KubeAPIServerBuilder{} // @TODO we should probably change this to a daemonset in the future and follow the kubeadm path func (b *KubeProxyBuilder) Build(c *fi.ModelBuilderContext) error { - if b.Cluster.Spec.KubeProxy.Enabled != nil && *b.Cluster.Spec.KubeProxy.Enabled == false { + if b.Cluster.Spec.KubeProxy.Enabled != nil && !*b.Cluster.Spec.KubeProxy.Enabled { klog.V(2).Infof("Kube-proxy is disabled, will not create configuration for it.") return nil }