Merge pull request #6810 from xichengliudui/update-go-const-part6

Using const() defines constants together (part:4)
kubernetes · Apr 24, 2019 · bea86cb · bea86cb
2 parents e497f33 + c02802f
commit bea86cb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go
@@ -440,13 +440,15 @@ func (b *KubeletBuilder) addContainerizedMounter(c *fi.ModelBuilderContext) erro
 	return nil
 }
 
-const RoleLabelName15 = "kubernetes.io/role"
-const RoleLabelName16 = "kubernetes.io/role"
-const RoleMasterLabelValue15 = "master"
-const RoleNodeLabelValue15 = "node"
+const (
+	RoleLabelName15        = "kubernetes.io/role"
+	RoleLabelName16        = "kubernetes.io/role"
+	RoleMasterLabelValue15 = "master"
+	RoleNodeLabelValue15   = "node"
 
-const RoleLabelMaster16 = "node-role.kubernetes.io/master"
-const RoleLabelNode16 = "node-role.kubernetes.io/node"
+	RoleLabelMaster16 = "node-role.kubernetes.io/master"
+	RoleLabelNode16   = "node-role.kubernetes.io/node"
+)
 
 // NodeLabels are defined in the InstanceGroup, but set flags on the kubelet config.
 // We have a conflict here: on the one hand we want an easy to use abstract specification

diff --git a/pkg/model/alimodel/api_loadbalancer.go b/pkg/model/alimodel/api_loadbalancer.go
@@ -28,8 +28,10 @@ import (
 	"k8s.io/kops/upup/pkg/fi/fitasks"
 )
 
-const LoadBalancerListenerStatus = "running"
-const LoadBalancerListenerBandwidth = -1
+const (
+	LoadBalancerListenerStatus    = "running"
+	LoadBalancerListenerBandwidth = -1
+)
 
 // APILoadBalancerModelBuilder builds a LoadBalancer for accessing the API
 type APILoadBalancerModelBuilder struct {

diff --git a/pkg/model/alimodel/external_access.go b/pkg/model/alimodel/external_access.go
@@ -25,8 +25,10 @@ import (
 	"k8s.io/kops/upup/pkg/fi/cloudup/alitasks"
 )
 
-const IpProtocolTCP = "tcp"
-const IpProtocolUDP = "udp"
+const (
+	IpProtocolTCP = "tcp"
+	IpProtocolUDP = "udp"
+)
 
 // ExternalAccessModelBuilder configures security group rules for external access
 // (SSHAccess, KubernetesAPIAccess)