From 7e69cb36d4ed417af17c27642b9f0336975aabd0 Mon Sep 17 00:00:00 2001
From: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
Date: Mon, 10 Jun 2019 23:38:28 +0200
Subject: [PATCH 1/2] Upgrade golangci-lint to v1.17.1

And fix new reported issues

Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
---
 cmd/skaffold/app/cmd/build.go          | 2 +-
 hack/linter.sh                         | 2 +-
 pkg/skaffold/build/local/local_test.go | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/skaffold/app/cmd/build.go b/cmd/skaffold/app/cmd/build.go
index 2696d06b0f2..39afd91275f 100644
--- a/cmd/skaffold/app/cmd/build.go
+++ b/cmd/skaffold/app/cmd/build.go
@@ -50,7 +50,7 @@ func NewCmdBuild(out io.Writer) *cobra.Command {
 		WithFlags(func(f *pflag.FlagSet) {
 			f.StringSliceVarP(&opts.TargetImages, "build-image", "b", nil, "Choose which artifacts to build. Artifacts with image names that contain the expression will be built only. Default is to build sources for all artifacts")
 			f.BoolVarP(&quietFlag, "quiet", "q", false, "Suppress the build output and print image built on success. See --output to format output.")
-			f.VarP(buildFormatFlag, "output", "o", "Used in conjuction with --quiet flag. "+buildFormatFlag.Usage())
+			f.VarP(buildFormatFlag, "output", "o", "Used in conjunction with --quiet flag. "+buildFormatFlag.Usage())
 		}).
 		NoArgs(cancelWithCtrlC(context.Background(), doBuild))
 }
diff --git a/hack/linter.sh b/hack/linter.sh
index 32106d23c74..ce15e34ae37 100755
--- a/hack/linter.sh
+++ b/hack/linter.sh
@@ -20,7 +20,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 if ! [ -x "$(command -v golangci-lint)" ]; then
 	echo "Installing GolangCI-Lint"
-	${DIR}/install_golint.sh -b $GOPATH/bin v1.16.0
+	${DIR}/install_golint.sh -b $GOPATH/bin v1.17.1
 fi
 
 golangci-lint run \
diff --git a/pkg/skaffold/build/local/local_test.go b/pkg/skaffold/build/local/local_test.go
index 4b4b085d179..a04510938c3 100644
--- a/pkg/skaffold/build/local/local_test.go
+++ b/pkg/skaffold/build/local/local_test.go
@@ -136,7 +136,7 @@ func TestLocalRun(t *testing.T) {
 			shouldErr: true,
 		},
 		{
-			description: "unkown artifact type",
+			description: "unknown artifact type",
 			artifacts:   []*latest.Artifact{{}},
 			shouldErr:   true,
 		},

From a4648e84f88ff3aa3768c03f19ebeb0534854c19 Mon Sep 17 00:00:00 2001
From: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
Date: Tue, 11 Jun 2019 00:20:51 +0200
Subject: [PATCH 2/2] Re-run hack/generate-man.sh

---
 docs/content/en/docs/references/cli/_index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/content/en/docs/references/cli/_index.md b/docs/content/en/docs/references/cli/_index.md
index eb31dcb71e7..e5ea32749ea 100644
--- a/docs/content/en/docs/references/cli/_index.md
+++ b/docs/content/en/docs/references/cli/_index.md
@@ -107,7 +107,7 @@ Flags:
   -f, --filename string              Filename or URL to the pipeline file (default "skaffold.yaml")
       --insecure-registry strings    Target registries for built images which are not secure
   -n, --namespace string             Run deployments in the specified namespace
-  -o, --output *flags.TemplateFlag   Used in conjuction with --quiet flag. Format output with go-template. For full struct documentation, see https://godoc.org/github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags#BuildOutput (default {{json .}})
+  -o, --output *flags.TemplateFlag   Used in conjunction with --quiet flag. Format output with go-template. For full struct documentation, see https://godoc.org/github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags#BuildOutput (default {{json .}})
   -p, --profile strings              Activate profiles by name
   -q, --quiet                        Suppress the build output and print image built on success. See --output to format output.
       --rpc-http-port int            tcp port to expose event REST API over HTTP (default 50052)