Merge pull request #7663 from rifelpet/staticcheck-bugfixes

Fix some bugs reported by staticcheck
kubernetes · Sep 25, 2019 · ba69006 · ba69006
2 parents badef04 + c8d424d
commit ba69006
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/nodeup/pkg/model/context.go b/nodeup/pkg/model/context.go
@@ -563,6 +563,9 @@ func EvaluateHostnameOverride(hostnameOverride string) (string, error) {
 	result, err := svc.DescribeInstances(&ec2.DescribeInstancesInput{
 		InstanceIds: []*string{&instanceID},
 	})
+	if err != nil {
+		return "", fmt.Errorf("error describing instances: %v", err)
+	}
 
 	if len(result.Reservations) != 1 {
 		return "", fmt.Errorf("Too many reservations returned for the single instance-id")

diff --git a/pkg/apis/kops/validation/gce.go b/pkg/apis/kops/validation/gce.go
@@ -46,5 +46,5 @@ func gceValidateCluster(c *kops.Cluster) field.ErrorList {
 		allErrs = append(allErrs, field.Invalid(fieldSpec.Child("Subnets"), strings.Join(regions.List(), ","), "clusters cannot span GCE regions"))
 	}
 
-	return nil
+	return allErrs
 }
diff --git a/protokube/cmd/protokube/main.go b/protokube/cmd/protokube/main.go
@@ -205,14 +205,6 @@ func run() error {
 		if clusterID == "" {
 			clusterID = osVolumes.ClusterID()
 		}
-	} else if cloud == "alicloud" {
-		klog.Info("Initializing AliCloud volumes")
-		aliVolumes, err := protokube.NewALIVolumes()
-		if err != nil {
-			klog.Errorf("Error initializing Aliyun: %q", err)
-			os.Exit(1)
-		}
-		volumes = aliVolumes
 	} else if cloud == "alicloud" {
 		klog.Info("Initializing AliCloud volumes")
 		aliVolumes, err := protokube.NewALIVolumes()