From caff38ffa1fa8595b445f37c327c01015ea6bb58 Mon Sep 17 00:00:00 2001
From: Matthew Fisher <matt.fisher@microsoft.com>
Date: Thu, 3 Oct 2019 13:01:22 -0700
Subject: [PATCH] fix(generator): fixup package comment linting error
Signed-off-by: Matthew Fisher <matt.fisher@microsoft.com>
---
.circleci/config.yml | 2 +-
Makefile | 2 +-
pkg/chartutil/capabilities_versions_generated.go | 1 +
.../generator/capabilities_default_versions_generate.go | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index ebc24abc8..c437b8c33 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ jobs:
working_directory: /go/src/k8s.io/helm
parallelism: 3
docker:
- - image: golang:1.13.0
+ - image: golang:1.13.1
environment:
PROJECT_NAME: "kubernetes-helm"
steps:
diff --git a/Makefile b/Makefile
index 8aae995be..a1a358c3b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
DOCKER_REGISTRY ?= gcr.io
IMAGE_PREFIX ?= kubernetes-helm
-DEV_IMAGE ?= golang:1.13.0
+DEV_IMAGE ?= golang:1.13.1
SHORT_NAME ?= tiller
SHORT_NAME_RUDDER ?= rudder
TARGETS ?= darwin/amd64 linux/amd64 linux/386 linux/arm linux/arm64 linux/ppc64le linux/s390x windows/amd64
diff --git a/pkg/chartutil/capabilities_versions_generated.go b/pkg/chartutil/capabilities_versions_generated.go
index bc33a40e8..370ad216c 100644
--- a/pkg/chartutil/capabilities_versions_generated.go
+++ b/pkg/chartutil/capabilities_versions_generated.go
@@ -13,6 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
// Code generated by capabilities_default_versions_generate.go; DO NOT EDIT.
+
package chartutil
func defaultVersions() []string {
diff --git a/pkg/chartutil/generator/capabilities_default_versions_generate.go b/pkg/chartutil/generator/capabilities_default_versions_generate.go
index 4ed312465..165a69a95 100644
--- a/pkg/chartutil/generator/capabilities_default_versions_generate.go
+++ b/pkg/chartutil/generator/capabilities_default_versions_generate.go
@@ -60,7 +60,7 @@ func createOutput(v []string) []byte {
var out bytes.Buffer
fmt.Fprintln(&out, licenseHeader)
- fmt.Fprintln(&out, "// Code generated by capabilities_default_versions_generate.go; DO NOT EDIT.")
+ fmt.Fprint(&out, "// Code generated by capabilities_default_versions_generate.go; DO NOT EDIT.\n\n")
fmt.Fprint(&out, "package chartutil\n\n")
fmt.Fprintln(&out, "func defaultVersions() []string {")
fmt.Fprintln(&out, "\treturn []string{")
--
GitLab