diff --git a/hack/linter.sh b/hack/linter.sh index a2381531c89..32106d23c74 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.15.0 + ${DIR}/install_golint.sh -b $GOPATH/bin v1.16.0 fi golangci-lint run \ @@ -36,4 +36,4 @@ golangci-lint run \ -E unconvert \ -E unparam \ -D errcheck \ - --skip-dirs vendor \ No newline at end of file + --skip-dirs vendor diff --git a/pkg/skaffold/deploy/helm_test.go b/pkg/skaffold/deploy/helm_test.go index 54edbcd471e..809e65cf7f9 100644 --- a/pkg/skaffold/deploy/helm_test.go +++ b/pkg/skaffold/deploy/helm_test.go @@ -60,7 +60,7 @@ var testDeployConfig = &latest.HelmDeploy{ Values: map[string]string{ "image": "skaffold-helm", }, - Overrides: schemautil.HelmOverrides{map[string]interface{}{"foo": "bar"}}, + Overrides: schemautil.HelmOverrides{Values: map[string]interface{}{"foo": "bar"}}, SetValues: map[string]string{ "some.key": "somevalue", }, @@ -76,7 +76,7 @@ var testDeployRecreatePodsConfig = &latest.HelmDeploy{ Values: map[string]string{ "image": "skaffold-helm", }, - Overrides: schemautil.HelmOverrides{map[string]interface{}{"foo": "bar"}}, + Overrides: schemautil.HelmOverrides{Values: map[string]interface{}{"foo": "bar"}}, SetValues: map[string]string{ "some.key": "somevalue", }, @@ -93,7 +93,7 @@ var testDeploySkipBuildDependenciesConfig = &latest.HelmDeploy{ Values: map[string]string{ "image": "skaffold-helm", }, - Overrides: schemautil.HelmOverrides{map[string]interface{}{"foo": "bar"}}, + Overrides: schemautil.HelmOverrides{Values: map[string]interface{}{"foo": "bar"}}, SetValues: map[string]string{ "some.key": "somevalue", }, @@ -110,7 +110,7 @@ var testDeployHelmStyleConfig = &latest.HelmDeploy{ Values: map[string]string{ "image": "skaffold-helm", }, - Overrides: schemautil.HelmOverrides{map[string]interface{}{"foo": "bar"}}, + Overrides: schemautil.HelmOverrides{Values: map[string]interface{}{"foo": "bar"}}, SetValues: map[string]string{ "some.key": "somevalue", }, @@ -159,7 +159,7 @@ var testDeployWithTemplatedName = &latest.HelmDeploy{ Values: map[string]string{ "image.tag": "skaffold-helm", }, - Overrides: schemautil.HelmOverrides{map[string]interface{}{"foo": "bar"}}, + Overrides: schemautil.HelmOverrides{Values: map[string]interface{}{"foo": "bar"}}, SetValues: map[string]string{ "some.key": "somevalue", }, @@ -595,7 +595,7 @@ func TestHelmDependencies(t *testing.T) { ChartPath: folder.Root(), ValuesFiles: tt.valuesFiles, Values: map[string]string{"image": "skaffold-helm"}, - Overrides: schemautil.HelmOverrides{map[string]interface{}{"foo": "bar"}}, + Overrides: schemautil.HelmOverrides{Values: map[string]interface{}{"foo": "bar"}}, SetValues: map[string]string{"some.key": "somevalue"}, }, },