From 7b632b2dd5db39aaf7b1fc15461ceea127cbf511 Mon Sep 17 00:00:00 2001 From: Justin SB Date: Mon, 11 Nov 2019 17:36:53 -0500 Subject: [PATCH] Mark other templates as const also To prevent the previous problem from being introduced elsewhere. --- pkg/scaffold/project/authproxyrole.go | 2 +- pkg/scaffold/project/authproxyrolebinding.go | 2 +- pkg/scaffold/project/boilerplate.go | 4 ++-- pkg/scaffold/project/gitignore.go | 2 +- pkg/scaffold/project/gopkg.go | 2 +- pkg/scaffold/project/kustomize.go | 2 +- pkg/scaffold/project/kustomize_manager_base.go | 2 +- pkg/scaffold/project/kustomize_rbac_base.go | 2 +- pkg/scaffold/project/makefile.go | 2 +- pkg/scaffold/v1/authproxyservice.go | 2 +- pkg/scaffold/v1/controller/add.go | 2 +- pkg/scaffold/v1/controller/controller.go | 2 +- pkg/scaffold/v1/controller/controllersuitetest.go | 2 +- pkg/scaffold/v1/controller/controllertest.go | 2 +- pkg/scaffold/v1/crd/addtoscheme.go | 2 +- pkg/scaffold/v1/crd/crd_sample.go | 2 +- pkg/scaffold/v1/crd/doc.go | 2 +- pkg/scaffold/v1/crd/group.go | 2 +- pkg/scaffold/v1/crd/register.go | 2 +- pkg/scaffold/v1/crd/types.go | 2 +- pkg/scaffold/v1/crd/typestest.go | 2 +- pkg/scaffold/v1/crd/version_suitetest.go | 2 +- pkg/scaffold/v1/kustomize_image_patch.go | 2 +- pkg/scaffold/v1/manager/apis.go | 2 +- pkg/scaffold/v1/manager/cmd.go | 2 +- pkg/scaffold/v1/manager/config.go | 2 +- pkg/scaffold/v1/manager/controller.go | 2 +- pkg/scaffold/v1/manager/dockerfile.go | 2 +- pkg/scaffold/v1/manager/webhook.go | 2 +- pkg/scaffold/v1/metricsauth/kustomize_auth_proxy_patch.go | 2 +- pkg/scaffold/v1/metricsauth/kustomize_metrics_patch.go | 2 +- pkg/scaffold/v1/webhook/add_admissionbuilder_handler.go | 2 +- pkg/scaffold/v1/webhook/add_server.go | 2 +- pkg/scaffold/v1/webhook/admissionbuilder.go | 2 +- pkg/scaffold/v1/webhook/admissionhandler.go | 2 +- pkg/scaffold/v1/webhook/admissionwebhooks.go | 2 +- pkg/scaffold/v1/webhook/server.go | 2 +- pkg/scaffold/v2/authproxyservice.go | 2 +- pkg/scaffold/v2/certmanager/certificate.go | 2 +- pkg/scaffold/v2/certmanager/kustomize.go | 2 +- pkg/scaffold/v2/certmanager/kustomizeconfig.go | 2 +- pkg/scaffold/v2/controller.go | 2 +- pkg/scaffold/v2/controller_suitetest.go | 2 +- pkg/scaffold/v2/crd/enablecainjection_patch.go | 2 +- pkg/scaffold/v2/crd/enablewebhook_patch.go | 2 +- pkg/scaffold/v2/crd/kustomizeconfig.go | 2 +- pkg/scaffold/v2/crd_sample.go | 2 +- pkg/scaffold/v2/dockerfile.go | 2 +- pkg/scaffold/v2/gomod.go | 2 +- pkg/scaffold/v2/group.go | 2 +- pkg/scaffold/v2/kustomize.go | 2 +- pkg/scaffold/v2/leaderelectionrole.go | 2 +- pkg/scaffold/v2/leaderelectionrolebinding.go | 2 +- pkg/scaffold/v2/makefile.go | 2 +- pkg/scaffold/v2/manager/config.go | 2 +- pkg/scaffold/v2/manager/kustomization.go | 2 +- pkg/scaffold/v2/metricsauth/kustomize_auth_proxy_patch.go | 2 +- pkg/scaffold/v2/mgrrolebinding.go | 3 +-- pkg/scaffold/v2/prometheus/kustomize.go | 3 +-- pkg/scaffold/v2/prometheus/monitor.go | 2 +- pkg/scaffold/v2/rbac.go | 2 +- pkg/scaffold/v2/types.go | 2 +- pkg/scaffold/v2/webhook/enablecainection_patch.go | 2 +- pkg/scaffold/v2/webhook/kustomization.go | 2 +- pkg/scaffold/v2/webhook/kustomizeconfig.go | 2 +- pkg/scaffold/v2/webhook/service.go | 2 +- pkg/scaffold/v2/webhook_manager_patch.go | 2 +- plugins/addon/controller.go | 2 +- plugins/addon/type.go | 2 +- 69 files changed, 70 insertions(+), 72 deletions(-) diff --git a/pkg/scaffold/project/authproxyrole.go b/pkg/scaffold/project/authproxyrole.go index a360b4e1a4d..2cd0593899b 100644 --- a/pkg/scaffold/project/authproxyrole.go +++ b/pkg/scaffold/project/authproxyrole.go @@ -38,7 +38,7 @@ func (r *AuthProxyRole) GetInput() (input.Input, error) { return r.Input, nil } -var proxyRoleTemplate = `apiVersion: rbac.authorization.k8s.io/v1 +const proxyRoleTemplate = `apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: proxy-role diff --git a/pkg/scaffold/project/authproxyrolebinding.go b/pkg/scaffold/project/authproxyrolebinding.go index 7a5f7fd3f45..d62433df2b7 100644 --- a/pkg/scaffold/project/authproxyrolebinding.go +++ b/pkg/scaffold/project/authproxyrolebinding.go @@ -38,7 +38,7 @@ func (r *AuthProxyRoleBinding) GetInput() (input.Input, error) { return r.Input, nil } -var proxyRoleBindinggTemplate = `apiVersion: rbac.authorization.k8s.io/v1 +const proxyRoleBindinggTemplate = `apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: proxy-rolebinding diff --git a/pkg/scaffold/project/boilerplate.go b/pkg/scaffold/project/boilerplate.go index 0b75414f31b..e4205ebd1cb 100644 --- a/pkg/scaffold/project/boilerplate.go +++ b/pkg/scaffold/project/boilerplate.go @@ -65,7 +65,7 @@ func (c *Boilerplate) GetInput() (input.Input, error) { return c.Input, nil } -var apache = `/* +const apache = `/* {{ if .Owner }}Copyright {{ .Year }} {{ .Owner }}. {{ end }} Licensed under the Apache License, Version 2.0 (the "License"); @@ -81,6 +81,6 @@ See the License for the specific language governing permissions and limitations under the License. */` -var none = `/* +const none = `/* {{ if .Owner }}Copyright {{ .Year }} {{ .Owner }}{{ end }}. */` diff --git a/pkg/scaffold/project/gitignore.go b/pkg/scaffold/project/gitignore.go index f75885432d1..ac9d8555e30 100644 --- a/pkg/scaffold/project/gitignore.go +++ b/pkg/scaffold/project/gitignore.go @@ -36,7 +36,7 @@ func (c *GitIgnore) GetInput() (input.Input, error) { return c.Input, nil } -var gitignoreTemplate = ` +const gitignoreTemplate = ` # Binaries for programs and plugins *.exe *.exe~ diff --git a/pkg/scaffold/project/gopkg.go b/pkg/scaffold/project/gopkg.go index 4b554d5a68a..6ec1a649a2a 100644 --- a/pkg/scaffold/project/gopkg.go +++ b/pkg/scaffold/project/gopkg.go @@ -134,7 +134,7 @@ const DefaultGopkgUserContent = `required = [ ` -var depTemplate = `{{ .UserContent }} +const depTemplate = `{{ .UserContent }} # STANZAS BELOW ARE GENERATED AND MAY BE WRITTEN - DO NOT MODIFY BELOW THIS LINE. {{ range $element := .Stanzas -}} diff --git a/pkg/scaffold/project/kustomize.go b/pkg/scaffold/project/kustomize.go index 7a4b285ea13..f0d78f447ef 100644 --- a/pkg/scaffold/project/kustomize.go +++ b/pkg/scaffold/project/kustomize.go @@ -51,7 +51,7 @@ func (c *Kustomize) GetInput() (input.Input, error) { return c.Input, nil } -var kustomizeTemplate = `# Adds namespace to all resources. +const kustomizeTemplate = `# Adds namespace to all resources. namespace: {{.Prefix}}-system # Value of this field is prepended to the diff --git a/pkg/scaffold/project/kustomize_manager_base.go b/pkg/scaffold/project/kustomize_manager_base.go index 9326b272130..aef819bed9f 100644 --- a/pkg/scaffold/project/kustomize_manager_base.go +++ b/pkg/scaffold/project/kustomize_manager_base.go @@ -39,6 +39,6 @@ func (c *KustomizeManager) GetInput() (input.Input, error) { return c.Input, nil } -var kustomizeManagerTemplate = `resources: +const kustomizeManagerTemplate = `resources: - manager.yaml ` diff --git a/pkg/scaffold/project/kustomize_rbac_base.go b/pkg/scaffold/project/kustomize_rbac_base.go index 373ff36373c..0e532ad475d 100644 --- a/pkg/scaffold/project/kustomize_rbac_base.go +++ b/pkg/scaffold/project/kustomize_rbac_base.go @@ -39,7 +39,7 @@ func (c *KustomizeRBAC) GetInput() (input.Input, error) { return c.Input, nil } -var kustomizeRBACTemplate = `resources: +const kustomizeRBACTemplate = `resources: - rbac_role.yaml - rbac_role_binding.yaml # Comment the following 3 lines if you want to disable diff --git a/pkg/scaffold/project/makefile.go b/pkg/scaffold/project/makefile.go index e755e7ad6bc..3996a5fdb13 100644 --- a/pkg/scaffold/project/makefile.go +++ b/pkg/scaffold/project/makefile.go @@ -48,7 +48,7 @@ func (c *Makefile) GetInput() (input.Input, error) { return c.Input, nil } -var makefileTemplate = ` +const makefileTemplate = ` # Image URL to use all building/pushing image targets IMG ?= {{ .Image }} diff --git a/pkg/scaffold/v1/authproxyservice.go b/pkg/scaffold/v1/authproxyservice.go index 9328fc95de2..63debdf3fca 100644 --- a/pkg/scaffold/v1/authproxyservice.go +++ b/pkg/scaffold/v1/authproxyservice.go @@ -38,7 +38,7 @@ func (r *AuthProxyService) GetInput() (input.Input, error) { return r.Input, nil } -var AuthProxyServiceTemplate = `apiVersion: v1 +const AuthProxyServiceTemplate = `apiVersion: v1 kind: Service metadata: annotations: diff --git a/pkg/scaffold/v1/controller/add.go b/pkg/scaffold/v1/controller/add.go index a1716c27153..38b8d50574f 100644 --- a/pkg/scaffold/v1/controller/add.go +++ b/pkg/scaffold/v1/controller/add.go @@ -45,7 +45,7 @@ func (a *AddController) GetInput() (input.Input, error) { return a.Input, nil } -var addControllerTemplate = `{{ .Boilerplate }} +const addControllerTemplate = `{{ .Boilerplate }} package controller diff --git a/pkg/scaffold/v1/controller/controller.go b/pkg/scaffold/v1/controller/controller.go index 9a6c3215a13..f993e7b0a39 100644 --- a/pkg/scaffold/v1/controller/controller.go +++ b/pkg/scaffold/v1/controller/controller.go @@ -97,7 +97,7 @@ func getResourceInfo(coreGroups map[string]string, r *resource.Resource, in inpu return path.Join(in.Repo, "pkg", "apis"), r.Group + "." + in.Domain } -var controllerTemplate = `{{ .Boilerplate }} +const controllerTemplate = `{{ .Boilerplate }} package {{ lower .Resource.Kind }} diff --git a/pkg/scaffold/v1/controller/controllersuitetest.go b/pkg/scaffold/v1/controller/controllersuitetest.go index 37001ca2da2..9ba6b285ece 100644 --- a/pkg/scaffold/v1/controller/controllersuitetest.go +++ b/pkg/scaffold/v1/controller/controllersuitetest.go @@ -42,7 +42,7 @@ func (a *SuiteTest) GetInput() (input.Input, error) { return a.Input, nil } -var controllerSuiteTestTemplate = `{{ .Boilerplate }} +const controllerSuiteTestTemplate = `{{ .Boilerplate }} package {{ lower .Resource.Kind }} diff --git a/pkg/scaffold/v1/controller/controllertest.go b/pkg/scaffold/v1/controller/controllertest.go index cc6a0ea1703..773b613fb59 100644 --- a/pkg/scaffold/v1/controller/controllertest.go +++ b/pkg/scaffold/v1/controller/controllertest.go @@ -66,7 +66,7 @@ func (a *Test) GetInput() (input.Input, error) { return a.Input, nil } -var controllerTestTemplate = `{{ .Boilerplate }} +const controllerTestTemplate = `{{ .Boilerplate }} package {{ lower .Resource.Kind }} diff --git a/pkg/scaffold/v1/crd/addtoscheme.go b/pkg/scaffold/v1/crd/addtoscheme.go index 5c224dce3e2..bdcdd02d636 100644 --- a/pkg/scaffold/v1/crd/addtoscheme.go +++ b/pkg/scaffold/v1/crd/addtoscheme.go @@ -52,7 +52,7 @@ func (a *AddToScheme) Validate() error { // NB(directxman12): we need that package alias on the API import otherwise imports.Process // gets wicked (or hella, if you're feeling west-coasty) confused. -var addResourceTemplate = `{{ .Boilerplate }} +const addResourceTemplate = `{{ .Boilerplate }} package apis diff --git a/pkg/scaffold/v1/crd/crd_sample.go b/pkg/scaffold/v1/crd/crd_sample.go index 9d877358399..850a22b12e2 100644 --- a/pkg/scaffold/v1/crd/crd_sample.go +++ b/pkg/scaffold/v1/crd/crd_sample.go @@ -52,7 +52,7 @@ func (c *CRDSample) Validate() error { return c.Resource.Validate() } -var crdSampleTemplate = `apiVersion: {{ .Resource.Group }}.{{ .Domain }}/{{ .Resource.Version }} +const crdSampleTemplate = `apiVersion: {{ .Resource.Group }}.{{ .Domain }}/{{ .Resource.Version }} kind: {{ .Resource.Kind }} metadata: labels: diff --git a/pkg/scaffold/v1/crd/doc.go b/pkg/scaffold/v1/crd/doc.go index 6bf66442439..6989e827f75 100644 --- a/pkg/scaffold/v1/crd/doc.go +++ b/pkg/scaffold/v1/crd/doc.go @@ -50,7 +50,7 @@ func (a *Doc) Validate() error { return a.Resource.Validate() } -var docGoTemplate = `{{ .Boilerplate }} +const docGoTemplate = `{{ .Boilerplate }} // Package {{.Resource.Version}} contains API Schema definitions for the {{ .Resource.GroupImportSafe }} {{.Resource.Version}} API group // +k8s:openapi-gen=true diff --git a/pkg/scaffold/v1/crd/group.go b/pkg/scaffold/v1/crd/group.go index 160576adbf7..ebc4513e0dd 100644 --- a/pkg/scaffold/v1/crd/group.go +++ b/pkg/scaffold/v1/crd/group.go @@ -47,7 +47,7 @@ func (g *Group) Validate() error { return g.Resource.Validate() } -var groupTemplate = `{{ .Boilerplate }} +const groupTemplate = `{{ .Boilerplate }} // Package {{ .Resource.GroupImportSafe }} contains {{ .Resource.Group }} API versions package {{ .Resource.GroupImportSafe }} diff --git a/pkg/scaffold/v1/crd/register.go b/pkg/scaffold/v1/crd/register.go index 1c1f3e2115b..97e6332a458 100644 --- a/pkg/scaffold/v1/crd/register.go +++ b/pkg/scaffold/v1/crd/register.go @@ -47,7 +47,7 @@ func (r *Register) Validate() error { return r.Resource.Validate() } -var registerTemplate = `{{ .Boilerplate }} +const registerTemplate = `{{ .Boilerplate }} // NOTE: Boilerplate only. Ignore this file. diff --git a/pkg/scaffold/v1/crd/types.go b/pkg/scaffold/v1/crd/types.go index 0f7cb4ea842..2b3fe6f4269 100644 --- a/pkg/scaffold/v1/crd/types.go +++ b/pkg/scaffold/v1/crd/types.go @@ -51,7 +51,7 @@ func (t *Types) Validate() error { return t.Resource.Validate() } -var typesTemplate = `{{ .Boilerplate }} +const typesTemplate = `{{ .Boilerplate }} package {{ .Resource.Version }} diff --git a/pkg/scaffold/v1/crd/typestest.go b/pkg/scaffold/v1/crd/typestest.go index 1bd7cab1ff5..de5d6b8f44a 100644 --- a/pkg/scaffold/v1/crd/typestest.go +++ b/pkg/scaffold/v1/crd/typestest.go @@ -51,7 +51,7 @@ func (t *TypesTest) Validate() error { return t.Resource.Validate() } -var typesTestTemplate = `{{ .Boilerplate }} +const typesTestTemplate = `{{ .Boilerplate }} package {{ .Resource.Version }} diff --git a/pkg/scaffold/v1/crd/version_suitetest.go b/pkg/scaffold/v1/crd/version_suitetest.go index 8ee3bab8cf1..8c30b87de99 100644 --- a/pkg/scaffold/v1/crd/version_suitetest.go +++ b/pkg/scaffold/v1/crd/version_suitetest.go @@ -49,7 +49,7 @@ func (v *VersionSuiteTest) Validate() error { return v.Resource.Validate() } -var versionSuiteTestTemplate = `{{ .Boilerplate }} +const versionSuiteTestTemplate = `{{ .Boilerplate }} package {{ .Resource.Version }} diff --git a/pkg/scaffold/v1/kustomize_image_patch.go b/pkg/scaffold/v1/kustomize_image_patch.go index be460f0f406..8853ce26806 100644 --- a/pkg/scaffold/v1/kustomize_image_patch.go +++ b/pkg/scaffold/v1/kustomize_image_patch.go @@ -46,7 +46,7 @@ func (c *KustomizeImagePatch) GetInput() (input.Input, error) { return c.Input, nil } -var kustomizeImagePatchTemplate = `apiVersion: apps/v1 +const kustomizeImagePatchTemplate = `apiVersion: apps/v1 kind: StatefulSet metadata: name: controller-manager diff --git a/pkg/scaffold/v1/manager/apis.go b/pkg/scaffold/v1/manager/apis.go index d5cb34547f0..3fa6adad449 100644 --- a/pkg/scaffold/v1/manager/apis.go +++ b/pkg/scaffold/v1/manager/apis.go @@ -58,7 +58,7 @@ func (a *APIs) GetInput() (input.Input, error) { return a.Input, nil } -var apisTemplate = `{{ .Boilerplate }} +const apisTemplate = `{{ .Boilerplate }} {{ range $line := .Comments }}{{ $line }} {{ end }} diff --git a/pkg/scaffold/v1/manager/cmd.go b/pkg/scaffold/v1/manager/cmd.go index 3246e7e8b62..18a363602fd 100644 --- a/pkg/scaffold/v1/manager/cmd.go +++ b/pkg/scaffold/v1/manager/cmd.go @@ -38,7 +38,7 @@ func (a *Cmd) GetInput() (input.Input, error) { return a.Input, nil } -var cmdTemplate = `{{ .Boilerplate }} +const cmdTemplate = `{{ .Boilerplate }} package main diff --git a/pkg/scaffold/v1/manager/config.go b/pkg/scaffold/v1/manager/config.go index 9de6602b8bb..aea2c8d96ef 100644 --- a/pkg/scaffold/v1/manager/config.go +++ b/pkg/scaffold/v1/manager/config.go @@ -40,7 +40,7 @@ func (c *Config) GetInput() (input.Input, error) { return c.Input, nil } -var configTemplate = `apiVersion: v1 +const configTemplate = `apiVersion: v1 kind: Namespace metadata: labels: diff --git a/pkg/scaffold/v1/manager/controller.go b/pkg/scaffold/v1/manager/controller.go index d7bfe7ef36d..cecb0ab969d 100644 --- a/pkg/scaffold/v1/manager/controller.go +++ b/pkg/scaffold/v1/manager/controller.go @@ -38,7 +38,7 @@ func (c *Controller) GetInput() (input.Input, error) { return c.Input, nil } -var controllerTemplate = `{{ .Boilerplate }} +const controllerTemplate = `{{ .Boilerplate }} package controller diff --git a/pkg/scaffold/v1/manager/dockerfile.go b/pkg/scaffold/v1/manager/dockerfile.go index 7c37fabfc90..c90c60e0d10 100644 --- a/pkg/scaffold/v1/manager/dockerfile.go +++ b/pkg/scaffold/v1/manager/dockerfile.go @@ -36,7 +36,7 @@ func (c *Dockerfile) GetInput() (input.Input, error) { return c.Input, nil } -var dockerfileTemplate = `# Build the manager binary +const dockerfileTemplate = `# Build the manager binary FROM golang:1.10.3 as builder # Copy in the go src diff --git a/pkg/scaffold/v1/manager/webhook.go b/pkg/scaffold/v1/manager/webhook.go index ed7f89ff7b8..8dff92cbfae 100644 --- a/pkg/scaffold/v1/manager/webhook.go +++ b/pkg/scaffold/v1/manager/webhook.go @@ -38,7 +38,7 @@ func (c *Webhook) GetInput() (input.Input, error) { return c.Input, nil } -var webhookTemplate = `{{ .Boilerplate }} +const webhookTemplate = `{{ .Boilerplate }} package webhook diff --git a/pkg/scaffold/v1/metricsauth/kustomize_auth_proxy_patch.go b/pkg/scaffold/v1/metricsauth/kustomize_auth_proxy_patch.go index 1eab712fa10..1a7b59d415b 100644 --- a/pkg/scaffold/v1/metricsauth/kustomize_auth_proxy_patch.go +++ b/pkg/scaffold/v1/metricsauth/kustomize_auth_proxy_patch.go @@ -40,7 +40,7 @@ func (c *KustomizeAuthProxyPatch) GetInput() (input.Input, error) { return c.Input, nil } -var kustomizeAuthProxyPatchTemplate = `# This patch inject a sidecar container which is a HTTP proxy for the controller manager, +const kustomizeAuthProxyPatchTemplate = `# This patch inject a sidecar container which is a HTTP proxy for the controller manager, # it performs RBAC authorization against the Kubernetes API using SubjectAccessReviews. apiVersion: apps/v1 kind: StatefulSet diff --git a/pkg/scaffold/v1/metricsauth/kustomize_metrics_patch.go b/pkg/scaffold/v1/metricsauth/kustomize_metrics_patch.go index d1ba14afc18..f217c576291 100644 --- a/pkg/scaffold/v1/metricsauth/kustomize_metrics_patch.go +++ b/pkg/scaffold/v1/metricsauth/kustomize_metrics_patch.go @@ -40,7 +40,7 @@ func (c *KustomizePrometheusMetricsPatch) GetInput() (input.Input, error) { return c.Input, nil } -var kustomizePrometheusMetricsPatchTemplate = `# This patch enables Prometheus scraping for the manager pod. +const kustomizePrometheusMetricsPatchTemplate = `# This patch enables Prometheus scraping for the manager pod. apiVersion: apps/v1 kind: StatefulSet metadata: diff --git a/pkg/scaffold/v1/webhook/add_admissionbuilder_handler.go b/pkg/scaffold/v1/webhook/add_admissionbuilder_handler.go index bef9ff1964c..68e5d9b9d08 100644 --- a/pkg/scaffold/v1/webhook/add_admissionbuilder_handler.go +++ b/pkg/scaffold/v1/webhook/add_admissionbuilder_handler.go @@ -49,7 +49,7 @@ func (a *AddAdmissionWebhookBuilderHandler) GetInput() (input.Input, error) { return a.Input, nil } -var addAdmissionWebhookBuilderHandlerTemplate = `{{ .Boilerplate }} +const addAdmissionWebhookBuilderHandlerTemplate = `{{ .Boilerplate }} package {{ .Server }}server diff --git a/pkg/scaffold/v1/webhook/add_server.go b/pkg/scaffold/v1/webhook/add_server.go index acf754b81bc..a558d25006b 100644 --- a/pkg/scaffold/v1/webhook/add_server.go +++ b/pkg/scaffold/v1/webhook/add_server.go @@ -45,7 +45,7 @@ func (a *AddServer) GetInput() (input.Input, error) { return a.Input, nil } -var addServerTemplate = `{{ .Boilerplate }} +const addServerTemplate = `{{ .Boilerplate }} package webhook diff --git a/pkg/scaffold/v1/webhook/admissionbuilder.go b/pkg/scaffold/v1/webhook/admissionbuilder.go index 735dc48c1ba..3ee3708fb2b 100644 --- a/pkg/scaffold/v1/webhook/admissionbuilder.go +++ b/pkg/scaffold/v1/webhook/admissionbuilder.go @@ -75,7 +75,7 @@ func (a *AdmissionWebhookBuilder) GetInput() (input.Input, error) { return a.Input, nil } -var admissionWebhookBuilderTemplate = `{{ .Boilerplate }} +const admissionWebhookBuilderTemplate = `{{ .Boilerplate }} package {{ .Type }} diff --git a/pkg/scaffold/v1/webhook/admissionhandler.go b/pkg/scaffold/v1/webhook/admissionhandler.go index 5b5ff63e0a3..829a52478a1 100644 --- a/pkg/scaffold/v1/webhook/admissionhandler.go +++ b/pkg/scaffold/v1/webhook/admissionhandler.go @@ -74,7 +74,7 @@ func (a *AdmissionHandler) GetInput() (input.Input, error) { return a.Input, nil } -var addAdmissionHandlerTemplate = `{{ .Boilerplate }} +const addAdmissionHandlerTemplate = `{{ .Boilerplate }} package {{ .Type }} diff --git a/pkg/scaffold/v1/webhook/admissionwebhooks.go b/pkg/scaffold/v1/webhook/admissionwebhooks.go index 4ac3e0386af..4fbb6bee3f2 100644 --- a/pkg/scaffold/v1/webhook/admissionwebhooks.go +++ b/pkg/scaffold/v1/webhook/admissionwebhooks.go @@ -51,7 +51,7 @@ func (a *AdmissionWebhooks) GetInput() (input.Input, error) { return a.Input, nil } -var webhooksTemplate = `{{ .Boilerplate }} +const webhooksTemplate = `{{ .Boilerplate }} package {{ .Type }} diff --git a/pkg/scaffold/v1/webhook/server.go b/pkg/scaffold/v1/webhook/server.go index 9384ed77d1a..f5700a19001 100644 --- a/pkg/scaffold/v1/webhook/server.go +++ b/pkg/scaffold/v1/webhook/server.go @@ -45,7 +45,7 @@ func (a *Server) GetInput() (input.Input, error) { return a.Input, nil } -var serverTemplate = `{{ .Boilerplate }} +const serverTemplate = `{{ .Boilerplate }} package {{ .Server }}server diff --git a/pkg/scaffold/v2/authproxyservice.go b/pkg/scaffold/v2/authproxyservice.go index b31f255406f..481f4224d18 100644 --- a/pkg/scaffold/v2/authproxyservice.go +++ b/pkg/scaffold/v2/authproxyservice.go @@ -38,7 +38,7 @@ func (r *AuthProxyService) GetInput() (input.Input, error) { return r.Input, nil } -var AuthProxyServiceTemplate = `apiVersion: v1 +const AuthProxyServiceTemplate = `apiVersion: v1 kind: Service metadata: labels: diff --git a/pkg/scaffold/v2/certmanager/certificate.go b/pkg/scaffold/v2/certmanager/certificate.go index 223d0dec251..2f29e0fbfd7 100644 --- a/pkg/scaffold/v2/certmanager/certificate.go +++ b/pkg/scaffold/v2/certmanager/certificate.go @@ -36,7 +36,7 @@ func (p *CertManager) GetInput() (input.Input, error) { return p.Input, nil } -var certManagerTemplate = `# The following manifests contain a self-signed issuer CR and a certificate CR. +const certManagerTemplate = `# The following manifests contain a self-signed issuer CR and a certificate CR. # More document can be found at https://docs.cert-manager.io # WARNING: Targets CertManager 0.11 check https://docs.cert-manager.io/en/latest/tasks/upgrading/index.html for breaking changes apiVersion: cert-manager.io/v1alpha2 diff --git a/pkg/scaffold/v2/certmanager/kustomize.go b/pkg/scaffold/v2/certmanager/kustomize.go index 943b2f68e1c..99cbe12edcc 100644 --- a/pkg/scaffold/v2/certmanager/kustomize.go +++ b/pkg/scaffold/v2/certmanager/kustomize.go @@ -36,7 +36,7 @@ func (p *Kustomization) GetInput() (input.Input, error) { return p.Input, nil } -var kustomizationTemplate = `resources: +const kustomizationTemplate = `resources: - certificate.yaml configurations: diff --git a/pkg/scaffold/v2/certmanager/kustomizeconfig.go b/pkg/scaffold/v2/certmanager/kustomizeconfig.go index ab91ffe877e..c2f5ab43721 100644 --- a/pkg/scaffold/v2/certmanager/kustomizeconfig.go +++ b/pkg/scaffold/v2/certmanager/kustomizeconfig.go @@ -36,7 +36,7 @@ func (p *KustomizeConfig) GetInput() (input.Input, error) { return p.Input, nil } -var kustomizeConfigTemplate = `# This configuration is for teaching kustomize how to update name ref and var substitution +const kustomizeConfigTemplate = `# This configuration is for teaching kustomize how to update name ref and var substitution nameReference: - kind: Issuer group: cert-manager.io diff --git a/pkg/scaffold/v2/controller.go b/pkg/scaffold/v2/controller.go index e94ccbc912b..ed7cf5a0e7d 100644 --- a/pkg/scaffold/v2/controller.go +++ b/pkg/scaffold/v2/controller.go @@ -64,7 +64,7 @@ func (a *Controller) GetInput() (input.Input, error) { return a.Input, nil } -var controllerTemplate = `{{ .Boilerplate }} +const controllerTemplate = `{{ .Boilerplate }} package controllers diff --git a/pkg/scaffold/v2/controller_suitetest.go b/pkg/scaffold/v2/controller_suitetest.go index 2b5ac9487eb..739ed9436ac 100644 --- a/pkg/scaffold/v2/controller_suitetest.go +++ b/pkg/scaffold/v2/controller_suitetest.go @@ -61,7 +61,7 @@ func (v *ControllerSuiteTest) Validate() error { return v.Resource.Validate() } -var controllerSuiteTestTemplate = `{{ .Boilerplate }} +const controllerSuiteTestTemplate = `{{ .Boilerplate }} package controllers diff --git a/pkg/scaffold/v2/crd/enablecainjection_patch.go b/pkg/scaffold/v2/crd/enablecainjection_patch.go index 9a6b46511b6..dc6f108c03d 100644 --- a/pkg/scaffold/v2/crd/enablecainjection_patch.go +++ b/pkg/scaffold/v2/crd/enablecainjection_patch.go @@ -51,7 +51,7 @@ func (g *EnableCAInjectionPatch) Validate() error { return g.Resource.Validate() } -var EnableCAInjectionPatchTemplate = `# The following patch adds a directive for certmanager to inject CA into the CRD +const EnableCAInjectionPatchTemplate = `# The following patch adds a directive for certmanager to inject CA into the CRD # CRD conversion requires k8s 1.13 or later. apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition diff --git a/pkg/scaffold/v2/crd/enablewebhook_patch.go b/pkg/scaffold/v2/crd/enablewebhook_patch.go index 3e4d62dd120..ecea1742682 100644 --- a/pkg/scaffold/v2/crd/enablewebhook_patch.go +++ b/pkg/scaffold/v2/crd/enablewebhook_patch.go @@ -51,7 +51,7 @@ func (g *EnableWebhookPatch) Validate() error { return g.Resource.Validate() } -var enableWebhookPatchTemplate = `# The following patch enables conversion webhook for CRD +const enableWebhookPatchTemplate = `# The following patch enables conversion webhook for CRD # CRD conversion requires k8s 1.13 or later. apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition diff --git a/pkg/scaffold/v2/crd/kustomizeconfig.go b/pkg/scaffold/v2/crd/kustomizeconfig.go index c88d75e2af1..8aea3899e3c 100644 --- a/pkg/scaffold/v2/crd/kustomizeconfig.go +++ b/pkg/scaffold/v2/crd/kustomizeconfig.go @@ -39,7 +39,7 @@ func (c *KustomizeConfig) GetInput() (input.Input, error) { return c.Input, nil } -var kustomizeConfigTemplate = `# This file is for teaching kustomize how to substitute name and namespace reference in CRD +const kustomizeConfigTemplate = `# This file is for teaching kustomize how to substitute name and namespace reference in CRD nameReference: - kind: Service version: v1 diff --git a/pkg/scaffold/v2/crd_sample.go b/pkg/scaffold/v2/crd_sample.go index bb67fa5124e..baa2569a83a 100644 --- a/pkg/scaffold/v2/crd_sample.go +++ b/pkg/scaffold/v2/crd_sample.go @@ -52,7 +52,7 @@ func (c *CRDSample) Validate() error { return c.Resource.Validate() } -var crdSampleTemplate = `apiVersion: {{ .Resource.Group }}.{{ .Domain }}/{{ .Resource.Version }} +const crdSampleTemplate = `apiVersion: {{ .Resource.Group }}.{{ .Domain }}/{{ .Resource.Version }} kind: {{ .Resource.Kind }} metadata: name: {{ lower .Resource.Kind }}-sample diff --git a/pkg/scaffold/v2/dockerfile.go b/pkg/scaffold/v2/dockerfile.go index 65ad82c0ee0..8447eb09bb5 100644 --- a/pkg/scaffold/v2/dockerfile.go +++ b/pkg/scaffold/v2/dockerfile.go @@ -36,7 +36,7 @@ func (c *Dockerfile) GetInput() (input.Input, error) { return c.Input, nil } -var dockerfileTemplate = `# Build the manager binary +const dockerfileTemplate = `# Build the manager binary FROM golang:1.13 as builder WORKDIR /workspace diff --git a/pkg/scaffold/v2/gomod.go b/pkg/scaffold/v2/gomod.go index 7270ba7a0b6..4721d487ff4 100644 --- a/pkg/scaffold/v2/gomod.go +++ b/pkg/scaffold/v2/gomod.go @@ -38,7 +38,7 @@ func (g *GoMod) GetInput() (input.Input, error) { return g.Input, nil } -var goModTemplate = ` +const goModTemplate = ` module {{ .Repo }} go 1.13 diff --git a/pkg/scaffold/v2/group.go b/pkg/scaffold/v2/group.go index 950aac605fb..d40d577d17b 100644 --- a/pkg/scaffold/v2/group.go +++ b/pkg/scaffold/v2/group.go @@ -47,7 +47,7 @@ func (g *Group) Validate() error { return g.Resource.Validate() } -var groupTemplate = `{{ .Boilerplate }} +const groupTemplate = `{{ .Boilerplate }} // Package {{.Resource.Version}} contains API Schema definitions for the {{ .Resource.GroupImportSafe }} {{.Resource.Version}} API group // +kubebuilder:object:generate=true diff --git a/pkg/scaffold/v2/kustomize.go b/pkg/scaffold/v2/kustomize.go index 075e545489c..7060a49f755 100644 --- a/pkg/scaffold/v2/kustomize.go +++ b/pkg/scaffold/v2/kustomize.go @@ -51,7 +51,7 @@ func (c *Kustomize) GetInput() (input.Input, error) { return c.Input, nil } -var kustomizeTemplate = `# Adds namespace to all resources. +const kustomizeTemplate = `# Adds namespace to all resources. namespace: {{.Prefix}}-system # Value of this field is prepended to the diff --git a/pkg/scaffold/v2/leaderelectionrole.go b/pkg/scaffold/v2/leaderelectionrole.go index d43e32ffd18..fb05ae329f2 100644 --- a/pkg/scaffold/v2/leaderelectionrole.go +++ b/pkg/scaffold/v2/leaderelectionrole.go @@ -38,7 +38,7 @@ func (r *LeaderElectionRole) GetInput() (input.Input, error) { return r.Input, nil } -var leaderElectionRoleTemplate = `# permissions to do leader election. +const leaderElectionRoleTemplate = `# permissions to do leader election. apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: diff --git a/pkg/scaffold/v2/leaderelectionrolebinding.go b/pkg/scaffold/v2/leaderelectionrolebinding.go index e2f30643cf9..bc745977681 100644 --- a/pkg/scaffold/v2/leaderelectionrolebinding.go +++ b/pkg/scaffold/v2/leaderelectionrolebinding.go @@ -38,7 +38,7 @@ func (r *LeaderElectionRoleBinding) GetInput() (input.Input, error) { return r.Input, nil } -var leaderElectionRoleBindingTemplate = `apiVersion: rbac.authorization.k8s.io/v1 +const leaderElectionRoleBindingTemplate = `apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: leader-election-rolebinding diff --git a/pkg/scaffold/v2/makefile.go b/pkg/scaffold/v2/makefile.go index dc9973acbd7..fb15c8038d2 100644 --- a/pkg/scaffold/v2/makefile.go +++ b/pkg/scaffold/v2/makefile.go @@ -44,7 +44,7 @@ func (c *Makefile) GetInput() (input.Input, error) { return c.Input, nil } -var makefileTemplate = ` +const makefileTemplate = ` # Image URL to use all building/pushing image targets IMG ?= {{ .Image }} # Produce CRDs that work back to Kubernetes 1.11 (no version conversion) diff --git a/pkg/scaffold/v2/manager/config.go b/pkg/scaffold/v2/manager/config.go index c3cf66435a3..efd5beddec0 100644 --- a/pkg/scaffold/v2/manager/config.go +++ b/pkg/scaffold/v2/manager/config.go @@ -40,7 +40,7 @@ func (c *Config) GetInput() (input.Input, error) { return c.Input, nil } -var configTemplate = `apiVersion: v1 +const configTemplate = `apiVersion: v1 kind: Namespace metadata: labels: diff --git a/pkg/scaffold/v2/manager/kustomization.go b/pkg/scaffold/v2/manager/kustomization.go index 91958d96b44..26bfbe64dc1 100644 --- a/pkg/scaffold/v2/manager/kustomization.go +++ b/pkg/scaffold/v2/manager/kustomization.go @@ -39,6 +39,6 @@ func (c *Kustomization) GetInput() (input.Input, error) { return c.Input, nil } -var kustomizeManagerTemplate = `resources: +const kustomizeManagerTemplate = `resources: - manager.yaml ` diff --git a/pkg/scaffold/v2/metricsauth/kustomize_auth_proxy_patch.go b/pkg/scaffold/v2/metricsauth/kustomize_auth_proxy_patch.go index 5fd520b5d8c..d7aaa06482e 100644 --- a/pkg/scaffold/v2/metricsauth/kustomize_auth_proxy_patch.go +++ b/pkg/scaffold/v2/metricsauth/kustomize_auth_proxy_patch.go @@ -40,7 +40,7 @@ func (c *KustomizeAuthProxyPatch) GetInput() (input.Input, error) { return c.Input, nil } -var kustomizeAuthProxyPatchTemplate = `# This patch inject a sidecar container which is a HTTP proxy for the controller manager, +const kustomizeAuthProxyPatchTemplate = `# This patch inject a sidecar container which is a HTTP proxy for the controller manager, # it performs RBAC authorization against the Kubernetes API using SubjectAccessReviews. apiVersion: apps/v1 kind: Deployment diff --git a/pkg/scaffold/v2/mgrrolebinding.go b/pkg/scaffold/v2/mgrrolebinding.go index 1b55bc683eb..a9a7f36758f 100644 --- a/pkg/scaffold/v2/mgrrolebinding.go +++ b/pkg/scaffold/v2/mgrrolebinding.go @@ -38,7 +38,7 @@ func (r *ManagerRoleBinding) GetInput() (input.Input, error) { return r.Input, nil } -var managerBindingTemplate = `apiVersion: rbac.authorization.k8s.io/v1 +const managerBindingTemplate = `apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: manager-rolebinding @@ -51,4 +51,3 @@ subjects: name: default namespace: system ` - diff --git a/pkg/scaffold/v2/prometheus/kustomize.go b/pkg/scaffold/v2/prometheus/kustomize.go index 3b2ca9bb382..7e8eb2a6880 100644 --- a/pkg/scaffold/v2/prometheus/kustomize.go +++ b/pkg/scaffold/v2/prometheus/kustomize.go @@ -35,7 +35,6 @@ func (p *Kustomization) GetInput() (input.Input, error) { return p.Input, nil } -var kustomizationTemplate = `resources: +const kustomizationTemplate = `resources: - monitor.yaml ` - diff --git a/pkg/scaffold/v2/prometheus/monitor.go b/pkg/scaffold/v2/prometheus/monitor.go index 7af9798faa2..f223c467cfb 100644 --- a/pkg/scaffold/v2/prometheus/monitor.go +++ b/pkg/scaffold/v2/prometheus/monitor.go @@ -19,7 +19,7 @@ func (p *PrometheusServiceMonitor) GetInput() (input.Input, error) { return p.Input, nil } -var monitorTemplate = ` +const monitorTemplate = ` # Prometheus Monitor Service (Metrics) apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor diff --git a/pkg/scaffold/v2/rbac.go b/pkg/scaffold/v2/rbac.go index 5c9aca89772..cb6826ad2be 100644 --- a/pkg/scaffold/v2/rbac.go +++ b/pkg/scaffold/v2/rbac.go @@ -39,7 +39,7 @@ func (c *KustomizeRBAC) GetInput() (input.Input, error) { return c.Input, nil } -var kustomizeRBACTemplate = `resources: +const kustomizeRBACTemplate = `resources: - role.yaml - role_binding.yaml - leader_election_role.yaml diff --git a/pkg/scaffold/v2/types.go b/pkg/scaffold/v2/types.go index 6101b8705ee..352b30cfebe 100644 --- a/pkg/scaffold/v2/types.go +++ b/pkg/scaffold/v2/types.go @@ -51,7 +51,7 @@ func (t *Types) Validate() error { return t.Resource.Validate() } -var typesTemplate = `{{ .Boilerplate }} +const typesTemplate = `{{ .Boilerplate }} package {{ .Resource.Version }} diff --git a/pkg/scaffold/v2/webhook/enablecainection_patch.go b/pkg/scaffold/v2/webhook/enablecainection_patch.go index 242927bbc00..f9115e2df6b 100644 --- a/pkg/scaffold/v2/webhook/enablecainection_patch.go +++ b/pkg/scaffold/v2/webhook/enablecainection_patch.go @@ -39,7 +39,7 @@ func (c *InjectCAPatch) GetInput() (input.Input, error) { return c.Input, nil } -var injectCAPatchTemplate = `# This patch add annotation to admission webhook config and +const injectCAPatchTemplate = `# This patch add annotation to admission webhook config and # the variables $(CERTIFICATE_NAMESPACE) and $(CERTIFICATE_NAME) will be substituted by kustomize. apiVersion: admissionregistration.k8s.io/v1beta1 kind: MutatingWebhookConfiguration diff --git a/pkg/scaffold/v2/webhook/kustomization.go b/pkg/scaffold/v2/webhook/kustomization.go index 51ca6b599e1..4562b4ff52a 100644 --- a/pkg/scaffold/v2/webhook/kustomization.go +++ b/pkg/scaffold/v2/webhook/kustomization.go @@ -39,7 +39,7 @@ func (c *Kustomization) GetInput() (input.Input, error) { return c.Input, nil } -var KustomizeWebhookTemplate = `resources: +const KustomizeWebhookTemplate = `resources: - manifests.yaml - service.yaml diff --git a/pkg/scaffold/v2/webhook/kustomizeconfig.go b/pkg/scaffold/v2/webhook/kustomizeconfig.go index c2917f2b2e4..b65baed7d5d 100644 --- a/pkg/scaffold/v2/webhook/kustomizeconfig.go +++ b/pkg/scaffold/v2/webhook/kustomizeconfig.go @@ -39,7 +39,7 @@ func (c *KustomizeConfigWebhook) GetInput() (input.Input, error) { return c.Input, nil } -var KustomizeConfigWebhookTemplate = `# the following config is for teaching kustomize where to look at when substituting vars. +const KustomizeConfigWebhookTemplate = `# the following config is for teaching kustomize where to look at when substituting vars. # It requires kustomize v2.1.0 or newer to work properly. nameReference: - kind: Service diff --git a/pkg/scaffold/v2/webhook/service.go b/pkg/scaffold/v2/webhook/service.go index 012bb8a83ba..7fcb804fec0 100644 --- a/pkg/scaffold/v2/webhook/service.go +++ b/pkg/scaffold/v2/webhook/service.go @@ -39,7 +39,7 @@ func (c *Service) GetInput() (input.Input, error) { return c.Input, nil } -var ServiceTemplate = ` +const ServiceTemplate = ` apiVersion: v1 kind: Service metadata: diff --git a/pkg/scaffold/v2/webhook_manager_patch.go b/pkg/scaffold/v2/webhook_manager_patch.go index df5de84efbe..3abcebe965a 100644 --- a/pkg/scaffold/v2/webhook_manager_patch.go +++ b/pkg/scaffold/v2/webhook_manager_patch.go @@ -36,7 +36,7 @@ func (p *ManagerWebhookPatch) GetInput() (input.Input, error) { return p.Input, nil } -var ManagerWebhookPatchTemplate = `apiVersion: apps/v1 +const ManagerWebhookPatchTemplate = `apiVersion: apps/v1 kind: Deployment metadata: name: controller-manager diff --git a/plugins/addon/controller.go b/plugins/addon/controller.go index fd28c9ee1fa..7772ccfc7fa 100644 --- a/plugins/addon/controller.go +++ b/plugins/addon/controller.go @@ -28,7 +28,7 @@ func ReplaceController(u *model.Universe) error { return nil } -var controllerTemplate = `{{ .Boilerplate }} +const controllerTemplate = `{{ .Boilerplate }} package controllers diff --git a/plugins/addon/type.go b/plugins/addon/type.go index cd2fc5914a8..a6a6655223f 100644 --- a/plugins/addon/type.go +++ b/plugins/addon/type.go @@ -37,7 +37,7 @@ func JSONTag(tag string) string { // Resource.Resource -var typesTemplate = `{{ .Boilerplate }} +const typesTemplate = `{{ .Boilerplate }} package {{ .Resource.Version }}