Update verify-gofmt and run update gofmt

Signed-off-by: Chuck Ha <chuckh@vmware.com>
kubernetes-retired · Jul 2, 2019 · b8f6527 · b8f6527
1 parent 9b76246
commit b8f6527
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/cmd/capdctl/main.go b/cmd/capdctl/main.go
@@ -260,7 +260,7 @@ func makeManagementCluster(clusterName string) {
 	cpMounts := []cri.Mount{
 		{
 			ContainerPath: "/var/run/docker.sock",
-			HostPath: "/var/run/docker.sock",
+			HostPath:      "/var/run/docker.sock",
 		},
 	}
 	cp, err := actions.CreateControlPlane(clusterName, "management-control-plane", lbipv4, "v1.14.2", cpMounts)

diff --git a/hack/verify-gofmt.sh b/hack/verify-gofmt.sh
@@ -28,4 +28,5 @@ if [[ -n "${diff}" ]]; then
   echo "${diff}"
   echo
   echo "Check failed. Please run hack/update-gofmt.sh"
+  exit 1
 fi
diff --git a/kind/actions/cluster_actions.go b/kind/actions/cluster_actions.go
@@ -23,13 +23,13 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
+	k8sverison "k8s.io/apimachinery/pkg/util/version"
 	"sigs.k8s.io/cluster-api-provider-docker/kind/kubeadm"
 	"sigs.k8s.io/cluster-api-provider-docker/third_party/forked/loadbalancer"
 	"sigs.k8s.io/kind/pkg/cluster/constants"
 	"sigs.k8s.io/kind/pkg/cluster/nodes"
 	"sigs.k8s.io/kind/pkg/container/docker"
 	"sigs.k8s.io/kind/pkg/exec"
-	k8sverison "k8s.io/apimachinery/pkg/util/version"
 )
 
 // KubeadmJoinControlPlane joins a control plane to an existing Kubernetes cluster.

diff --git a/kind/actions/kind.go b/kind/actions/kind.go
@@ -25,9 +25,9 @@ import (
 	"path/filepath"
 	"regexp"
 
-	"sigs.k8s.io/kind/pkg/cluster/config/defaults"
 	"github.com/pkg/errors"
 	"sigs.k8s.io/cluster-api-provider-docker/third_party/forked/loadbalancer"
+	"sigs.k8s.io/kind/pkg/cluster/config/defaults"
 	"sigs.k8s.io/kind/pkg/cluster/constants"
 	"sigs.k8s.io/kind/pkg/cluster/nodes"
 	"sigs.k8s.io/kind/pkg/container/cri"
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,4 +28,5 @@ if [[ -n "${diff}" ]]; then @@
       echo "${diff}"
       echo
       echo "Check failed. Please run hack/update-gofmt.sh"
+      exit 1
     fi