mirror of https://github.com/kubernetes/kops.git
Merge pull request #8229 from tanjunchen/staticcheck-001
pkg/apis/ pkg/commands/ pkg/model/ staticcheck
This commit is contained in:
commit
0e0043784f
|
@ -32,7 +32,7 @@ func CreateClusterConfig(clientset simple.Clientset, cluster *api.Cluster, group
|
|||
return fmt.Errorf("InstanceGroup #%d did not have a Name", i+1)
|
||||
}
|
||||
if names[ns.ObjectMeta.Name] {
|
||||
return fmt.Errorf("Duplicate InstanceGroup Name found: %q", ns.ObjectMeta.Name)
|
||||
return fmt.Errorf("duplicate InstanceGroup Name found: %q", ns.ObjectMeta.Name)
|
||||
}
|
||||
names[ns.ObjectMeta.Name] = true
|
||||
}
|
||||
|
|
|
@ -77,7 +77,7 @@ func ValidateInstanceGroup(g *kops.InstanceGroup) error {
|
|||
|
||||
if g.IsMaster() {
|
||||
if len(g.Spec.Subnets) == 0 {
|
||||
return fmt.Errorf("Master InstanceGroup %s did not specify any Subnets", g.ObjectMeta.Name)
|
||||
return fmt.Errorf("master InstanceGroup %s did not specify any Subnets", g.ObjectMeta.Name)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -218,7 +218,7 @@ func CrossValidateInstanceGroup(g *kops.InstanceGroup, cluster *kops.Cluster, st
|
|||
for i := range cluster.Spec.Subnets {
|
||||
s := &cluster.Spec.Subnets[i]
|
||||
if clusterSubnets[s.Name] != nil {
|
||||
return fmt.Errorf("Subnets contained a duplicate value: %v", s.Name)
|
||||
return fmt.Errorf("subnets contained a duplicate value: %v", s.Name)
|
||||
}
|
||||
clusterSubnets[s.Name] = s
|
||||
}
|
||||
|
@ -232,7 +232,7 @@ func CrossValidateInstanceGroup(g *kops.InstanceGroup, cluster *kops.Cluster, st
|
|||
|
||||
k8sVersion, err := util.ParseKubernetesVersion(cluster.Spec.KubernetesVersion)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Unable to determine kubernetes version from %q", cluster.Spec.KubernetesVersion)
|
||||
return fmt.Errorf("unable to determine kubernetes version from %q", cluster.Spec.KubernetesVersion)
|
||||
}
|
||||
|
||||
allErrs := field.ErrorList{}
|
||||
|
|
|
@ -384,7 +384,7 @@ func ValidateEtcdVersionForCalicoV3(e *kops.EtcdClusterSpec, majorVersion string
|
|||
}
|
||||
sem, err := semver.Parse(strings.TrimPrefix(version, "v"))
|
||||
if err != nil {
|
||||
allErrs = append(allErrs, field.InternalError(fldPath.Child("MajorVersion"), fmt.Errorf("Failed to parse Etcd version to check compatibility: %s", err)))
|
||||
allErrs = append(allErrs, field.InternalError(fldPath.Child("MajorVersion"), fmt.Errorf("failed to parse Etcd version to check compatibility: %s", err)))
|
||||
}
|
||||
|
||||
if sem.Major != 3 {
|
||||
|
|
|
@ -64,7 +64,7 @@ func (s *CloudDiscoveryStatusStore) GetApiIngressStatus(cluster *kops.Cluster) (
|
|||
if lb != nil {
|
||||
lbDnsName := aws.StringValue(lb.DNSName)
|
||||
if lbDnsName == "" {
|
||||
return nil, fmt.Errorf("Found ELB %q, but it did not have a DNSName", name)
|
||||
return nil, fmt.Errorf("found ELB %q, but it did not have a DNSName", name)
|
||||
}
|
||||
|
||||
ingresses = append(ingresses, kops.ApiIngressStatus{Hostname: lbDnsName})
|
||||
|
@ -102,5 +102,5 @@ func (s *CloudDiscoveryStatusStore) FindClusterStatus(cluster *kops.Cluster) (*k
|
|||
if osCloud, ok := cloud.(openstack.OpenstackCloud); ok {
|
||||
return osCloud.FindClusterStatus(cluster)
|
||||
}
|
||||
return nil, fmt.Errorf("Etcd Status not implemented for %T", cloud)
|
||||
return nil, fmt.Errorf("etcd Status not implemented for %T", cloud)
|
||||
}
|
||||
|
|
|
@ -52,17 +52,17 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o interface{}) error
|
|||
|
||||
k8sv148, err := util.ParseKubernetesVersion("v1.4.8")
|
||||
if err != nil {
|
||||
return fmt.Errorf("Unable to parse kubernetesVersion %s", err)
|
||||
return fmt.Errorf("unable to parse kubernetesVersion %s", err)
|
||||
}
|
||||
|
||||
k8sv152, err := util.ParseKubernetesVersion("v1.5.2")
|
||||
if err != nil {
|
||||
return fmt.Errorf("Unable to parse kubernetesVersion %s", err)
|
||||
return fmt.Errorf("unable to parse kubernetesVersion %s", err)
|
||||
}
|
||||
|
||||
kubernetesVersion, err := KubernetesVersion(clusterSpec)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Unable to parse kubernetesVersion %s", err)
|
||||
return fmt.Errorf("unable to parse kubernetesVersion %s", err)
|
||||
}
|
||||
|
||||
// In 1.4.8+ and 1.5.2+ k8s added the capability to tune the duration upon which the volume attach detach
|
||||
|
|
|
@ -59,7 +59,7 @@ func (b *IAMModelBuilder) Build(c *fi.ModelBuilderContext) error {
|
|||
specProfile := fi.StringValue(ig.Spec.IAM.Profile)
|
||||
if matchingRole, ok := sharedProfileARNsToIGRole[specProfile]; ok {
|
||||
if matchingRole != ig.Spec.Role {
|
||||
return fmt.Errorf("Found IAM instance profile assigned to multiple Instance Group roles %v and %v: %v",
|
||||
return fmt.Errorf("found IAM instance profile assigned to multiple Instance Group roles %v and %v: %v",
|
||||
ig.Spec.Role, sharedProfileARNsToIGRole[specProfile], specProfile)
|
||||
}
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue