From f91b01781b1e9e394a3b48538c0002c9c6349327 Mon Sep 17 00:00:00 2001 From: Adrian Orive Date: Mon, 30 Nov 2020 08:54:21 +0100 Subject: [PATCH 1/3] Backport go mod compatibility for v2.3 Signed-off-by: Adrian Orive --- build/.goreleaser.yml | 2 +- cmd/api.go | 12 +++++----- cmd/edit.go | 4 ++-- cmd/init.go | 6 ++--- cmd/internal/config.go | 2 +- cmd/main.go | 8 +++---- cmd/update.go | 4 ++-- cmd/webhook.go | 8 +++---- common.sh | 2 +- generate_testdata.sh | 2 +- generate_vendor.sh | 2 +- go.mod | 2 +- internal/config/config.go | 2 +- pkg/model/file/interfaces.go | 2 +- pkg/model/file/mixins.go | 2 +- pkg/model/resource/options.go | 2 +- pkg/model/resource/options_test.go | 2 +- pkg/model/resource/resource.go | 2 +- pkg/model/resource/resource_test.go | 4 ++-- pkg/model/universe.go | 6 ++--- pkg/scaffold/api.go | 18 +++++++------- pkg/scaffold/edit.go | 2 +- pkg/scaffold/init.go | 24 +++++++++---------- pkg/scaffold/internal/machinery/scaffold.go | 6 ++--- .../internal/machinery/scaffold_test.go | 6 ++--- .../internal/templates/v1/authproxyrole.go | 2 +- .../templates/v1/authproxyrolebinding.go | 2 +- .../internal/templates/v1/authproxyservice.go | 2 +- .../internal/templates/v1/boilerplate.go | 2 +- .../internal/templates/v1/controller/add.go | 2 +- .../templates/v1/controller/controller.go | 2 +- .../v1/controller/controllersuitetest.go | 2 +- .../templates/v1/controller/controllertest.go | 2 +- .../internal/templates/v1/crd/addtoscheme.go | 2 +- .../internal/templates/v1/crd/crd_sample.go | 2 +- pkg/scaffold/internal/templates/v1/crd/doc.go | 2 +- .../internal/templates/v1/crd/group.go | 2 +- .../internal/templates/v1/crd/register.go | 2 +- .../internal/templates/v1/crd/types.go | 2 +- .../internal/templates/v1/crd/typestest.go | 2 +- .../templates/v1/crd/version_suitetest.go | 2 +- .../internal/templates/v1/gitignore.go | 2 +- pkg/scaffold/internal/templates/v1/gopkg.go | 2 +- .../internal/templates/v1/kustomize.go | 2 +- .../templates/v1/kustomize_image_patch.go | 2 +- .../templates/v1/kustomize_manager_base.go | 2 +- .../templates/v1/kustomize_rbac_base.go | 2 +- .../internal/templates/v1/makefile.go | 2 +- .../internal/templates/v1/manager/apis.go | 2 +- .../internal/templates/v1/manager/cmd.go | 2 +- .../internal/templates/v1/manager/config.go | 2 +- .../templates/v1/manager/controller.go | 2 +- .../templates/v1/manager/dockerfile.go | 2 +- .../internal/templates/v1/manager/webhook.go | 2 +- .../metricsauth/kustomize_auth_proxy_patch.go | 2 +- .../v1/metricsauth/kustomize_metrics_patch.go | 2 +- .../webhook/add_admissionbuilder_handler.go | 2 +- .../templates/v1/webhook/add_server.go | 2 +- .../templates/v1/webhook/admissionbuilder.go | 2 +- .../templates/v1/webhook/admissionhandler.go | 2 +- .../templates/v1/webhook/admissionwebhooks.go | 2 +- .../internal/templates/v1/webhook/server.go | 2 +- .../internal/templates/v2/authproxyrole.go | 2 +- .../templates/v2/authproxyrolebinding.go | 2 +- .../internal/templates/v2/boilerplate.go | 2 +- .../templates/v2/certmanager/certificate.go | 2 +- .../templates/v2/certmanager/kustomize.go | 2 +- .../v2/certmanager/kustomizeconfig.go | 2 +- .../templates/v2/controller/controller.go | 2 +- .../v2/controller/controller_suitetest.go | 2 +- .../v2/crd/enablecainjection_patch.go | 2 +- .../templates/v2/crd/enablewebhook_patch.go | 2 +- .../templates/v2/crd/kustomization.go | 2 +- .../templates/v2/crd/kustomizeconfig.go | 2 +- .../internal/templates/v2/crd_editor_rbac.go | 2 +- .../internal/templates/v2/crd_sample.go | 2 +- .../internal/templates/v2/crd_viewer_rbac.go | 2 +- .../internal/templates/v2/dockerfile.go | 2 +- .../internal/templates/v2/gitignore.go | 2 +- pkg/scaffold/internal/templates/v2/gomod.go | 2 +- pkg/scaffold/internal/templates/v2/group.go | 2 +- .../internal/templates/v2/kustomize.go | 2 +- .../templates/v2/leaderelectionrole.go | 2 +- .../templates/v2/leaderelectionrolebinding.go | 2 +- pkg/scaffold/internal/templates/v2/main.go | 2 +- .../internal/templates/v2/makefile.go | 2 +- .../internal/templates/v2/manager/config.go | 2 +- .../templates/v2/manager/kustomization.go | 2 +- .../v2/metricsauth/auth_proxy_patch.go | 2 +- .../v2/metricsauth/authproxyservice.go | 2 +- .../v2/metricsauth/clientclusterrole.go | 2 +- .../internal/templates/v2/mgrrolebinding.go | 2 +- .../templates/v2/prometheus/kustomize.go | 2 +- .../templates/v2/prometheus/monitor.go | 2 +- pkg/scaffold/internal/templates/v2/rbac.go | 2 +- pkg/scaffold/internal/templates/v2/types.go | 2 +- .../v2/webhook/enablecainection_patch.go | 2 +- .../templates/v2/webhook/kustomization.go | 2 +- .../templates/v2/webhook/kustomizeconfig.go | 2 +- .../internal/templates/v2/webhook/service.go | 2 +- .../internal/templates/v2/webhook/webhook.go | 2 +- .../templates/v2/webhook_manager_patch.go | 2 +- pkg/scaffold/update.go | 8 +++---- pkg/scaffold/webhook.go | 16 ++++++------- plugins/addon/channel.go | 4 ++-- plugins/addon/controller.go | 4 ++-- plugins/addon/helpers.go | 4 ++-- plugins/addon/manifest.go | 4 ++-- plugins/addon/plugin.go | 2 +- plugins/addon/type.go | 4 ++-- test/e2e/v1/e2e_suite.go | 2 +- test/e2e/v2/e2e_suite.go | 2 +- 112 files changed, 168 insertions(+), 168 deletions(-) diff --git a/build/.goreleaser.yml b/build/.goreleaser.yml index a72cde8404a..b699f9c40ae 100644 --- a/build/.goreleaser.yml +++ b/build/.goreleaser.yml @@ -17,7 +17,7 @@ builds: - main: ./cmd binary: kubebuilder - ldflags: -s -X sigs.k8s.io/kubebuilder/cmd/version.kubeBuilderVersion={{.Version}} -X sigs.k8s.io/kubebuilder/cmd/version.gitCommit={{.Commit}} -X sigs.k8s.io/kubebuilder/cmd/version.buildDate={{.Date}} -X sigs.k8s.io/kubebuilder/cmd/version.kubernetesVendorVersion={{.Env.KUBERNETES_VERSION}} + ldflags: -s -X sigs.k8s.io/kubebuilder/v2/cmd/version.kubeBuilderVersion={{.Version}} -X sigs.k8s.io/kubebuilder/v2/cmd/version.gitCommit={{.Commit}} -X sigs.k8s.io/kubebuilder/v2/cmd/version.buildDate={{.Date}} -X sigs.k8s.io/kubebuilder/v2/cmd/version.kubernetesVendorVersion={{.Env.KUBERNETES_VERSION}} goos: - darwin - linux diff --git a/cmd/api.go b/cmd/api.go index d3c998b113c..0cabf4b2a5a 100644 --- a/cmd/api.go +++ b/cmd/api.go @@ -29,12 +29,12 @@ import ( "github.com/spf13/cobra" flag "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/cmd/internal" - "sigs.k8s.io/kubebuilder/internal/config" - "sigs.k8s.io/kubebuilder/pkg/model" - "sigs.k8s.io/kubebuilder/pkg/model/resource" - "sigs.k8s.io/kubebuilder/pkg/scaffold" - "sigs.k8s.io/kubebuilder/plugins/addon" + "sigs.k8s.io/kubebuilder/v2/cmd/internal" + "sigs.k8s.io/kubebuilder/v2/internal/config" + "sigs.k8s.io/kubebuilder/v2/pkg/model" + "sigs.k8s.io/kubebuilder/v2/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v2/pkg/scaffold" + "sigs.k8s.io/kubebuilder/v2/plugins/addon" ) type apiError struct { diff --git a/cmd/edit.go b/cmd/edit.go index cd66d543f47..fef44e3837f 100644 --- a/cmd/edit.go +++ b/cmd/edit.go @@ -24,8 +24,8 @@ import ( "github.com/spf13/cobra" - "sigs.k8s.io/kubebuilder/internal/config" - "sigs.k8s.io/kubebuilder/pkg/scaffold" + "sigs.k8s.io/kubebuilder/v2/internal/config" + "sigs.k8s.io/kubebuilder/v2/pkg/scaffold" ) type editError struct { diff --git a/cmd/init.go b/cmd/init.go index 6a6bc3e0bf0..2868e795d0c 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -29,9 +29,9 @@ import ( "github.com/spf13/cobra" flag "github.com/spf13/pflag" - "sigs.k8s.io/kubebuilder/cmd/internal" - "sigs.k8s.io/kubebuilder/internal/config" - "sigs.k8s.io/kubebuilder/pkg/scaffold" + "sigs.k8s.io/kubebuilder/v2/cmd/internal" + "sigs.k8s.io/kubebuilder/v2/internal/config" + "sigs.k8s.io/kubebuilder/v2/pkg/scaffold" ) type initError struct { diff --git a/cmd/internal/config.go b/cmd/internal/config.go index 04313dd6ea6..7956504f0f2 100644 --- a/cmd/internal/config.go +++ b/cmd/internal/config.go @@ -21,7 +21,7 @@ import ( "log" "os" - "sigs.k8s.io/kubebuilder/internal/config" + "sigs.k8s.io/kubebuilder/v2/internal/config" ) const ( diff --git a/cmd/main.go b/cmd/main.go index f90a75ea848..fcc228094ab 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/cobra" - "sigs.k8s.io/kubebuilder/cmd/internal" - "sigs.k8s.io/kubebuilder/cmd/version" - "sigs.k8s.io/kubebuilder/internal/config" - "sigs.k8s.io/kubebuilder/pkg/scaffold" + "sigs.k8s.io/kubebuilder/v2/cmd/internal" + "sigs.k8s.io/kubebuilder/v2/cmd/version" + "sigs.k8s.io/kubebuilder/v2/internal/config" + "sigs.k8s.io/kubebuilder/v2/pkg/scaffold" ) // commandOptions represent the types used to implement the different commands diff --git a/cmd/update.go b/cmd/update.go index 12a3f20fafd..83885bd95f3 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -24,8 +24,8 @@ import ( "github.com/spf13/cobra" - "sigs.k8s.io/kubebuilder/internal/config" - "sigs.k8s.io/kubebuilder/pkg/scaffold" + "sigs.k8s.io/kubebuilder/v2/internal/config" + "sigs.k8s.io/kubebuilder/v2/pkg/scaffold" ) type updateError struct { diff --git a/cmd/webhook.go b/cmd/webhook.go index 6a0af27d6fb..e6282df56a0 100644 --- a/cmd/webhook.go +++ b/cmd/webhook.go @@ -26,10 +26,10 @@ import ( "github.com/spf13/cobra" - "sigs.k8s.io/kubebuilder/cmd/internal" - "sigs.k8s.io/kubebuilder/internal/config" - "sigs.k8s.io/kubebuilder/pkg/model/resource" - "sigs.k8s.io/kubebuilder/pkg/scaffold" + "sigs.k8s.io/kubebuilder/v2/cmd/internal" + "sigs.k8s.io/kubebuilder/v2/internal/config" + "sigs.k8s.io/kubebuilder/v2/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v2/pkg/scaffold" ) type webhookError struct { diff --git a/common.sh b/common.sh index d187bb48092..8b2ac5a355a 100644 --- a/common.sh +++ b/common.sh @@ -149,7 +149,7 @@ function build_kb { opts="" else # TODO: what does this thing do. - opts=-ldflags "-X sigs.k8s.io/kubebuilder/cmd/version.kubeBuilderVersion=$INJECT_KB_VERSION" + opts=-ldflags "-X sigs.k8s.io/kubebuilder/v2/cmd/version.kubeBuilderVersion=$INJECT_KB_VERSION" fi GO111MODULE=on go build $opts -o $tmp_root/kubebuilder/bin/kubebuilder ./cmd diff --git a/generate_testdata.sh b/generate_testdata.sh index 79643f156ab..e50ee6f6b5b 100755 --- a/generate_testdata.sh +++ b/generate_testdata.sh @@ -19,7 +19,7 @@ set -e source common.sh build_kb() { - go build -o ./bin/kubebuilder sigs.k8s.io/kubebuilder/cmd + go build -o ./bin/kubebuilder sigs.k8s.io/kubebuilder/v2/cmd } diff --git a/generate_vendor.sh b/generate_vendor.sh index 2b1d125a152..c6ddbde6862 100755 --- a/generate_vendor.sh +++ b/generate_vendor.sh @@ -34,7 +34,7 @@ fi build_kb() { rm -f /tmp/kb && \ - GO111MODULE=on go build -o /tmp/kb sigs.k8s.io/kubebuilder/cmd + GO111MODULE=on go build -o /tmp/kb sigs.k8s.io/kubebuilder/v2/cmd } diff --git a/go.mod b/go.mod index ee7927c8664..f3edeec8fa1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module sigs.k8s.io/kubebuilder +module sigs.k8s.io/kubebuilder/v2 go 1.13 diff --git a/internal/config/config.go b/internal/config/config.go index 412c49ec0d2..4582a96d879 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -22,7 +22,7 @@ import ( "io/ioutil" "os" - "sigs.k8s.io/kubebuilder/pkg/model/config" + "sigs.k8s.io/kubebuilder/v2/pkg/model/config" "sigs.k8s.io/yaml" ) diff --git a/pkg/model/file/interfaces.go b/pkg/model/file/interfaces.go index 3408ce47fb6..cbb5426f36c 100644 --- a/pkg/model/file/interfaces.go +++ b/pkg/model/file/interfaces.go @@ -19,7 +19,7 @@ package file import ( "text/template" - "sigs.k8s.io/kubebuilder/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v2/pkg/model/resource" ) // Builder defines the basic methods that any file builder must implement diff --git a/pkg/model/file/mixins.go b/pkg/model/file/mixins.go index c3b6243491c..ed59abb0137 100644 --- a/pkg/model/file/mixins.go +++ b/pkg/model/file/mixins.go @@ -17,7 +17,7 @@ limitations under the License. package file import ( - "sigs.k8s.io/kubebuilder/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v2/pkg/model/resource" ) // PathMixin provides file builders with a path field diff --git a/pkg/model/resource/options.go b/pkg/model/resource/options.go index 0a651cd87ca..74e4d88721e 100644 --- a/pkg/model/resource/options.go +++ b/pkg/model/resource/options.go @@ -26,7 +26,7 @@ import ( "github.com/gobuffalo/flect" - "sigs.k8s.io/kubebuilder/pkg/model/config" + "sigs.k8s.io/kubebuilder/v2/pkg/model/config" ) const ( diff --git a/pkg/model/resource/options_test.go b/pkg/model/resource/options_test.go index 494652f5ea4..be1a884b7e5 100644 --- a/pkg/model/resource/options_test.go +++ b/pkg/model/resource/options_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" - . "sigs.k8s.io/kubebuilder/pkg/model/resource" + . "sigs.k8s.io/kubebuilder/v2/pkg/model/resource" ) var _ = Describe("Resource Options", func() { diff --git a/pkg/model/resource/resource.go b/pkg/model/resource/resource.go index dee7e5ee1c0..704d015e547 100644 --- a/pkg/model/resource/resource.go +++ b/pkg/model/resource/resource.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "sigs.k8s.io/kubebuilder/pkg/model/config" + "sigs.k8s.io/kubebuilder/v2/pkg/model/config" ) // Resource contains the information required to scaffold files for a resource. diff --git a/pkg/model/resource/resource_test.go b/pkg/model/resource/resource_test.go index 4b74f2953b1..6b28f50b4e5 100644 --- a/pkg/model/resource/resource_test.go +++ b/pkg/model/resource/resource_test.go @@ -22,8 +22,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/pkg/model/config" - . "sigs.k8s.io/kubebuilder/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v2/pkg/model/config" + . "sigs.k8s.io/kubebuilder/v2/pkg/model/resource" ) var _ = Describe("Resource", func() { diff --git a/pkg/model/universe.go b/pkg/model/universe.go index 65db8b44839..e7258da63ab 100644 --- a/pkg/model/universe.go +++ b/pkg/model/universe.go @@ -17,9 +17,9 @@ limitations under the License. package model import ( - "sigs.k8s.io/kubebuilder/pkg/model/config" - "sigs.k8s.io/kubebuilder/pkg/model/file" - "sigs.k8s.io/kubebuilder/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v2/pkg/model/config" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/resource" ) // Universe describes the entire state of file generation diff --git a/pkg/scaffold/api.go b/pkg/scaffold/api.go index ffa426a6e1b..5db28cebf1a 100644 --- a/pkg/scaffold/api.go +++ b/pkg/scaffold/api.go @@ -19,15 +19,15 @@ package scaffold import ( "fmt" - "sigs.k8s.io/kubebuilder/internal/config" - "sigs.k8s.io/kubebuilder/pkg/model" - "sigs.k8s.io/kubebuilder/pkg/model/resource" - "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/machinery" - controllerv1 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v1/controller" - crdv1 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v1/crd" - templatesv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2" - controllerv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/controller" - crdv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/crd" + "sigs.k8s.io/kubebuilder/v2/internal/config" + "sigs.k8s.io/kubebuilder/v2/pkg/model" + "sigs.k8s.io/kubebuilder/v2/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/machinery" + controllerv1 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v1/controller" + crdv1 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v1/crd" + templatesv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2" + controllerv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2/controller" + crdv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2/crd" ) var _ Scaffolder = &apiScaffolder{} diff --git a/pkg/scaffold/edit.go b/pkg/scaffold/edit.go index 8e24857c469..48152907591 100644 --- a/pkg/scaffold/edit.go +++ b/pkg/scaffold/edit.go @@ -17,7 +17,7 @@ limitations under the License. package scaffold import ( - "sigs.k8s.io/kubebuilder/internal/config" + "sigs.k8s.io/kubebuilder/v2/internal/config" ) var _ Scaffolder = &editScaffolder{} diff --git a/pkg/scaffold/init.go b/pkg/scaffold/init.go index 2eca79bb30d..38776692d94 100644 --- a/pkg/scaffold/init.go +++ b/pkg/scaffold/init.go @@ -21,18 +21,18 @@ import ( "io/ioutil" "path/filepath" - "sigs.k8s.io/kubebuilder/internal/config" - "sigs.k8s.io/kubebuilder/pkg/model" - "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/machinery" - templatesv1 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v1" - managerv1 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v1/manager" - metricsauthv1 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v1/metricsauth" - templatesv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2" - certmanagerv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/certmanager" - managerv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/manager" - metricsauthv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/metricsauth" - prometheusv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/prometheus" - webhookv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/webhook" + "sigs.k8s.io/kubebuilder/v2/internal/config" + "sigs.k8s.io/kubebuilder/v2/pkg/model" + "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/machinery" + templatesv1 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v1" + managerv1 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v1/manager" + metricsauthv1 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v1/metricsauth" + templatesv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2" + certmanagerv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2/certmanager" + managerv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2/manager" + metricsauthv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2/metricsauth" + prometheusv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2/prometheus" + webhookv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2/webhook" ) const ( diff --git a/pkg/scaffold/internal/machinery/scaffold.go b/pkg/scaffold/internal/machinery/scaffold.go index bb75b9e153f..0490ea08484 100644 --- a/pkg/scaffold/internal/machinery/scaffold.go +++ b/pkg/scaffold/internal/machinery/scaffold.go @@ -27,9 +27,9 @@ import ( "golang.org/x/tools/imports" - "sigs.k8s.io/kubebuilder/pkg/model" - "sigs.k8s.io/kubebuilder/pkg/model/file" - "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/filesystem" + "sigs.k8s.io/kubebuilder/v2/pkg/model" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/filesystem" ) var options = imports.Options{ diff --git a/pkg/scaffold/internal/machinery/scaffold_test.go b/pkg/scaffold/internal/machinery/scaffold_test.go index 066986cc038..58a50ab9323 100644 --- a/pkg/scaffold/internal/machinery/scaffold_test.go +++ b/pkg/scaffold/internal/machinery/scaffold_test.go @@ -23,9 +23,9 @@ import ( . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/pkg/model" - "sigs.k8s.io/kubebuilder/pkg/model/file" - "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/filesystem" + "sigs.k8s.io/kubebuilder/v2/pkg/model" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/filesystem" ) func TestScaffold(t *testing.T) { diff --git a/pkg/scaffold/internal/templates/v1/authproxyrole.go b/pkg/scaffold/internal/templates/v1/authproxyrole.go index ddcb19db5e0..c04a0221838 100644 --- a/pkg/scaffold/internal/templates/v1/authproxyrole.go +++ b/pkg/scaffold/internal/templates/v1/authproxyrole.go @@ -19,7 +19,7 @@ package v1 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &AuthProxyRole{} diff --git a/pkg/scaffold/internal/templates/v1/authproxyrolebinding.go b/pkg/scaffold/internal/templates/v1/authproxyrolebinding.go index cefdda8eac4..c3c9d91fd00 100644 --- a/pkg/scaffold/internal/templates/v1/authproxyrolebinding.go +++ b/pkg/scaffold/internal/templates/v1/authproxyrolebinding.go @@ -19,7 +19,7 @@ package v1 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &AuthProxyRoleBinding{} diff --git a/pkg/scaffold/internal/templates/v1/authproxyservice.go b/pkg/scaffold/internal/templates/v1/authproxyservice.go index 3a9b914d899..f60f8a9a92a 100644 --- a/pkg/scaffold/internal/templates/v1/authproxyservice.go +++ b/pkg/scaffold/internal/templates/v1/authproxyservice.go @@ -19,7 +19,7 @@ package v1 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &AuthProxyService{} diff --git a/pkg/scaffold/internal/templates/v1/boilerplate.go b/pkg/scaffold/internal/templates/v1/boilerplate.go index d693227f790..3c1a3c5f855 100644 --- a/pkg/scaffold/internal/templates/v1/boilerplate.go +++ b/pkg/scaffold/internal/templates/v1/boilerplate.go @@ -21,7 +21,7 @@ import ( "path/filepath" "time" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Boilerplate{} diff --git a/pkg/scaffold/internal/templates/v1/controller/add.go b/pkg/scaffold/internal/templates/v1/controller/add.go index 93371edf22a..598a29a151d 100644 --- a/pkg/scaffold/internal/templates/v1/controller/add.go +++ b/pkg/scaffold/internal/templates/v1/controller/add.go @@ -19,7 +19,7 @@ package controller import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &AddController{} diff --git a/pkg/scaffold/internal/templates/v1/controller/controller.go b/pkg/scaffold/internal/templates/v1/controller/controller.go index ad251c4bb9d..3b168ae28da 100644 --- a/pkg/scaffold/internal/templates/v1/controller/controller.go +++ b/pkg/scaffold/internal/templates/v1/controller/controller.go @@ -20,7 +20,7 @@ import ( "fmt" "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Controller{} diff --git a/pkg/scaffold/internal/templates/v1/controller/controllersuitetest.go b/pkg/scaffold/internal/templates/v1/controller/controllersuitetest.go index df3a290909d..70856b439d7 100644 --- a/pkg/scaffold/internal/templates/v1/controller/controllersuitetest.go +++ b/pkg/scaffold/internal/templates/v1/controller/controllersuitetest.go @@ -19,7 +19,7 @@ package controller import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &SuiteTest{} diff --git a/pkg/scaffold/internal/templates/v1/controller/controllertest.go b/pkg/scaffold/internal/templates/v1/controller/controllertest.go index aa0b87a138d..402c79740fd 100644 --- a/pkg/scaffold/internal/templates/v1/controller/controllertest.go +++ b/pkg/scaffold/internal/templates/v1/controller/controllertest.go @@ -20,7 +20,7 @@ import ( "fmt" "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Test{} diff --git a/pkg/scaffold/internal/templates/v1/crd/addtoscheme.go b/pkg/scaffold/internal/templates/v1/crd/addtoscheme.go index 382447cc9b9..e9d059e5b39 100644 --- a/pkg/scaffold/internal/templates/v1/crd/addtoscheme.go +++ b/pkg/scaffold/internal/templates/v1/crd/addtoscheme.go @@ -19,7 +19,7 @@ package crd import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &AddToScheme{} diff --git a/pkg/scaffold/internal/templates/v1/crd/crd_sample.go b/pkg/scaffold/internal/templates/v1/crd/crd_sample.go index b1a201de3c0..16bcf7401c7 100644 --- a/pkg/scaffold/internal/templates/v1/crd/crd_sample.go +++ b/pkg/scaffold/internal/templates/v1/crd/crd_sample.go @@ -19,7 +19,7 @@ package crd import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &CRDSample{} diff --git a/pkg/scaffold/internal/templates/v1/crd/doc.go b/pkg/scaffold/internal/templates/v1/crd/doc.go index 13d57ed43d1..6493e2735f4 100644 --- a/pkg/scaffold/internal/templates/v1/crd/doc.go +++ b/pkg/scaffold/internal/templates/v1/crd/doc.go @@ -19,7 +19,7 @@ package crd import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Doc{} diff --git a/pkg/scaffold/internal/templates/v1/crd/group.go b/pkg/scaffold/internal/templates/v1/crd/group.go index 85aef6a98ad..7e55e02eb02 100644 --- a/pkg/scaffold/internal/templates/v1/crd/group.go +++ b/pkg/scaffold/internal/templates/v1/crd/group.go @@ -19,7 +19,7 @@ package crd import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Group{} diff --git a/pkg/scaffold/internal/templates/v1/crd/register.go b/pkg/scaffold/internal/templates/v1/crd/register.go index 08306688c76..a48055081b8 100644 --- a/pkg/scaffold/internal/templates/v1/crd/register.go +++ b/pkg/scaffold/internal/templates/v1/crd/register.go @@ -19,7 +19,7 @@ package crd import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Register{} diff --git a/pkg/scaffold/internal/templates/v1/crd/types.go b/pkg/scaffold/internal/templates/v1/crd/types.go index b4a22da4610..03f8907b0c0 100644 --- a/pkg/scaffold/internal/templates/v1/crd/types.go +++ b/pkg/scaffold/internal/templates/v1/crd/types.go @@ -20,7 +20,7 @@ import ( "fmt" "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Types{} diff --git a/pkg/scaffold/internal/templates/v1/crd/typestest.go b/pkg/scaffold/internal/templates/v1/crd/typestest.go index 197d0b8b23f..eff441bfed5 100644 --- a/pkg/scaffold/internal/templates/v1/crd/typestest.go +++ b/pkg/scaffold/internal/templates/v1/crd/typestest.go @@ -20,7 +20,7 @@ import ( "fmt" "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &TypesTest{} diff --git a/pkg/scaffold/internal/templates/v1/crd/version_suitetest.go b/pkg/scaffold/internal/templates/v1/crd/version_suitetest.go index 7a0198efee1..f00e0b6a5e8 100644 --- a/pkg/scaffold/internal/templates/v1/crd/version_suitetest.go +++ b/pkg/scaffold/internal/templates/v1/crd/version_suitetest.go @@ -19,7 +19,7 @@ package crd import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &TypesTest{} diff --git a/pkg/scaffold/internal/templates/v1/gitignore.go b/pkg/scaffold/internal/templates/v1/gitignore.go index a5119a5530f..bf0b9a2a68c 100644 --- a/pkg/scaffold/internal/templates/v1/gitignore.go +++ b/pkg/scaffold/internal/templates/v1/gitignore.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &GitIgnore{} diff --git a/pkg/scaffold/internal/templates/v1/gopkg.go b/pkg/scaffold/internal/templates/v1/gopkg.go index ad19ad5d930..f198a159d2b 100644 --- a/pkg/scaffold/internal/templates/v1/gopkg.go +++ b/pkg/scaffold/internal/templates/v1/gopkg.go @@ -23,7 +23,7 @@ import ( "io/ioutil" "strings" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &GopkgToml{} diff --git a/pkg/scaffold/internal/templates/v1/kustomize.go b/pkg/scaffold/internal/templates/v1/kustomize.go index 5f66ddb4920..a1599bf2300 100644 --- a/pkg/scaffold/internal/templates/v1/kustomize.go +++ b/pkg/scaffold/internal/templates/v1/kustomize.go @@ -21,7 +21,7 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Kustomize{} diff --git a/pkg/scaffold/internal/templates/v1/kustomize_image_patch.go b/pkg/scaffold/internal/templates/v1/kustomize_image_patch.go index 464c883820d..ead2334ac14 100644 --- a/pkg/scaffold/internal/templates/v1/kustomize_image_patch.go +++ b/pkg/scaffold/internal/templates/v1/kustomize_image_patch.go @@ -19,7 +19,7 @@ package v1 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &KustomizeImagePatch{} diff --git a/pkg/scaffold/internal/templates/v1/kustomize_manager_base.go b/pkg/scaffold/internal/templates/v1/kustomize_manager_base.go index 1659c53e266..317f275ead5 100644 --- a/pkg/scaffold/internal/templates/v1/kustomize_manager_base.go +++ b/pkg/scaffold/internal/templates/v1/kustomize_manager_base.go @@ -19,7 +19,7 @@ package v1 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &KustomizeManager{} diff --git a/pkg/scaffold/internal/templates/v1/kustomize_rbac_base.go b/pkg/scaffold/internal/templates/v1/kustomize_rbac_base.go index 7115db70033..4948b6d01f4 100644 --- a/pkg/scaffold/internal/templates/v1/kustomize_rbac_base.go +++ b/pkg/scaffold/internal/templates/v1/kustomize_rbac_base.go @@ -19,7 +19,7 @@ package v1 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &KustomizeRBAC{} diff --git a/pkg/scaffold/internal/templates/v1/makefile.go b/pkg/scaffold/internal/templates/v1/makefile.go index 746c2074066..80af4c29ced 100644 --- a/pkg/scaffold/internal/templates/v1/makefile.go +++ b/pkg/scaffold/internal/templates/v1/makefile.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Makefile{} diff --git a/pkg/scaffold/internal/templates/v1/manager/apis.go b/pkg/scaffold/internal/templates/v1/manager/apis.go index 9e7c7936181..8b25e1fac69 100644 --- a/pkg/scaffold/internal/templates/v1/manager/apis.go +++ b/pkg/scaffold/internal/templates/v1/manager/apis.go @@ -21,7 +21,7 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &APIs{} diff --git a/pkg/scaffold/internal/templates/v1/manager/cmd.go b/pkg/scaffold/internal/templates/v1/manager/cmd.go index e048ea7282c..3bb11eb36d8 100644 --- a/pkg/scaffold/internal/templates/v1/manager/cmd.go +++ b/pkg/scaffold/internal/templates/v1/manager/cmd.go @@ -19,7 +19,7 @@ package manager import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Cmd{} diff --git a/pkg/scaffold/internal/templates/v1/manager/config.go b/pkg/scaffold/internal/templates/v1/manager/config.go index bee783ced28..a98734ed749 100644 --- a/pkg/scaffold/internal/templates/v1/manager/config.go +++ b/pkg/scaffold/internal/templates/v1/manager/config.go @@ -19,7 +19,7 @@ package manager import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Config{} diff --git a/pkg/scaffold/internal/templates/v1/manager/controller.go b/pkg/scaffold/internal/templates/v1/manager/controller.go index b4ec536e0ce..1e39dc84480 100644 --- a/pkg/scaffold/internal/templates/v1/manager/controller.go +++ b/pkg/scaffold/internal/templates/v1/manager/controller.go @@ -19,7 +19,7 @@ package manager import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Controller{} diff --git a/pkg/scaffold/internal/templates/v1/manager/dockerfile.go b/pkg/scaffold/internal/templates/v1/manager/dockerfile.go index 91b673d0b53..10129075560 100644 --- a/pkg/scaffold/internal/templates/v1/manager/dockerfile.go +++ b/pkg/scaffold/internal/templates/v1/manager/dockerfile.go @@ -17,7 +17,7 @@ limitations under the License. package manager import ( - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Dockerfile{} diff --git a/pkg/scaffold/internal/templates/v1/manager/webhook.go b/pkg/scaffold/internal/templates/v1/manager/webhook.go index bef81f89536..b33b22152ba 100644 --- a/pkg/scaffold/internal/templates/v1/manager/webhook.go +++ b/pkg/scaffold/internal/templates/v1/manager/webhook.go @@ -19,7 +19,7 @@ package manager import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Webhook{} diff --git a/pkg/scaffold/internal/templates/v1/metricsauth/kustomize_auth_proxy_patch.go b/pkg/scaffold/internal/templates/v1/metricsauth/kustomize_auth_proxy_patch.go index 7f8f15c3c6e..8c470b6e1ba 100644 --- a/pkg/scaffold/internal/templates/v1/metricsauth/kustomize_auth_proxy_patch.go +++ b/pkg/scaffold/internal/templates/v1/metricsauth/kustomize_auth_proxy_patch.go @@ -19,7 +19,7 @@ package metricsauth import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &KustomizeAuthProxyPatch{} diff --git a/pkg/scaffold/internal/templates/v1/metricsauth/kustomize_metrics_patch.go b/pkg/scaffold/internal/templates/v1/metricsauth/kustomize_metrics_patch.go index 81d4fc50e40..6558e095151 100644 --- a/pkg/scaffold/internal/templates/v1/metricsauth/kustomize_metrics_patch.go +++ b/pkg/scaffold/internal/templates/v1/metricsauth/kustomize_metrics_patch.go @@ -19,7 +19,7 @@ package metricsauth import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &KustomizePrometheusMetricsPatch{} diff --git a/pkg/scaffold/internal/templates/v1/webhook/add_admissionbuilder_handler.go b/pkg/scaffold/internal/templates/v1/webhook/add_admissionbuilder_handler.go index 50778ae44f7..da6b31dfe6c 100644 --- a/pkg/scaffold/internal/templates/v1/webhook/add_admissionbuilder_handler.go +++ b/pkg/scaffold/internal/templates/v1/webhook/add_admissionbuilder_handler.go @@ -20,7 +20,7 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &AddAdmissionWebhookBuilderHandler{} diff --git a/pkg/scaffold/internal/templates/v1/webhook/add_server.go b/pkg/scaffold/internal/templates/v1/webhook/add_server.go index bef83fd313a..469fac70c3d 100644 --- a/pkg/scaffold/internal/templates/v1/webhook/add_server.go +++ b/pkg/scaffold/internal/templates/v1/webhook/add_server.go @@ -19,7 +19,7 @@ package webhook import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &AddServer{} diff --git a/pkg/scaffold/internal/templates/v1/webhook/admissionbuilder.go b/pkg/scaffold/internal/templates/v1/webhook/admissionbuilder.go index 57aea0b3363..0ceb5385e21 100644 --- a/pkg/scaffold/internal/templates/v1/webhook/admissionbuilder.go +++ b/pkg/scaffold/internal/templates/v1/webhook/admissionbuilder.go @@ -20,7 +20,7 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &AdmissionWebhookBuilder{} diff --git a/pkg/scaffold/internal/templates/v1/webhook/admissionhandler.go b/pkg/scaffold/internal/templates/v1/webhook/admissionhandler.go index 45053665993..8311b1cdbcd 100644 --- a/pkg/scaffold/internal/templates/v1/webhook/admissionhandler.go +++ b/pkg/scaffold/internal/templates/v1/webhook/admissionhandler.go @@ -20,7 +20,7 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &AddAdmissionWebhookBuilderHandler{} diff --git a/pkg/scaffold/internal/templates/v1/webhook/admissionwebhooks.go b/pkg/scaffold/internal/templates/v1/webhook/admissionwebhooks.go index 1cc85e90a04..d81e2a18f82 100644 --- a/pkg/scaffold/internal/templates/v1/webhook/admissionwebhooks.go +++ b/pkg/scaffold/internal/templates/v1/webhook/admissionwebhooks.go @@ -20,7 +20,7 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &AdmissionWebhooks{} diff --git a/pkg/scaffold/internal/templates/v1/webhook/server.go b/pkg/scaffold/internal/templates/v1/webhook/server.go index 884486a5a8a..dc02dd5b725 100644 --- a/pkg/scaffold/internal/templates/v1/webhook/server.go +++ b/pkg/scaffold/internal/templates/v1/webhook/server.go @@ -19,7 +19,7 @@ package webhook import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Server{} diff --git a/pkg/scaffold/internal/templates/v2/authproxyrole.go b/pkg/scaffold/internal/templates/v2/authproxyrole.go index 8ee1dfc3559..148f2392f53 100644 --- a/pkg/scaffold/internal/templates/v2/authproxyrole.go +++ b/pkg/scaffold/internal/templates/v2/authproxyrole.go @@ -19,7 +19,7 @@ package v2 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &AuthProxyRole{} diff --git a/pkg/scaffold/internal/templates/v2/authproxyrolebinding.go b/pkg/scaffold/internal/templates/v2/authproxyrolebinding.go index 163e4c386b2..62f9758d3a7 100644 --- a/pkg/scaffold/internal/templates/v2/authproxyrolebinding.go +++ b/pkg/scaffold/internal/templates/v2/authproxyrolebinding.go @@ -19,7 +19,7 @@ package v2 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &AuthProxyRoleBinding{} diff --git a/pkg/scaffold/internal/templates/v2/boilerplate.go b/pkg/scaffold/internal/templates/v2/boilerplate.go index b07fa524c54..fa9081e5046 100644 --- a/pkg/scaffold/internal/templates/v2/boilerplate.go +++ b/pkg/scaffold/internal/templates/v2/boilerplate.go @@ -21,7 +21,7 @@ import ( "path/filepath" "time" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Boilerplate{} diff --git a/pkg/scaffold/internal/templates/v2/certmanager/certificate.go b/pkg/scaffold/internal/templates/v2/certmanager/certificate.go index c10b2a589d0..ab25f74e142 100644 --- a/pkg/scaffold/internal/templates/v2/certmanager/certificate.go +++ b/pkg/scaffold/internal/templates/v2/certmanager/certificate.go @@ -19,7 +19,7 @@ package certmanager import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &CertManager{} diff --git a/pkg/scaffold/internal/templates/v2/certmanager/kustomize.go b/pkg/scaffold/internal/templates/v2/certmanager/kustomize.go index 841d8ce089f..00103cb2f9d 100644 --- a/pkg/scaffold/internal/templates/v2/certmanager/kustomize.go +++ b/pkg/scaffold/internal/templates/v2/certmanager/kustomize.go @@ -19,7 +19,7 @@ package certmanager import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Kustomization{} diff --git a/pkg/scaffold/internal/templates/v2/certmanager/kustomizeconfig.go b/pkg/scaffold/internal/templates/v2/certmanager/kustomizeconfig.go index acbd30d3cda..57febe61008 100644 --- a/pkg/scaffold/internal/templates/v2/certmanager/kustomizeconfig.go +++ b/pkg/scaffold/internal/templates/v2/certmanager/kustomizeconfig.go @@ -19,7 +19,7 @@ package certmanager import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &KustomizeConfig{} diff --git a/pkg/scaffold/internal/templates/v2/controller/controller.go b/pkg/scaffold/internal/templates/v2/controller/controller.go index 93c19a904ad..09652b3b828 100644 --- a/pkg/scaffold/internal/templates/v2/controller/controller.go +++ b/pkg/scaffold/internal/templates/v2/controller/controller.go @@ -20,7 +20,7 @@ import ( "fmt" "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Controller{} diff --git a/pkg/scaffold/internal/templates/v2/controller/controller_suitetest.go b/pkg/scaffold/internal/templates/v2/controller/controller_suitetest.go index cd73350e611..ea782a99c88 100644 --- a/pkg/scaffold/internal/templates/v2/controller/controller_suitetest.go +++ b/pkg/scaffold/internal/templates/v2/controller/controller_suitetest.go @@ -20,7 +20,7 @@ import ( "fmt" "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &SuiteTest{} diff --git a/pkg/scaffold/internal/templates/v2/crd/enablecainjection_patch.go b/pkg/scaffold/internal/templates/v2/crd/enablecainjection_patch.go index 63e4ed1ea2e..d8e8a595bb9 100644 --- a/pkg/scaffold/internal/templates/v2/crd/enablecainjection_patch.go +++ b/pkg/scaffold/internal/templates/v2/crd/enablecainjection_patch.go @@ -19,7 +19,7 @@ package crd import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &EnableCAInjectionPatch{} diff --git a/pkg/scaffold/internal/templates/v2/crd/enablewebhook_patch.go b/pkg/scaffold/internal/templates/v2/crd/enablewebhook_patch.go index efeb252b3da..5731329f037 100644 --- a/pkg/scaffold/internal/templates/v2/crd/enablewebhook_patch.go +++ b/pkg/scaffold/internal/templates/v2/crd/enablewebhook_patch.go @@ -19,7 +19,7 @@ package crd import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &EnableWebhookPatch{} diff --git a/pkg/scaffold/internal/templates/v2/crd/kustomization.go b/pkg/scaffold/internal/templates/v2/crd/kustomization.go index 30f307b84f6..0f3a7eebf45 100644 --- a/pkg/scaffold/internal/templates/v2/crd/kustomization.go +++ b/pkg/scaffold/internal/templates/v2/crd/kustomization.go @@ -20,7 +20,7 @@ import ( "fmt" "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Kustomization{} diff --git a/pkg/scaffold/internal/templates/v2/crd/kustomizeconfig.go b/pkg/scaffold/internal/templates/v2/crd/kustomizeconfig.go index 92aa2563713..a1bfc318983 100644 --- a/pkg/scaffold/internal/templates/v2/crd/kustomizeconfig.go +++ b/pkg/scaffold/internal/templates/v2/crd/kustomizeconfig.go @@ -19,7 +19,7 @@ package crd import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &KustomizeConfig{} diff --git a/pkg/scaffold/internal/templates/v2/crd_editor_rbac.go b/pkg/scaffold/internal/templates/v2/crd_editor_rbac.go index 87131e23e76..eaa1f3441c8 100644 --- a/pkg/scaffold/internal/templates/v2/crd_editor_rbac.go +++ b/pkg/scaffold/internal/templates/v2/crd_editor_rbac.go @@ -19,7 +19,7 @@ package v2 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &CRDEditorRole{} diff --git a/pkg/scaffold/internal/templates/v2/crd_sample.go b/pkg/scaffold/internal/templates/v2/crd_sample.go index b83e14d2f6d..95bfab7ea6e 100644 --- a/pkg/scaffold/internal/templates/v2/crd_sample.go +++ b/pkg/scaffold/internal/templates/v2/crd_sample.go @@ -19,7 +19,7 @@ package v2 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &CRDSample{} diff --git a/pkg/scaffold/internal/templates/v2/crd_viewer_rbac.go b/pkg/scaffold/internal/templates/v2/crd_viewer_rbac.go index fd82cdd205d..a53a905d5c9 100644 --- a/pkg/scaffold/internal/templates/v2/crd_viewer_rbac.go +++ b/pkg/scaffold/internal/templates/v2/crd_viewer_rbac.go @@ -19,7 +19,7 @@ package v2 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &CRDViewerRole{} diff --git a/pkg/scaffold/internal/templates/v2/dockerfile.go b/pkg/scaffold/internal/templates/v2/dockerfile.go index 1e12ec9fa93..2a1fd860384 100644 --- a/pkg/scaffold/internal/templates/v2/dockerfile.go +++ b/pkg/scaffold/internal/templates/v2/dockerfile.go @@ -17,7 +17,7 @@ limitations under the License. package v2 import ( - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Dockerfile{} diff --git a/pkg/scaffold/internal/templates/v2/gitignore.go b/pkg/scaffold/internal/templates/v2/gitignore.go index d8da014db02..0df8dabc27a 100644 --- a/pkg/scaffold/internal/templates/v2/gitignore.go +++ b/pkg/scaffold/internal/templates/v2/gitignore.go @@ -17,7 +17,7 @@ limitations under the License. package v2 import ( - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &GitIgnore{} diff --git a/pkg/scaffold/internal/templates/v2/gomod.go b/pkg/scaffold/internal/templates/v2/gomod.go index 2e172927f64..d5a1d408cf4 100644 --- a/pkg/scaffold/internal/templates/v2/gomod.go +++ b/pkg/scaffold/internal/templates/v2/gomod.go @@ -17,7 +17,7 @@ limitations under the License. package v2 import ( - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &GoMod{} diff --git a/pkg/scaffold/internal/templates/v2/group.go b/pkg/scaffold/internal/templates/v2/group.go index 4bc41e428cb..373dcb3146c 100644 --- a/pkg/scaffold/internal/templates/v2/group.go +++ b/pkg/scaffold/internal/templates/v2/group.go @@ -19,7 +19,7 @@ package v2 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Group{} diff --git a/pkg/scaffold/internal/templates/v2/kustomize.go b/pkg/scaffold/internal/templates/v2/kustomize.go index fa2170e2b7c..1f2fe23170f 100644 --- a/pkg/scaffold/internal/templates/v2/kustomize.go +++ b/pkg/scaffold/internal/templates/v2/kustomize.go @@ -21,7 +21,7 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Kustomize{} diff --git a/pkg/scaffold/internal/templates/v2/leaderelectionrole.go b/pkg/scaffold/internal/templates/v2/leaderelectionrole.go index 9ac3a71ec86..10dc284a50f 100644 --- a/pkg/scaffold/internal/templates/v2/leaderelectionrole.go +++ b/pkg/scaffold/internal/templates/v2/leaderelectionrole.go @@ -19,7 +19,7 @@ package v2 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &LeaderElectionRole{} diff --git a/pkg/scaffold/internal/templates/v2/leaderelectionrolebinding.go b/pkg/scaffold/internal/templates/v2/leaderelectionrolebinding.go index a8684a43981..b777af740e9 100644 --- a/pkg/scaffold/internal/templates/v2/leaderelectionrolebinding.go +++ b/pkg/scaffold/internal/templates/v2/leaderelectionrolebinding.go @@ -19,7 +19,7 @@ package v2 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &LeaderElectionRoleBinding{} diff --git a/pkg/scaffold/internal/templates/v2/main.go b/pkg/scaffold/internal/templates/v2/main.go index 4d4619705df..12e0ac98fea 100644 --- a/pkg/scaffold/internal/templates/v2/main.go +++ b/pkg/scaffold/internal/templates/v2/main.go @@ -22,7 +22,7 @@ import ( "path/filepath" "text/template" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) const defaultMainPath = "main.go" diff --git a/pkg/scaffold/internal/templates/v2/makefile.go b/pkg/scaffold/internal/templates/v2/makefile.go index fa699db5eee..56ad23e8f95 100644 --- a/pkg/scaffold/internal/templates/v2/makefile.go +++ b/pkg/scaffold/internal/templates/v2/makefile.go @@ -17,7 +17,7 @@ limitations under the License. package v2 import ( - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Makefile{} diff --git a/pkg/scaffold/internal/templates/v2/manager/config.go b/pkg/scaffold/internal/templates/v2/manager/config.go index 73efeac6dff..72af27248c7 100644 --- a/pkg/scaffold/internal/templates/v2/manager/config.go +++ b/pkg/scaffold/internal/templates/v2/manager/config.go @@ -19,7 +19,7 @@ package manager import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Config{} diff --git a/pkg/scaffold/internal/templates/v2/manager/kustomization.go b/pkg/scaffold/internal/templates/v2/manager/kustomization.go index 84af806d0e1..1318302ed2c 100644 --- a/pkg/scaffold/internal/templates/v2/manager/kustomization.go +++ b/pkg/scaffold/internal/templates/v2/manager/kustomization.go @@ -19,7 +19,7 @@ package manager import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Kustomization{} diff --git a/pkg/scaffold/internal/templates/v2/metricsauth/auth_proxy_patch.go b/pkg/scaffold/internal/templates/v2/metricsauth/auth_proxy_patch.go index c15bbd95b4f..319e46a773c 100644 --- a/pkg/scaffold/internal/templates/v2/metricsauth/auth_proxy_patch.go +++ b/pkg/scaffold/internal/templates/v2/metricsauth/auth_proxy_patch.go @@ -19,7 +19,7 @@ package metricsauth import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &AuthProxyPatch{} diff --git a/pkg/scaffold/internal/templates/v2/metricsauth/authproxyservice.go b/pkg/scaffold/internal/templates/v2/metricsauth/authproxyservice.go index 0021a5072df..4cacd524bbc 100644 --- a/pkg/scaffold/internal/templates/v2/metricsauth/authproxyservice.go +++ b/pkg/scaffold/internal/templates/v2/metricsauth/authproxyservice.go @@ -19,7 +19,7 @@ package metricsauth import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &AuthProxyService{} diff --git a/pkg/scaffold/internal/templates/v2/metricsauth/clientclusterrole.go b/pkg/scaffold/internal/templates/v2/metricsauth/clientclusterrole.go index 06de93bed3e..f61f7524ad1 100644 --- a/pkg/scaffold/internal/templates/v2/metricsauth/clientclusterrole.go +++ b/pkg/scaffold/internal/templates/v2/metricsauth/clientclusterrole.go @@ -19,7 +19,7 @@ package metricsauth import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &ClientClusterRole{} diff --git a/pkg/scaffold/internal/templates/v2/mgrrolebinding.go b/pkg/scaffold/internal/templates/v2/mgrrolebinding.go index 96cd0e1d322..fe11720fbde 100644 --- a/pkg/scaffold/internal/templates/v2/mgrrolebinding.go +++ b/pkg/scaffold/internal/templates/v2/mgrrolebinding.go @@ -19,7 +19,7 @@ package v2 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &ManagerRoleBinding{} diff --git a/pkg/scaffold/internal/templates/v2/prometheus/kustomize.go b/pkg/scaffold/internal/templates/v2/prometheus/kustomize.go index a630cddcf29..c72539da6fe 100644 --- a/pkg/scaffold/internal/templates/v2/prometheus/kustomize.go +++ b/pkg/scaffold/internal/templates/v2/prometheus/kustomize.go @@ -19,7 +19,7 @@ package prometheus import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Kustomization{} diff --git a/pkg/scaffold/internal/templates/v2/prometheus/monitor.go b/pkg/scaffold/internal/templates/v2/prometheus/monitor.go index d32402f15aa..54a2bcab94d 100644 --- a/pkg/scaffold/internal/templates/v2/prometheus/monitor.go +++ b/pkg/scaffold/internal/templates/v2/prometheus/monitor.go @@ -19,7 +19,7 @@ package prometheus import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &ServiceMonitor{} diff --git a/pkg/scaffold/internal/templates/v2/rbac.go b/pkg/scaffold/internal/templates/v2/rbac.go index d925fff7272..bb33ff91634 100644 --- a/pkg/scaffold/internal/templates/v2/rbac.go +++ b/pkg/scaffold/internal/templates/v2/rbac.go @@ -19,7 +19,7 @@ package v2 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &KustomizeRBAC{} diff --git a/pkg/scaffold/internal/templates/v2/types.go b/pkg/scaffold/internal/templates/v2/types.go index a28ab80230c..eee80c6eb00 100644 --- a/pkg/scaffold/internal/templates/v2/types.go +++ b/pkg/scaffold/internal/templates/v2/types.go @@ -20,7 +20,7 @@ import ( "fmt" "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Types{} diff --git a/pkg/scaffold/internal/templates/v2/webhook/enablecainection_patch.go b/pkg/scaffold/internal/templates/v2/webhook/enablecainection_patch.go index 19e69c40de0..1479317d97f 100644 --- a/pkg/scaffold/internal/templates/v2/webhook/enablecainection_patch.go +++ b/pkg/scaffold/internal/templates/v2/webhook/enablecainection_patch.go @@ -19,7 +19,7 @@ package webhook import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &InjectCAPatch{} diff --git a/pkg/scaffold/internal/templates/v2/webhook/kustomization.go b/pkg/scaffold/internal/templates/v2/webhook/kustomization.go index a65fe8ce172..237f64bdd8b 100644 --- a/pkg/scaffold/internal/templates/v2/webhook/kustomization.go +++ b/pkg/scaffold/internal/templates/v2/webhook/kustomization.go @@ -19,7 +19,7 @@ package webhook import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Kustomization{} diff --git a/pkg/scaffold/internal/templates/v2/webhook/kustomizeconfig.go b/pkg/scaffold/internal/templates/v2/webhook/kustomizeconfig.go index 712b7595178..e180f9cf80d 100644 --- a/pkg/scaffold/internal/templates/v2/webhook/kustomizeconfig.go +++ b/pkg/scaffold/internal/templates/v2/webhook/kustomizeconfig.go @@ -19,7 +19,7 @@ package webhook import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &KustomizeConfigWebhook{} diff --git a/pkg/scaffold/internal/templates/v2/webhook/service.go b/pkg/scaffold/internal/templates/v2/webhook/service.go index 1009a6367fe..bd35b7d48ab 100644 --- a/pkg/scaffold/internal/templates/v2/webhook/service.go +++ b/pkg/scaffold/internal/templates/v2/webhook/service.go @@ -19,7 +19,7 @@ package webhook import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Service{} diff --git a/pkg/scaffold/internal/templates/v2/webhook/webhook.go b/pkg/scaffold/internal/templates/v2/webhook/webhook.go index 4af8b46f8f3..8eed496df5d 100644 --- a/pkg/scaffold/internal/templates/v2/webhook/webhook.go +++ b/pkg/scaffold/internal/templates/v2/webhook/webhook.go @@ -21,7 +21,7 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &Webhook{} diff --git a/pkg/scaffold/internal/templates/v2/webhook_manager_patch.go b/pkg/scaffold/internal/templates/v2/webhook_manager_patch.go index 49930f567a1..98bd554790f 100644 --- a/pkg/scaffold/internal/templates/v2/webhook_manager_patch.go +++ b/pkg/scaffold/internal/templates/v2/webhook_manager_patch.go @@ -19,7 +19,7 @@ package v2 import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) var _ file.Template = &ManagerWebhookPatch{} diff --git a/pkg/scaffold/update.go b/pkg/scaffold/update.go index 309858d544b..46c69491d38 100644 --- a/pkg/scaffold/update.go +++ b/pkg/scaffold/update.go @@ -17,10 +17,10 @@ limitations under the License. package scaffold import ( - "sigs.k8s.io/kubebuilder/pkg/model" - "sigs.k8s.io/kubebuilder/pkg/model/config" - "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/machinery" - templatesv1 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v1" + "sigs.k8s.io/kubebuilder/v2/pkg/model" + "sigs.k8s.io/kubebuilder/v2/pkg/model/config" + "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/machinery" + templatesv1 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v1" ) var _ Scaffolder = &updateScaffolder{} diff --git a/pkg/scaffold/webhook.go b/pkg/scaffold/webhook.go index 7a47476b440..21d80aa3daa 100644 --- a/pkg/scaffold/webhook.go +++ b/pkg/scaffold/webhook.go @@ -19,14 +19,14 @@ package scaffold import ( "fmt" - "sigs.k8s.io/kubebuilder/pkg/model" - "sigs.k8s.io/kubebuilder/pkg/model/config" - "sigs.k8s.io/kubebuilder/pkg/model/resource" - "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/machinery" - managerv1 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v1/manager" - webhookv1 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v1/webhook" - templatesv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2" - webhookv2 "sigs.k8s.io/kubebuilder/pkg/scaffold/internal/templates/v2/webhook" + "sigs.k8s.io/kubebuilder/v2/pkg/model" + "sigs.k8s.io/kubebuilder/v2/pkg/model/config" + "sigs.k8s.io/kubebuilder/v2/pkg/model/resource" + "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/machinery" + managerv1 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v1/manager" + webhookv1 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v1/webhook" + templatesv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2" + webhookv2 "sigs.k8s.io/kubebuilder/v2/pkg/scaffold/internal/templates/v2/webhook" ) var _ Scaffolder = &webhookScaffolder{} diff --git a/plugins/addon/channel.go b/plugins/addon/channel.go index d89a9d84bd8..7daa8b95e7e 100644 --- a/plugins/addon/channel.go +++ b/plugins/addon/channel.go @@ -19,8 +19,8 @@ package addon import ( "path/filepath" - "sigs.k8s.io/kubebuilder/pkg/model" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) const exampleChannel = `# Versions for the stable channel diff --git a/plugins/addon/controller.go b/plugins/addon/controller.go index 201572ade37..50863e7bd5b 100644 --- a/plugins/addon/controller.go +++ b/plugins/addon/controller.go @@ -4,8 +4,8 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kubebuilder/pkg/model" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) // ReplaceController replaces the controller with a modified version diff --git a/plugins/addon/helpers.go b/plugins/addon/helpers.go index 66a8c3f5189..2171080d270 100644 --- a/plugins/addon/helpers.go +++ b/plugins/addon/helpers.go @@ -8,8 +8,8 @@ import ( "github.com/gobuffalo/flect" - "sigs.k8s.io/kubebuilder/pkg/model" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) // This file gathers functions that are likely to be useful to other diff --git a/plugins/addon/manifest.go b/plugins/addon/manifest.go index 6be87a092b6..999708be7ba 100644 --- a/plugins/addon/manifest.go +++ b/plugins/addon/manifest.go @@ -20,8 +20,8 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kubebuilder/pkg/model" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) const exampleManifestVersion = "0.0.1" diff --git a/plugins/addon/plugin.go b/plugins/addon/plugin.go index 597419108a8..37080aa149d 100644 --- a/plugins/addon/plugin.go +++ b/plugins/addon/plugin.go @@ -1,7 +1,7 @@ package addon import ( - "sigs.k8s.io/kubebuilder/pkg/model" + "sigs.k8s.io/kubebuilder/v2/pkg/model" ) // Plugin implements model.Plugin diff --git a/plugins/addon/type.go b/plugins/addon/type.go index 171ddc0d29c..96ab4102aae 100644 --- a/plugins/addon/type.go +++ b/plugins/addon/type.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kubebuilder/pkg/model" - "sigs.k8s.io/kubebuilder/pkg/model/file" + "sigs.k8s.io/kubebuilder/v2/pkg/model" + "sigs.k8s.io/kubebuilder/v2/pkg/model/file" ) // ReplaceTypes replaces the API types with a modified version diff --git a/test/e2e/v1/e2e_suite.go b/test/e2e/v1/e2e_suite.go index 27a62b30584..dab1d6709d8 100644 --- a/test/e2e/v1/e2e_suite.go +++ b/test/e2e/v1/e2e_suite.go @@ -26,7 +26,7 @@ import ( . "github.com/onsi/ginkgo" //nolint:golint . "github.com/onsi/gomega" //nolint:golint - "sigs.k8s.io/kubebuilder/test/e2e/utils" + "sigs.k8s.io/kubebuilder/v2/test/e2e/utils" ) var _ = Describe("kubebuilder", func() { diff --git a/test/e2e/v2/e2e_suite.go b/test/e2e/v2/e2e_suite.go index ad139f60fa2..b15377954c1 100644 --- a/test/e2e/v2/e2e_suite.go +++ b/test/e2e/v2/e2e_suite.go @@ -28,7 +28,7 @@ import ( . "github.com/onsi/ginkgo" //nolint:golint . "github.com/onsi/gomega" //nolint:golint - "sigs.k8s.io/kubebuilder/test/e2e/utils" + "sigs.k8s.io/kubebuilder/v2/test/e2e/utils" ) var _ = Describe("kubebuilder", func() { From 222b19c174d4e8afcba024fb38f346c1a8ebb018 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Fri, 4 Dec 2020 11:32:26 -0800 Subject: [PATCH 2/3] Update generate_testdata.sh --- generate_testdata.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/generate_testdata.sh b/generate_testdata.sh index e50ee6f6b5b..5f576019b1f 100755 --- a/generate_testdata.sh +++ b/generate_testdata.sh @@ -103,6 +103,9 @@ scaffold_test_project() { header_text 'initializing project-v2-addon ...' $kb init --project-version $version --domain testproject.org --license apache2 --owner "The Kubernetes authors" + # pin the version of the declarative pattern to make tests pass + go get sigs.k8s.io/kubebuilder-declarative-pattern@v0.0.0-20200317144824-bbf1fb2a4a9a + header_text 'enableling --pattern flag ...' export KUBEBUILDER_ENABLE_PLUGINS=1 header_text 'Creating APIs ...' From 1c598b4cf0052b03d6bb045a5312b76b2f3dafb6 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Fri, 4 Dec 2020 11:32:26 -0800 Subject: [PATCH 3/3] Update generate_testdata.sh --- testdata/gopath/src/project/cmd/manager/main.go | 2 +- testdata/gopath/src/project/hack/boilerplate.go.txt | 2 +- .../src/project/pkg/apis/addtoscheme_creatures_v2alpha1.go | 2 +- testdata/gopath/src/project/pkg/apis/addtoscheme_crew_v1.go | 2 +- .../gopath/src/project/pkg/apis/addtoscheme_policy_v1beta1.go | 2 +- .../gopath/src/project/pkg/apis/addtoscheme_ship_v1beta1.go | 2 +- testdata/gopath/src/project/pkg/apis/apis.go | 2 +- testdata/gopath/src/project/pkg/apis/creatures/group.go | 2 +- testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/doc.go | 2 +- .../src/project/pkg/apis/creatures/v2alpha1/kraken_types.go | 2 +- .../project/pkg/apis/creatures/v2alpha1/kraken_types_test.go | 2 +- .../gopath/src/project/pkg/apis/creatures/v2alpha1/register.go | 2 +- .../project/pkg/apis/creatures/v2alpha1/v2alpha1_suite_test.go | 2 +- .../pkg/apis/creatures/v2alpha1/zz_generated.deepcopy.go | 2 +- testdata/gopath/src/project/pkg/apis/crew/group.go | 2 +- testdata/gopath/src/project/pkg/apis/crew/v1/doc.go | 2 +- testdata/gopath/src/project/pkg/apis/crew/v1/firstmate_types.go | 2 +- .../gopath/src/project/pkg/apis/crew/v1/firstmate_types_test.go | 2 +- testdata/gopath/src/project/pkg/apis/crew/v1/register.go | 2 +- testdata/gopath/src/project/pkg/apis/crew/v1/v1_suite_test.go | 2 +- .../src/project/pkg/apis/crew/v1/zz_generated.deepcopy.go | 2 +- testdata/gopath/src/project/pkg/apis/policy/group.go | 2 +- testdata/gopath/src/project/pkg/apis/policy/v1beta1/doc.go | 2 +- .../project/pkg/apis/policy/v1beta1/healthcheckpolicy_types.go | 2 +- .../pkg/apis/policy/v1beta1/healthcheckpolicy_types_test.go | 2 +- testdata/gopath/src/project/pkg/apis/policy/v1beta1/register.go | 2 +- .../src/project/pkg/apis/policy/v1beta1/v1beta1_suite_test.go | 2 +- .../project/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go | 2 +- testdata/gopath/src/project/pkg/apis/ship/group.go | 2 +- testdata/gopath/src/project/pkg/apis/ship/v1beta1/doc.go | 2 +- .../gopath/src/project/pkg/apis/ship/v1beta1/frigate_types.go | 2 +- .../src/project/pkg/apis/ship/v1beta1/frigate_types_test.go | 2 +- testdata/gopath/src/project/pkg/apis/ship/v1beta1/register.go | 2 +- .../src/project/pkg/apis/ship/v1beta1/v1beta1_suite_test.go | 2 +- .../src/project/pkg/apis/ship/v1beta1/zz_generated.deepcopy.go | 2 +- testdata/gopath/src/project/pkg/controller/add_firstmate.go | 2 +- testdata/gopath/src/project/pkg/controller/add_frigate.go | 2 +- .../gopath/src/project/pkg/controller/add_healthcheckpolicy.go | 2 +- testdata/gopath/src/project/pkg/controller/add_kraken.go | 2 +- testdata/gopath/src/project/pkg/controller/add_namespace.go | 2 +- testdata/gopath/src/project/pkg/controller/controller.go | 2 +- .../project/pkg/controller/firstmate/firstmate_controller.go | 2 +- .../pkg/controller/firstmate/firstmate_controller_suite_test.go | 2 +- .../pkg/controller/firstmate/firstmate_controller_test.go | 2 +- .../src/project/pkg/controller/frigate/frigate_controller.go | 2 +- .../pkg/controller/frigate/frigate_controller_suite_test.go | 2 +- .../project/pkg/controller/frigate/frigate_controller_test.go | 2 +- .../healthcheckpolicy/healthcheckpolicy_controller.go | 2 +- .../healthcheckpolicy_controller_suite_test.go | 2 +- .../healthcheckpolicy/healthcheckpolicy_controller_test.go | 2 +- .../src/project/pkg/controller/kraken/kraken_controller.go | 2 +- .../pkg/controller/kraken/kraken_controller_suite_test.go | 2 +- .../src/project/pkg/controller/kraken/kraken_controller_test.go | 2 +- .../project/pkg/controller/namespace/namespace_controller.go | 2 +- .../pkg/controller/namespace/namespace_controller_suite_test.go | 2 +- .../pkg/controller/namespace/namespace_controller_test.go | 2 +- testdata/gopath/src/project/pkg/webhook/add_default_server.go | 2 +- .../pkg/webhook/default_server/add_mutating_firstmate.go | 2 +- .../pkg/webhook/default_server/add_mutating_namespace.go | 2 +- .../pkg/webhook/default_server/add_validating_frigate.go | 2 +- .../project/pkg/webhook/default_server/add_validating_kraken.go | 2 +- .../default_server/firstmate/mutating/create_update_webhook.go | 2 +- .../webhook/default_server/firstmate/mutating/delete_webhook.go | 2 +- .../firstmate/mutating/firstmate_create_update_handler.go | 2 +- .../firstmate/mutating/firstmate_delete_handler.go | 2 +- .../pkg/webhook/default_server/firstmate/mutating/webhooks.go | 2 +- .../default_server/frigate/validating/frigate_update_handler.go | 2 +- .../webhook/default_server/frigate/validating/update_webhook.go | 2 +- .../pkg/webhook/default_server/frigate/validating/webhooks.go | 2 +- .../webhook/default_server/kraken/validating/create_webhook.go | 2 +- .../default_server/kraken/validating/kraken_create_handler.go | 2 +- .../pkg/webhook/default_server/kraken/validating/webhooks.go | 2 +- .../namespace/mutating/namespace_update_handler.go | 2 +- .../webhook/default_server/namespace/mutating/update_webhook.go | 2 +- .../pkg/webhook/default_server/namespace/mutating/webhooks.go | 2 +- .../gopath/src/project/pkg/webhook/default_server/server.go | 2 +- testdata/gopath/src/project/pkg/webhook/webhook.go | 2 +- testdata/project-v2-addon/api/v1/admiral_types.go | 2 +- testdata/project-v2-addon/api/v1/captain_types.go | 2 +- testdata/project-v2-addon/api/v1/firstmate_types.go | 2 +- testdata/project-v2-addon/api/v1/groupversion_info.go | 2 +- testdata/project-v2-addon/api/v1/zz_generated.deepcopy.go | 2 +- testdata/project-v2-addon/controllers/admiral_controller.go | 2 +- testdata/project-v2-addon/controllers/captain_controller.go | 2 +- testdata/project-v2-addon/controllers/firstmate_controller.go | 2 +- testdata/project-v2-addon/controllers/suite_test.go | 2 +- testdata/project-v2-addon/hack/boilerplate.go.txt | 2 +- testdata/project-v2-addon/main.go | 2 +- testdata/project-v2-multigroup/apis/crew/v1/captain_types.go | 2 +- testdata/project-v2-multigroup/apis/crew/v1/captain_webhook.go | 2 +- .../project-v2-multigroup/apis/crew/v1/groupversion_info.go | 2 +- .../project-v2-multigroup/apis/crew/v1/zz_generated.deepcopy.go | 2 +- .../apis/foo.policy/v1/groupversion_info.go | 2 +- .../apis/foo.policy/v1/healthcheckpolicy_types.go | 2 +- .../apis/foo.policy/v1/zz_generated.deepcopy.go | 2 +- .../apis/sea-creatures/v1beta1/groupversion_info.go | 2 +- .../apis/sea-creatures/v1beta1/kraken_types.go | 2 +- .../apis/sea-creatures/v1beta1/zz_generated.deepcopy.go | 2 +- .../apis/sea-creatures/v1beta2/groupversion_info.go | 2 +- .../apis/sea-creatures/v1beta2/leviathan_types.go | 2 +- .../apis/sea-creatures/v1beta2/zz_generated.deepcopy.go | 2 +- testdata/project-v2-multigroup/apis/ship/v1/destroyer_types.go | 2 +- .../project-v2-multigroup/apis/ship/v1/groupversion_info.go | 2 +- .../project-v2-multigroup/apis/ship/v1/zz_generated.deepcopy.go | 2 +- .../project-v2-multigroup/apis/ship/v1beta1/frigate_types.go | 2 +- .../project-v2-multigroup/apis/ship/v1beta1/frigate_webhook.go | 2 +- .../apis/ship/v1beta1/groupversion_info.go | 2 +- .../apis/ship/v1beta1/zz_generated.deepcopy.go | 2 +- .../project-v2-multigroup/apis/ship/v2alpha1/cruiser_types.go | 2 +- .../apis/ship/v2alpha1/groupversion_info.go | 2 +- .../apis/ship/v2alpha1/zz_generated.deepcopy.go | 2 +- .../controllers/crew/captain_controller.go | 2 +- testdata/project-v2-multigroup/controllers/crew/suite_test.go | 2 +- .../controllers/foo.policy/healthcheckpolicy_controller.go | 2 +- .../project-v2-multigroup/controllers/foo.policy/suite_test.go | 2 +- .../controllers/sea-creatures/kraken_controller.go | 2 +- .../controllers/sea-creatures/leviathan_controller.go | 2 +- .../controllers/sea-creatures/suite_test.go | 2 +- .../controllers/ship/cruiser_controller.go | 2 +- .../controllers/ship/destroyer_controller.go | 2 +- .../controllers/ship/frigate_controller.go | 2 +- testdata/project-v2-multigroup/controllers/ship/suite_test.go | 2 +- testdata/project-v2-multigroup/hack/boilerplate.go.txt | 2 +- testdata/project-v2-multigroup/main.go | 2 +- testdata/project-v2/api/v1/admiral_types.go | 2 +- testdata/project-v2/api/v1/captain_types.go | 2 +- testdata/project-v2/api/v1/captain_webhook.go | 2 +- testdata/project-v2/api/v1/firstmate_types.go | 2 +- testdata/project-v2/api/v1/firstmate_webhook.go | 2 +- testdata/project-v2/api/v1/groupversion_info.go | 2 +- testdata/project-v2/api/v1/zz_generated.deepcopy.go | 2 +- testdata/project-v2/controllers/admiral_controller.go | 2 +- testdata/project-v2/controllers/captain_controller.go | 2 +- testdata/project-v2/controllers/firstmate_controller.go | 2 +- testdata/project-v2/controllers/suite_test.go | 2 +- testdata/project-v2/hack/boilerplate.go.txt | 2 +- testdata/project-v2/main.go | 2 +- 137 files changed, 137 insertions(+), 137 deletions(-) diff --git a/testdata/gopath/src/project/cmd/manager/main.go b/testdata/gopath/src/project/cmd/manager/main.go index a7a610b25db..2e95691f45c 100644 --- a/testdata/gopath/src/project/cmd/manager/main.go +++ b/testdata/gopath/src/project/cmd/manager/main.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/hack/boilerplate.go.txt b/testdata/gopath/src/project/hack/boilerplate.go.txt index b75c7954b88..99e0a002dd8 100644 --- a/testdata/gopath/src/project/hack/boilerplate.go.txt +++ b/testdata/gopath/src/project/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/addtoscheme_creatures_v2alpha1.go b/testdata/gopath/src/project/pkg/apis/addtoscheme_creatures_v2alpha1.go index 0c01bcdf9e4..4bf02733290 100644 --- a/testdata/gopath/src/project/pkg/apis/addtoscheme_creatures_v2alpha1.go +++ b/testdata/gopath/src/project/pkg/apis/addtoscheme_creatures_v2alpha1.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/addtoscheme_crew_v1.go b/testdata/gopath/src/project/pkg/apis/addtoscheme_crew_v1.go index b83c0cd11f6..2228c5429a0 100644 --- a/testdata/gopath/src/project/pkg/apis/addtoscheme_crew_v1.go +++ b/testdata/gopath/src/project/pkg/apis/addtoscheme_crew_v1.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/addtoscheme_policy_v1beta1.go b/testdata/gopath/src/project/pkg/apis/addtoscheme_policy_v1beta1.go index a7d2b230ed2..b89dbba0256 100644 --- a/testdata/gopath/src/project/pkg/apis/addtoscheme_policy_v1beta1.go +++ b/testdata/gopath/src/project/pkg/apis/addtoscheme_policy_v1beta1.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/addtoscheme_ship_v1beta1.go b/testdata/gopath/src/project/pkg/apis/addtoscheme_ship_v1beta1.go index dcd014d0c77..059116af83d 100644 --- a/testdata/gopath/src/project/pkg/apis/addtoscheme_ship_v1beta1.go +++ b/testdata/gopath/src/project/pkg/apis/addtoscheme_ship_v1beta1.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/apis.go b/testdata/gopath/src/project/pkg/apis/apis.go index 8bb3fd6643b..7d30fa07967 100644 --- a/testdata/gopath/src/project/pkg/apis/apis.go +++ b/testdata/gopath/src/project/pkg/apis/apis.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/creatures/group.go b/testdata/gopath/src/project/pkg/apis/creatures/group.go index b4339573585..0bbf6762301 100644 --- a/testdata/gopath/src/project/pkg/apis/creatures/group.go +++ b/testdata/gopath/src/project/pkg/apis/creatures/group.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/doc.go b/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/doc.go index 4800ffa9025..ad36faedb46 100644 --- a/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/doc.go +++ b/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/kraken_types.go b/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/kraken_types.go index 0dd4d0720b0..ab308ed40b6 100644 --- a/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/kraken_types.go +++ b/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/kraken_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/kraken_types_test.go b/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/kraken_types_test.go index 9accf54f238..b084f7e59ee 100644 --- a/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/kraken_types_test.go +++ b/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/kraken_types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/register.go b/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/register.go index 15bdef7e056..ffbeb38cef5 100644 --- a/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/register.go +++ b/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/v2alpha1_suite_test.go b/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/v2alpha1_suite_test.go index ded62b47924..0f07b021d19 100644 --- a/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/v2alpha1_suite_test.go +++ b/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/v2alpha1_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/zz_generated.deepcopy.go b/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/zz_generated.deepcopy.go index edb428209de..5c8b3b8d058 100644 --- a/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/zz_generated.deepcopy.go +++ b/testdata/gopath/src/project/pkg/apis/creatures/v2alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/crew/group.go b/testdata/gopath/src/project/pkg/apis/crew/group.go index 22e79fd0bc2..ecaebbd8661 100644 --- a/testdata/gopath/src/project/pkg/apis/crew/group.go +++ b/testdata/gopath/src/project/pkg/apis/crew/group.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/crew/v1/doc.go b/testdata/gopath/src/project/pkg/apis/crew/v1/doc.go index 602e9b64b36..30ffe23cecb 100644 --- a/testdata/gopath/src/project/pkg/apis/crew/v1/doc.go +++ b/testdata/gopath/src/project/pkg/apis/crew/v1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/crew/v1/firstmate_types.go b/testdata/gopath/src/project/pkg/apis/crew/v1/firstmate_types.go index d8dd6005ad4..0e6c65bb462 100644 --- a/testdata/gopath/src/project/pkg/apis/crew/v1/firstmate_types.go +++ b/testdata/gopath/src/project/pkg/apis/crew/v1/firstmate_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/crew/v1/firstmate_types_test.go b/testdata/gopath/src/project/pkg/apis/crew/v1/firstmate_types_test.go index 03812d3c92c..00b2f9c2309 100644 --- a/testdata/gopath/src/project/pkg/apis/crew/v1/firstmate_types_test.go +++ b/testdata/gopath/src/project/pkg/apis/crew/v1/firstmate_types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/crew/v1/register.go b/testdata/gopath/src/project/pkg/apis/crew/v1/register.go index 352c06dd363..555eeac60e5 100644 --- a/testdata/gopath/src/project/pkg/apis/crew/v1/register.go +++ b/testdata/gopath/src/project/pkg/apis/crew/v1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/crew/v1/v1_suite_test.go b/testdata/gopath/src/project/pkg/apis/crew/v1/v1_suite_test.go index 719dc7c2119..76667cf2f0d 100644 --- a/testdata/gopath/src/project/pkg/apis/crew/v1/v1_suite_test.go +++ b/testdata/gopath/src/project/pkg/apis/crew/v1/v1_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/crew/v1/zz_generated.deepcopy.go b/testdata/gopath/src/project/pkg/apis/crew/v1/zz_generated.deepcopy.go index 2e734a09fa2..96783549a98 100644 --- a/testdata/gopath/src/project/pkg/apis/crew/v1/zz_generated.deepcopy.go +++ b/testdata/gopath/src/project/pkg/apis/crew/v1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/policy/group.go b/testdata/gopath/src/project/pkg/apis/policy/group.go index de777a89f10..4588cf20022 100644 --- a/testdata/gopath/src/project/pkg/apis/policy/group.go +++ b/testdata/gopath/src/project/pkg/apis/policy/group.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/policy/v1beta1/doc.go b/testdata/gopath/src/project/pkg/apis/policy/v1beta1/doc.go index d4866313037..a6b443ca2fd 100644 --- a/testdata/gopath/src/project/pkg/apis/policy/v1beta1/doc.go +++ b/testdata/gopath/src/project/pkg/apis/policy/v1beta1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/policy/v1beta1/healthcheckpolicy_types.go b/testdata/gopath/src/project/pkg/apis/policy/v1beta1/healthcheckpolicy_types.go index 1c47b1974c3..d6afaf8f4c3 100644 --- a/testdata/gopath/src/project/pkg/apis/policy/v1beta1/healthcheckpolicy_types.go +++ b/testdata/gopath/src/project/pkg/apis/policy/v1beta1/healthcheckpolicy_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/policy/v1beta1/healthcheckpolicy_types_test.go b/testdata/gopath/src/project/pkg/apis/policy/v1beta1/healthcheckpolicy_types_test.go index 9fb78b19f16..77aa61eef45 100644 --- a/testdata/gopath/src/project/pkg/apis/policy/v1beta1/healthcheckpolicy_types_test.go +++ b/testdata/gopath/src/project/pkg/apis/policy/v1beta1/healthcheckpolicy_types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/policy/v1beta1/register.go b/testdata/gopath/src/project/pkg/apis/policy/v1beta1/register.go index 109d9628097..9aaba383dd7 100644 --- a/testdata/gopath/src/project/pkg/apis/policy/v1beta1/register.go +++ b/testdata/gopath/src/project/pkg/apis/policy/v1beta1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/policy/v1beta1/v1beta1_suite_test.go b/testdata/gopath/src/project/pkg/apis/policy/v1beta1/v1beta1_suite_test.go index 192b395f666..73d1d315990 100644 --- a/testdata/gopath/src/project/pkg/apis/policy/v1beta1/v1beta1_suite_test.go +++ b/testdata/gopath/src/project/pkg/apis/policy/v1beta1/v1beta1_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go b/testdata/gopath/src/project/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go index fece4b6af82..8abfb7af27d 100644 --- a/testdata/gopath/src/project/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go +++ b/testdata/gopath/src/project/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/ship/group.go b/testdata/gopath/src/project/pkg/apis/ship/group.go index 236da88a1da..463f8115923 100644 --- a/testdata/gopath/src/project/pkg/apis/ship/group.go +++ b/testdata/gopath/src/project/pkg/apis/ship/group.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/ship/v1beta1/doc.go b/testdata/gopath/src/project/pkg/apis/ship/v1beta1/doc.go index 4749c7ea562..826924c3b3e 100644 --- a/testdata/gopath/src/project/pkg/apis/ship/v1beta1/doc.go +++ b/testdata/gopath/src/project/pkg/apis/ship/v1beta1/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/ship/v1beta1/frigate_types.go b/testdata/gopath/src/project/pkg/apis/ship/v1beta1/frigate_types.go index 3fe41e2c70a..55088cd2f18 100644 --- a/testdata/gopath/src/project/pkg/apis/ship/v1beta1/frigate_types.go +++ b/testdata/gopath/src/project/pkg/apis/ship/v1beta1/frigate_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/ship/v1beta1/frigate_types_test.go b/testdata/gopath/src/project/pkg/apis/ship/v1beta1/frigate_types_test.go index fe285a59e60..106304dbaa6 100644 --- a/testdata/gopath/src/project/pkg/apis/ship/v1beta1/frigate_types_test.go +++ b/testdata/gopath/src/project/pkg/apis/ship/v1beta1/frigate_types_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/ship/v1beta1/register.go b/testdata/gopath/src/project/pkg/apis/ship/v1beta1/register.go index 3ad8ae993a8..33d19b159c4 100644 --- a/testdata/gopath/src/project/pkg/apis/ship/v1beta1/register.go +++ b/testdata/gopath/src/project/pkg/apis/ship/v1beta1/register.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/ship/v1beta1/v1beta1_suite_test.go b/testdata/gopath/src/project/pkg/apis/ship/v1beta1/v1beta1_suite_test.go index 192b395f666..73d1d315990 100644 --- a/testdata/gopath/src/project/pkg/apis/ship/v1beta1/v1beta1_suite_test.go +++ b/testdata/gopath/src/project/pkg/apis/ship/v1beta1/v1beta1_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/apis/ship/v1beta1/zz_generated.deepcopy.go b/testdata/gopath/src/project/pkg/apis/ship/v1beta1/zz_generated.deepcopy.go index d5fc144cf3e..fb15ab82e64 100644 --- a/testdata/gopath/src/project/pkg/apis/ship/v1beta1/zz_generated.deepcopy.go +++ b/testdata/gopath/src/project/pkg/apis/ship/v1beta1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/add_firstmate.go b/testdata/gopath/src/project/pkg/controller/add_firstmate.go index 49c5c1cbdaa..f3938de754f 100644 --- a/testdata/gopath/src/project/pkg/controller/add_firstmate.go +++ b/testdata/gopath/src/project/pkg/controller/add_firstmate.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/add_frigate.go b/testdata/gopath/src/project/pkg/controller/add_frigate.go index d311549d15f..ac907a852df 100644 --- a/testdata/gopath/src/project/pkg/controller/add_frigate.go +++ b/testdata/gopath/src/project/pkg/controller/add_frigate.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/add_healthcheckpolicy.go b/testdata/gopath/src/project/pkg/controller/add_healthcheckpolicy.go index a716b47c785..deb3eef5046 100644 --- a/testdata/gopath/src/project/pkg/controller/add_healthcheckpolicy.go +++ b/testdata/gopath/src/project/pkg/controller/add_healthcheckpolicy.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/add_kraken.go b/testdata/gopath/src/project/pkg/controller/add_kraken.go index 0d7f880e6a7..550b5130245 100644 --- a/testdata/gopath/src/project/pkg/controller/add_kraken.go +++ b/testdata/gopath/src/project/pkg/controller/add_kraken.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/add_namespace.go b/testdata/gopath/src/project/pkg/controller/add_namespace.go index 5a78fef4aae..8b7e24301f7 100644 --- a/testdata/gopath/src/project/pkg/controller/add_namespace.go +++ b/testdata/gopath/src/project/pkg/controller/add_namespace.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/controller.go b/testdata/gopath/src/project/pkg/controller/controller.go index 4fc3d84211a..4761cb42eb8 100644 --- a/testdata/gopath/src/project/pkg/controller/controller.go +++ b/testdata/gopath/src/project/pkg/controller/controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/firstmate/firstmate_controller.go b/testdata/gopath/src/project/pkg/controller/firstmate/firstmate_controller.go index 951dcf23888..4a7a0989d56 100644 --- a/testdata/gopath/src/project/pkg/controller/firstmate/firstmate_controller.go +++ b/testdata/gopath/src/project/pkg/controller/firstmate/firstmate_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/firstmate/firstmate_controller_suite_test.go b/testdata/gopath/src/project/pkg/controller/firstmate/firstmate_controller_suite_test.go index 6b5f661a5e9..87e3063db9f 100644 --- a/testdata/gopath/src/project/pkg/controller/firstmate/firstmate_controller_suite_test.go +++ b/testdata/gopath/src/project/pkg/controller/firstmate/firstmate_controller_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/firstmate/firstmate_controller_test.go b/testdata/gopath/src/project/pkg/controller/firstmate/firstmate_controller_test.go index 6e7d191ce3a..32e14cdd3ed 100644 --- a/testdata/gopath/src/project/pkg/controller/firstmate/firstmate_controller_test.go +++ b/testdata/gopath/src/project/pkg/controller/firstmate/firstmate_controller_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/frigate/frigate_controller.go b/testdata/gopath/src/project/pkg/controller/frigate/frigate_controller.go index 87b8a867df1..0f8f093f4ed 100644 --- a/testdata/gopath/src/project/pkg/controller/frigate/frigate_controller.go +++ b/testdata/gopath/src/project/pkg/controller/frigate/frigate_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/frigate/frigate_controller_suite_test.go b/testdata/gopath/src/project/pkg/controller/frigate/frigate_controller_suite_test.go index 3598e5b2fd1..76fff5e6a2a 100644 --- a/testdata/gopath/src/project/pkg/controller/frigate/frigate_controller_suite_test.go +++ b/testdata/gopath/src/project/pkg/controller/frigate/frigate_controller_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/frigate/frigate_controller_test.go b/testdata/gopath/src/project/pkg/controller/frigate/frigate_controller_test.go index 5beae0fc4a1..ffe256f50a8 100644 --- a/testdata/gopath/src/project/pkg/controller/frigate/frigate_controller_test.go +++ b/testdata/gopath/src/project/pkg/controller/frigate/frigate_controller_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/healthcheckpolicy/healthcheckpolicy_controller.go b/testdata/gopath/src/project/pkg/controller/healthcheckpolicy/healthcheckpolicy_controller.go index 78fb4b0d389..2ce04992c81 100644 --- a/testdata/gopath/src/project/pkg/controller/healthcheckpolicy/healthcheckpolicy_controller.go +++ b/testdata/gopath/src/project/pkg/controller/healthcheckpolicy/healthcheckpolicy_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/healthcheckpolicy/healthcheckpolicy_controller_suite_test.go b/testdata/gopath/src/project/pkg/controller/healthcheckpolicy/healthcheckpolicy_controller_suite_test.go index 70e428c06e7..a2ad5128211 100644 --- a/testdata/gopath/src/project/pkg/controller/healthcheckpolicy/healthcheckpolicy_controller_suite_test.go +++ b/testdata/gopath/src/project/pkg/controller/healthcheckpolicy/healthcheckpolicy_controller_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/healthcheckpolicy/healthcheckpolicy_controller_test.go b/testdata/gopath/src/project/pkg/controller/healthcheckpolicy/healthcheckpolicy_controller_test.go index c475be2ea04..3ec4f24baf1 100644 --- a/testdata/gopath/src/project/pkg/controller/healthcheckpolicy/healthcheckpolicy_controller_test.go +++ b/testdata/gopath/src/project/pkg/controller/healthcheckpolicy/healthcheckpolicy_controller_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/kraken/kraken_controller.go b/testdata/gopath/src/project/pkg/controller/kraken/kraken_controller.go index dd69a13d84d..1bb944a3e93 100644 --- a/testdata/gopath/src/project/pkg/controller/kraken/kraken_controller.go +++ b/testdata/gopath/src/project/pkg/controller/kraken/kraken_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/kraken/kraken_controller_suite_test.go b/testdata/gopath/src/project/pkg/controller/kraken/kraken_controller_suite_test.go index 3061742bba5..022316b9a0c 100644 --- a/testdata/gopath/src/project/pkg/controller/kraken/kraken_controller_suite_test.go +++ b/testdata/gopath/src/project/pkg/controller/kraken/kraken_controller_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/kraken/kraken_controller_test.go b/testdata/gopath/src/project/pkg/controller/kraken/kraken_controller_test.go index 5453238f3ea..fbdcd0afb21 100644 --- a/testdata/gopath/src/project/pkg/controller/kraken/kraken_controller_test.go +++ b/testdata/gopath/src/project/pkg/controller/kraken/kraken_controller_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/namespace/namespace_controller.go b/testdata/gopath/src/project/pkg/controller/namespace/namespace_controller.go index 91be9177255..0183b25fd9a 100644 --- a/testdata/gopath/src/project/pkg/controller/namespace/namespace_controller.go +++ b/testdata/gopath/src/project/pkg/controller/namespace/namespace_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/namespace/namespace_controller_suite_test.go b/testdata/gopath/src/project/pkg/controller/namespace/namespace_controller_suite_test.go index e4443287f49..c312a2f8242 100644 --- a/testdata/gopath/src/project/pkg/controller/namespace/namespace_controller_suite_test.go +++ b/testdata/gopath/src/project/pkg/controller/namespace/namespace_controller_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/controller/namespace/namespace_controller_test.go b/testdata/gopath/src/project/pkg/controller/namespace/namespace_controller_test.go index 6badd00fe0a..a3c6b196d5f 100644 --- a/testdata/gopath/src/project/pkg/controller/namespace/namespace_controller_test.go +++ b/testdata/gopath/src/project/pkg/controller/namespace/namespace_controller_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/add_default_server.go b/testdata/gopath/src/project/pkg/webhook/add_default_server.go index 6d5e2193423..a73d08c0598 100644 --- a/testdata/gopath/src/project/pkg/webhook/add_default_server.go +++ b/testdata/gopath/src/project/pkg/webhook/add_default_server.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/add_mutating_firstmate.go b/testdata/gopath/src/project/pkg/webhook/default_server/add_mutating_firstmate.go index d5b92d06a66..58e9eddfc08 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/add_mutating_firstmate.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/add_mutating_firstmate.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/add_mutating_namespace.go b/testdata/gopath/src/project/pkg/webhook/default_server/add_mutating_namespace.go index 763a137be21..0fac1725104 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/add_mutating_namespace.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/add_mutating_namespace.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/add_validating_frigate.go b/testdata/gopath/src/project/pkg/webhook/default_server/add_validating_frigate.go index 0b8073a3c10..f63c0a88ebf 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/add_validating_frigate.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/add_validating_frigate.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/add_validating_kraken.go b/testdata/gopath/src/project/pkg/webhook/default_server/add_validating_kraken.go index 65bd75d1423..7e85fa33453 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/add_validating_kraken.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/add_validating_kraken.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/create_update_webhook.go b/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/create_update_webhook.go index b226ca78e3f..afb3e2a3be8 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/create_update_webhook.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/create_update_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/delete_webhook.go b/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/delete_webhook.go index e6b4bb3bb2f..8f9fd327426 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/delete_webhook.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/delete_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/firstmate_create_update_handler.go b/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/firstmate_create_update_handler.go index bb9275df4e3..6170c993a71 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/firstmate_create_update_handler.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/firstmate_create_update_handler.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/firstmate_delete_handler.go b/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/firstmate_delete_handler.go index 7147f369e59..c5e59012ab8 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/firstmate_delete_handler.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/firstmate_delete_handler.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/webhooks.go b/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/webhooks.go index bf37f7ab4f2..b58f39a08a7 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/webhooks.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/firstmate/mutating/webhooks.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/frigate/validating/frigate_update_handler.go b/testdata/gopath/src/project/pkg/webhook/default_server/frigate/validating/frigate_update_handler.go index 62352ac15b3..21ab6f7cda2 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/frigate/validating/frigate_update_handler.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/frigate/validating/frigate_update_handler.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/frigate/validating/update_webhook.go b/testdata/gopath/src/project/pkg/webhook/default_server/frigate/validating/update_webhook.go index e0187628ed1..4e6d45bce42 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/frigate/validating/update_webhook.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/frigate/validating/update_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/frigate/validating/webhooks.go b/testdata/gopath/src/project/pkg/webhook/default_server/frigate/validating/webhooks.go index ac19d661388..7b9def7594a 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/frigate/validating/webhooks.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/frigate/validating/webhooks.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/kraken/validating/create_webhook.go b/testdata/gopath/src/project/pkg/webhook/default_server/kraken/validating/create_webhook.go index e895ad1c767..af92d4bbab4 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/kraken/validating/create_webhook.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/kraken/validating/create_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/kraken/validating/kraken_create_handler.go b/testdata/gopath/src/project/pkg/webhook/default_server/kraken/validating/kraken_create_handler.go index 743bddbf68d..49e3d5e5f96 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/kraken/validating/kraken_create_handler.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/kraken/validating/kraken_create_handler.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/kraken/validating/webhooks.go b/testdata/gopath/src/project/pkg/webhook/default_server/kraken/validating/webhooks.go index ac19d661388..7b9def7594a 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/kraken/validating/webhooks.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/kraken/validating/webhooks.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/namespace/mutating/namespace_update_handler.go b/testdata/gopath/src/project/pkg/webhook/default_server/namespace/mutating/namespace_update_handler.go index be800d3a957..600e2ded1dd 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/namespace/mutating/namespace_update_handler.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/namespace/mutating/namespace_update_handler.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/namespace/mutating/update_webhook.go b/testdata/gopath/src/project/pkg/webhook/default_server/namespace/mutating/update_webhook.go index 84331cc975c..35e73c94cc1 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/namespace/mutating/update_webhook.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/namespace/mutating/update_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/namespace/mutating/webhooks.go b/testdata/gopath/src/project/pkg/webhook/default_server/namespace/mutating/webhooks.go index bf37f7ab4f2..b58f39a08a7 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/namespace/mutating/webhooks.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/namespace/mutating/webhooks.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/default_server/server.go b/testdata/gopath/src/project/pkg/webhook/default_server/server.go index 242ebb8221e..73987ccd4c5 100644 --- a/testdata/gopath/src/project/pkg/webhook/default_server/server.go +++ b/testdata/gopath/src/project/pkg/webhook/default_server/server.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/gopath/src/project/pkg/webhook/webhook.go b/testdata/gopath/src/project/pkg/webhook/webhook.go index 646d6d5f953..3a74599e432 100644 --- a/testdata/gopath/src/project/pkg/webhook/webhook.go +++ b/testdata/gopath/src/project/pkg/webhook/webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-addon/api/v1/admiral_types.go b/testdata/project-v2-addon/api/v1/admiral_types.go index 593eb86207e..84d1093b945 100644 --- a/testdata/project-v2-addon/api/v1/admiral_types.go +++ b/testdata/project-v2-addon/api/v1/admiral_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-addon/api/v1/captain_types.go b/testdata/project-v2-addon/api/v1/captain_types.go index 13f5e8867fd..611310065b5 100644 --- a/testdata/project-v2-addon/api/v1/captain_types.go +++ b/testdata/project-v2-addon/api/v1/captain_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-addon/api/v1/firstmate_types.go b/testdata/project-v2-addon/api/v1/firstmate_types.go index ecd262dfe88..59a261cb3ff 100644 --- a/testdata/project-v2-addon/api/v1/firstmate_types.go +++ b/testdata/project-v2-addon/api/v1/firstmate_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-addon/api/v1/groupversion_info.go b/testdata/project-v2-addon/api/v1/groupversion_info.go index 16821d46605..5314f581247 100644 --- a/testdata/project-v2-addon/api/v1/groupversion_info.go +++ b/testdata/project-v2-addon/api/v1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-addon/api/v1/zz_generated.deepcopy.go b/testdata/project-v2-addon/api/v1/zz_generated.deepcopy.go index 86eef8d4a66..2c7ff18b02a 100644 --- a/testdata/project-v2-addon/api/v1/zz_generated.deepcopy.go +++ b/testdata/project-v2-addon/api/v1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-addon/controllers/admiral_controller.go b/testdata/project-v2-addon/controllers/admiral_controller.go index 80a2c7f2c37..0f88e5d8a93 100644 --- a/testdata/project-v2-addon/controllers/admiral_controller.go +++ b/testdata/project-v2-addon/controllers/admiral_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-addon/controllers/captain_controller.go b/testdata/project-v2-addon/controllers/captain_controller.go index fc3bed7d8f7..7c138108147 100644 --- a/testdata/project-v2-addon/controllers/captain_controller.go +++ b/testdata/project-v2-addon/controllers/captain_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-addon/controllers/firstmate_controller.go b/testdata/project-v2-addon/controllers/firstmate_controller.go index a20539ecca8..26d71c11d5a 100644 --- a/testdata/project-v2-addon/controllers/firstmate_controller.go +++ b/testdata/project-v2-addon/controllers/firstmate_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-addon/controllers/suite_test.go b/testdata/project-v2-addon/controllers/suite_test.go index 7a1e21d2a31..55333c39ae5 100644 --- a/testdata/project-v2-addon/controllers/suite_test.go +++ b/testdata/project-v2-addon/controllers/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-addon/hack/boilerplate.go.txt b/testdata/project-v2-addon/hack/boilerplate.go.txt index b75c7954b88..99e0a002dd8 100644 --- a/testdata/project-v2-addon/hack/boilerplate.go.txt +++ b/testdata/project-v2-addon/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-addon/main.go b/testdata/project-v2-addon/main.go index 13a00d163b1..fcff178b22b 100644 --- a/testdata/project-v2-addon/main.go +++ b/testdata/project-v2-addon/main.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/crew/v1/captain_types.go b/testdata/project-v2-multigroup/apis/crew/v1/captain_types.go index 7e53a3ae138..17e2bf63290 100644 --- a/testdata/project-v2-multigroup/apis/crew/v1/captain_types.go +++ b/testdata/project-v2-multigroup/apis/crew/v1/captain_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/crew/v1/captain_webhook.go b/testdata/project-v2-multigroup/apis/crew/v1/captain_webhook.go index 6f206e0f7e5..95fe984d98b 100644 --- a/testdata/project-v2-multigroup/apis/crew/v1/captain_webhook.go +++ b/testdata/project-v2-multigroup/apis/crew/v1/captain_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/crew/v1/groupversion_info.go b/testdata/project-v2-multigroup/apis/crew/v1/groupversion_info.go index 16821d46605..5314f581247 100644 --- a/testdata/project-v2-multigroup/apis/crew/v1/groupversion_info.go +++ b/testdata/project-v2-multigroup/apis/crew/v1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/crew/v1/zz_generated.deepcopy.go b/testdata/project-v2-multigroup/apis/crew/v1/zz_generated.deepcopy.go index be62a68e8c3..dc8e3791ad0 100644 --- a/testdata/project-v2-multigroup/apis/crew/v1/zz_generated.deepcopy.go +++ b/testdata/project-v2-multigroup/apis/crew/v1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/foo.policy/v1/groupversion_info.go b/testdata/project-v2-multigroup/apis/foo.policy/v1/groupversion_info.go index 5608d284538..295a2ff65c8 100644 --- a/testdata/project-v2-multigroup/apis/foo.policy/v1/groupversion_info.go +++ b/testdata/project-v2-multigroup/apis/foo.policy/v1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/foo.policy/v1/healthcheckpolicy_types.go b/testdata/project-v2-multigroup/apis/foo.policy/v1/healthcheckpolicy_types.go index 67915fdfbaa..f8b4653592c 100644 --- a/testdata/project-v2-multigroup/apis/foo.policy/v1/healthcheckpolicy_types.go +++ b/testdata/project-v2-multigroup/apis/foo.policy/v1/healthcheckpolicy_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/foo.policy/v1/zz_generated.deepcopy.go b/testdata/project-v2-multigroup/apis/foo.policy/v1/zz_generated.deepcopy.go index 95ae2daa6bb..a60d7e6746e 100644 --- a/testdata/project-v2-multigroup/apis/foo.policy/v1/zz_generated.deepcopy.go +++ b/testdata/project-v2-multigroup/apis/foo.policy/v1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/groupversion_info.go b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/groupversion_info.go index 8126ea238b7..81af5509ebc 100644 --- a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/groupversion_info.go +++ b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/kraken_types.go b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/kraken_types.go index 187fa428020..2981f2e5bf7 100644 --- a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/kraken_types.go +++ b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/kraken_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/zz_generated.deepcopy.go b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/zz_generated.deepcopy.go index 9ef217c7947..e25c50ce9ec 100644 --- a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/zz_generated.deepcopy.go +++ b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/groupversion_info.go b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/groupversion_info.go index e280a1ae97c..29e5acabac5 100644 --- a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/groupversion_info.go +++ b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/leviathan_types.go b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/leviathan_types.go index b08168b70db..a3da4734a31 100644 --- a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/leviathan_types.go +++ b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/leviathan_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/zz_generated.deepcopy.go b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/zz_generated.deepcopy.go index b6960c5d93b..d5897d6f283 100644 --- a/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/zz_generated.deepcopy.go +++ b/testdata/project-v2-multigroup/apis/sea-creatures/v1beta2/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/ship/v1/destroyer_types.go b/testdata/project-v2-multigroup/apis/ship/v1/destroyer_types.go index e7335040b57..e726daff5d8 100644 --- a/testdata/project-v2-multigroup/apis/ship/v1/destroyer_types.go +++ b/testdata/project-v2-multigroup/apis/ship/v1/destroyer_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/ship/v1/groupversion_info.go b/testdata/project-v2-multigroup/apis/ship/v1/groupversion_info.go index 1cb2de6dd6a..58578b1c117 100644 --- a/testdata/project-v2-multigroup/apis/ship/v1/groupversion_info.go +++ b/testdata/project-v2-multigroup/apis/ship/v1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/ship/v1/zz_generated.deepcopy.go b/testdata/project-v2-multigroup/apis/ship/v1/zz_generated.deepcopy.go index 8adc54549f2..7eafe038015 100644 --- a/testdata/project-v2-multigroup/apis/ship/v1/zz_generated.deepcopy.go +++ b/testdata/project-v2-multigroup/apis/ship/v1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_types.go b/testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_types.go index c6a49c77905..35cb1d64fbc 100644 --- a/testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_types.go +++ b/testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_webhook.go b/testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_webhook.go index 06327f54b3d..62b410b55c6 100644 --- a/testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_webhook.go +++ b/testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/ship/v1beta1/groupversion_info.go b/testdata/project-v2-multigroup/apis/ship/v1beta1/groupversion_info.go index 09119c7cd7e..7167a225efa 100644 --- a/testdata/project-v2-multigroup/apis/ship/v1beta1/groupversion_info.go +++ b/testdata/project-v2-multigroup/apis/ship/v1beta1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/ship/v1beta1/zz_generated.deepcopy.go b/testdata/project-v2-multigroup/apis/ship/v1beta1/zz_generated.deepcopy.go index 5da84c8d477..00fe91f2c62 100644 --- a/testdata/project-v2-multigroup/apis/ship/v1beta1/zz_generated.deepcopy.go +++ b/testdata/project-v2-multigroup/apis/ship/v1beta1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/ship/v2alpha1/cruiser_types.go b/testdata/project-v2-multigroup/apis/ship/v2alpha1/cruiser_types.go index fb5f85455b6..aa35423e29e 100644 --- a/testdata/project-v2-multigroup/apis/ship/v2alpha1/cruiser_types.go +++ b/testdata/project-v2-multigroup/apis/ship/v2alpha1/cruiser_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/ship/v2alpha1/groupversion_info.go b/testdata/project-v2-multigroup/apis/ship/v2alpha1/groupversion_info.go index 93b6d3dc548..d1b8bcba99a 100644 --- a/testdata/project-v2-multigroup/apis/ship/v2alpha1/groupversion_info.go +++ b/testdata/project-v2-multigroup/apis/ship/v2alpha1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/apis/ship/v2alpha1/zz_generated.deepcopy.go b/testdata/project-v2-multigroup/apis/ship/v2alpha1/zz_generated.deepcopy.go index f730e043751..ab3452d28a1 100644 --- a/testdata/project-v2-multigroup/apis/ship/v2alpha1/zz_generated.deepcopy.go +++ b/testdata/project-v2-multigroup/apis/ship/v2alpha1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/controllers/crew/captain_controller.go b/testdata/project-v2-multigroup/controllers/crew/captain_controller.go index 2c4125e68ae..b7cf4320dae 100644 --- a/testdata/project-v2-multigroup/controllers/crew/captain_controller.go +++ b/testdata/project-v2-multigroup/controllers/crew/captain_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/controllers/crew/suite_test.go b/testdata/project-v2-multigroup/controllers/crew/suite_test.go index 8859fd5ccaf..b475fa7db39 100644 --- a/testdata/project-v2-multigroup/controllers/crew/suite_test.go +++ b/testdata/project-v2-multigroup/controllers/crew/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/controllers/foo.policy/healthcheckpolicy_controller.go b/testdata/project-v2-multigroup/controllers/foo.policy/healthcheckpolicy_controller.go index 99a54781c3d..5c67241d2b3 100644 --- a/testdata/project-v2-multigroup/controllers/foo.policy/healthcheckpolicy_controller.go +++ b/testdata/project-v2-multigroup/controllers/foo.policy/healthcheckpolicy_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/controllers/foo.policy/suite_test.go b/testdata/project-v2-multigroup/controllers/foo.policy/suite_test.go index bef9440b9ea..174194332e3 100644 --- a/testdata/project-v2-multigroup/controllers/foo.policy/suite_test.go +++ b/testdata/project-v2-multigroup/controllers/foo.policy/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/controllers/sea-creatures/kraken_controller.go b/testdata/project-v2-multigroup/controllers/sea-creatures/kraken_controller.go index 750498d39ca..d14da39ae99 100644 --- a/testdata/project-v2-multigroup/controllers/sea-creatures/kraken_controller.go +++ b/testdata/project-v2-multigroup/controllers/sea-creatures/kraken_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/controllers/sea-creatures/leviathan_controller.go b/testdata/project-v2-multigroup/controllers/sea-creatures/leviathan_controller.go index dd32ce5d000..7290f1dd4e6 100644 --- a/testdata/project-v2-multigroup/controllers/sea-creatures/leviathan_controller.go +++ b/testdata/project-v2-multigroup/controllers/sea-creatures/leviathan_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/controllers/sea-creatures/suite_test.go b/testdata/project-v2-multigroup/controllers/sea-creatures/suite_test.go index 77cf98cdf63..2a2cc52561f 100644 --- a/testdata/project-v2-multigroup/controllers/sea-creatures/suite_test.go +++ b/testdata/project-v2-multigroup/controllers/sea-creatures/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/controllers/ship/cruiser_controller.go b/testdata/project-v2-multigroup/controllers/ship/cruiser_controller.go index f8b0d01d336..dede0547987 100644 --- a/testdata/project-v2-multigroup/controllers/ship/cruiser_controller.go +++ b/testdata/project-v2-multigroup/controllers/ship/cruiser_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/controllers/ship/destroyer_controller.go b/testdata/project-v2-multigroup/controllers/ship/destroyer_controller.go index d2f07107b87..ccb5bc6475f 100644 --- a/testdata/project-v2-multigroup/controllers/ship/destroyer_controller.go +++ b/testdata/project-v2-multigroup/controllers/ship/destroyer_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/controllers/ship/frigate_controller.go b/testdata/project-v2-multigroup/controllers/ship/frigate_controller.go index b9887cda17d..fa0475e790c 100644 --- a/testdata/project-v2-multigroup/controllers/ship/frigate_controller.go +++ b/testdata/project-v2-multigroup/controllers/ship/frigate_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/controllers/ship/suite_test.go b/testdata/project-v2-multigroup/controllers/ship/suite_test.go index f06f8035bb4..483c1ccbc86 100644 --- a/testdata/project-v2-multigroup/controllers/ship/suite_test.go +++ b/testdata/project-v2-multigroup/controllers/ship/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/hack/boilerplate.go.txt b/testdata/project-v2-multigroup/hack/boilerplate.go.txt index b75c7954b88..99e0a002dd8 100644 --- a/testdata/project-v2-multigroup/hack/boilerplate.go.txt +++ b/testdata/project-v2-multigroup/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2-multigroup/main.go b/testdata/project-v2-multigroup/main.go index da897f08f88..218fcd44f03 100644 --- a/testdata/project-v2-multigroup/main.go +++ b/testdata/project-v2-multigroup/main.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2/api/v1/admiral_types.go b/testdata/project-v2/api/v1/admiral_types.go index b5215c45707..8063c229273 100644 --- a/testdata/project-v2/api/v1/admiral_types.go +++ b/testdata/project-v2/api/v1/admiral_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2/api/v1/captain_types.go b/testdata/project-v2/api/v1/captain_types.go index 7e53a3ae138..17e2bf63290 100644 --- a/testdata/project-v2/api/v1/captain_types.go +++ b/testdata/project-v2/api/v1/captain_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2/api/v1/captain_webhook.go b/testdata/project-v2/api/v1/captain_webhook.go index 6f206e0f7e5..95fe984d98b 100644 --- a/testdata/project-v2/api/v1/captain_webhook.go +++ b/testdata/project-v2/api/v1/captain_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2/api/v1/firstmate_types.go b/testdata/project-v2/api/v1/firstmate_types.go index 862d7d7e14e..02e534321a1 100644 --- a/testdata/project-v2/api/v1/firstmate_types.go +++ b/testdata/project-v2/api/v1/firstmate_types.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2/api/v1/firstmate_webhook.go b/testdata/project-v2/api/v1/firstmate_webhook.go index 703a865c107..3b9ec92565b 100644 --- a/testdata/project-v2/api/v1/firstmate_webhook.go +++ b/testdata/project-v2/api/v1/firstmate_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2/api/v1/groupversion_info.go b/testdata/project-v2/api/v1/groupversion_info.go index 16821d46605..5314f581247 100644 --- a/testdata/project-v2/api/v1/groupversion_info.go +++ b/testdata/project-v2/api/v1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2/api/v1/zz_generated.deepcopy.go b/testdata/project-v2/api/v1/zz_generated.deepcopy.go index 7015b52ea8e..aa7f8f665cc 100644 --- a/testdata/project-v2/api/v1/zz_generated.deepcopy.go +++ b/testdata/project-v2/api/v1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2/controllers/admiral_controller.go b/testdata/project-v2/controllers/admiral_controller.go index c3fe66835e0..eb22785a4da 100644 --- a/testdata/project-v2/controllers/admiral_controller.go +++ b/testdata/project-v2/controllers/admiral_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2/controllers/captain_controller.go b/testdata/project-v2/controllers/captain_controller.go index 167cd8e06f0..d5685a1522f 100644 --- a/testdata/project-v2/controllers/captain_controller.go +++ b/testdata/project-v2/controllers/captain_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2/controllers/firstmate_controller.go b/testdata/project-v2/controllers/firstmate_controller.go index e9517f3dcc8..45fac2320cb 100644 --- a/testdata/project-v2/controllers/firstmate_controller.go +++ b/testdata/project-v2/controllers/firstmate_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2/controllers/suite_test.go b/testdata/project-v2/controllers/suite_test.go index 3567d134501..02bd862747c 100644 --- a/testdata/project-v2/controllers/suite_test.go +++ b/testdata/project-v2/controllers/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2/hack/boilerplate.go.txt b/testdata/project-v2/hack/boilerplate.go.txt index b75c7954b88..99e0a002dd8 100644 --- a/testdata/project-v2/hack/boilerplate.go.txt +++ b/testdata/project-v2/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/testdata/project-v2/main.go b/testdata/project-v2/main.go index dbcb3f87f78..cd764b87c14 100644 --- a/testdata/project-v2/main.go +++ b/testdata/project-v2/main.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Kubernetes authors. +Copyright 2021 The Kubernetes authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.