From 34434ea922a5ac663eccef3c4d5cb159de9a512f Mon Sep 17 00:00:00 2001 From: ankitm123 Date: Thu, 6 Jan 2022 10:05:47 -0500 Subject: [PATCH] :warning: (go/v3) upgrade controller-runtime from 0.10 to 0.11, k8s from 1.22 to 1.23 and golang version to 1.17 Signed-off-by: ankitm123 --- .../testdata/project/Dockerfile | 2 +- .../testdata/project/go.mod | 2 +- .../testdata/project/Dockerfile | 2 +- .../manually_migration_guide_v2_v3.md | 2 +- .../testdata/project/Dockerfile | 2 +- docs/book/utils/go.mod | 2 +- go.mod | 76 +++++++++-- go.sum | 109 +++++++++++----- pkg/plugins/golang/v3/scaffolds/init.go | 2 +- .../internal/templates/dockerfile.go | 2 +- .../v3/scaffolds/internal/templates/gomod.go | 2 +- .../project-v2-addon/api/v1/admiral_types.go | 2 +- .../project-v2-addon/api/v1/captain_types.go | 2 +- .../api/v1/firstmate_types.go | 2 +- .../api/v1/groupversion_info.go | 2 +- .../api/v1/zz_generated.deepcopy.go | 3 +- .../controllers/admiral_controller.go | 2 +- .../controllers/captain_controller.go | 2 +- .../controllers/firstmate_controller.go | 2 +- .../controllers/suite_test.go | 2 +- .../project-v2-addon/hack/boilerplate.go.txt | 2 +- testdata/project-v2-addon/main.go | 2 +- .../apis/crew/v1/captain_types.go | 2 +- .../apis/crew/v1/captain_webhook.go | 2 +- .../apis/crew/v1/groupversion_info.go | 2 +- .../apis/crew/v1/zz_generated.deepcopy.go | 3 +- .../apis/foo.policy/v1/groupversion_info.go | 2 +- .../foo.policy/v1/healthcheckpolicy_types.go | 2 +- .../foo.policy/v1/zz_generated.deepcopy.go | 3 +- .../v1beta1/groupversion_info.go | 2 +- .../sea-creatures/v1beta1/kraken_types.go | 2 +- .../v1beta1/zz_generated.deepcopy.go | 3 +- .../v1beta2/groupversion_info.go | 2 +- .../sea-creatures/v1beta2/leviathan_types.go | 2 +- .../v1beta2/zz_generated.deepcopy.go | 3 +- .../apis/ship/v1/destroyer_types.go | 2 +- .../apis/ship/v1/destroyer_webhook.go | 2 +- .../apis/ship/v1/groupversion_info.go | 2 +- .../apis/ship/v1/zz_generated.deepcopy.go | 3 +- .../apis/ship/v1beta1/frigate_types.go | 2 +- .../apis/ship/v1beta1/frigate_webhook.go | 2 +- .../apis/ship/v1beta1/groupversion_info.go | 2 +- .../ship/v1beta1/zz_generated.deepcopy.go | 3 +- .../apis/ship/v2alpha1/cruiser_types.go | 2 +- .../apis/ship/v2alpha1/cruiser_webhook.go | 2 +- .../apis/ship/v2alpha1/groupversion_info.go | 2 +- .../ship/v2alpha1/zz_generated.deepcopy.go | 3 +- .../controllers/apps/deployment_controller.go | 2 +- .../controllers/apps/suite_test.go | 2 +- .../controllers/crew/captain_controller.go | 2 +- .../controllers/crew/suite_test.go | 2 +- .../healthcheckpolicy_controller.go | 2 +- .../controllers/foo.policy/suite_test.go | 2 +- .../sea-creatures/kraken_controller.go | 2 +- .../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 +- .../controllers/ship/suite_test.go | 2 +- .../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/admiral_webhook.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 +- .../project-v2/api/v1/firstmate_webhook.go | 2 +- .../project-v2/api/v1/groupversion_info.go | 2 +- .../api/v1/zz_generated.deepcopy.go | 3 +- .../controllers/admiral_controller.go | 2 +- .../controllers/captain_controller.go | 2 +- .../controllers/firstmate_controller.go | 2 +- .../controllers/laker_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 +- testdata/project-v3-addon/Dockerfile | 2 +- .../project-v3-addon/api/v1/admiral_types.go | 2 +- .../project-v3-addon/api/v1/captain_types.go | 2 +- .../api/v1/firstmate_types.go | 2 +- .../api/v1/groupversion_info.go | 2 +- .../api/v1/zz_generated.deepcopy.go | 3 +- .../controllers/admiral_controller.go | 2 +- .../controllers/captain_controller.go | 2 +- .../controllers/firstmate_controller.go | 2 +- .../controllers/suite_test.go | 2 +- testdata/project-v3-addon/go.mod | 123 +++++++++++++++++- .../project-v3-addon/hack/boilerplate.go.txt | 2 +- testdata/project-v3-addon/main.go | 2 +- testdata/project-v3-config/Dockerfile | 2 +- .../project-v3-config/api/v1/admiral_types.go | 2 +- .../api/v1/admiral_webhook.go | 2 +- .../project-v3-config/api/v1/captain_types.go | 2 +- .../api/v1/captain_webhook.go | 2 +- .../api/v1/firstmate_types.go | 2 +- .../api/v1/firstmate_webhook.go | 2 +- .../api/v1/groupversion_info.go | 2 +- .../api/v1/webhook_suite_test.go | 2 +- .../api/v1/zz_generated.deepcopy.go | 3 +- .../controllers/admiral_controller.go | 4 +- .../controllers/captain_controller.go | 4 +- .../controllers/firstmate_controller.go | 4 +- .../controllers/laker_controller.go | 4 +- .../controllers/suite_test.go | 2 +- testdata/project-v3-config/go.mod | 76 ++++++++++- .../project-v3-config/hack/boilerplate.go.txt | 2 +- testdata/project-v3-config/main.go | 2 +- testdata/project-v3-multigroup/Dockerfile | 2 +- .../apis/crew/v1/captain_types.go | 2 +- .../apis/crew/v1/captain_webhook.go | 2 +- .../apis/crew/v1/groupversion_info.go | 2 +- .../apis/crew/v1/webhook_suite_test.go | 2 +- .../apis/crew/v1/zz_generated.deepcopy.go | 3 +- .../apis/foo.policy/v1/groupversion_info.go | 2 +- .../foo.policy/v1/healthcheckpolicy_types.go | 2 +- .../foo.policy/v1/zz_generated.deepcopy.go | 3 +- .../v1beta1/groupversion_info.go | 2 +- .../sea-creatures/v1beta1/kraken_types.go | 2 +- .../v1beta1/zz_generated.deepcopy.go | 3 +- .../v1beta2/groupversion_info.go | 2 +- .../sea-creatures/v1beta2/leviathan_types.go | 2 +- .../v1beta2/zz_generated.deepcopy.go | 3 +- .../apis/ship/v1/destroyer_types.go | 2 +- .../apis/ship/v1/destroyer_webhook.go | 2 +- .../apis/ship/v1/groupversion_info.go | 2 +- .../apis/ship/v1/webhook_suite_test.go | 2 +- .../apis/ship/v1/zz_generated.deepcopy.go | 3 +- .../apis/ship/v1beta1/frigate_types.go | 2 +- .../apis/ship/v1beta1/frigate_webhook.go | 2 +- .../apis/ship/v1beta1/groupversion_info.go | 2 +- .../ship/v1beta1/zz_generated.deepcopy.go | 3 +- .../apis/ship/v2alpha1/cruiser_types.go | 2 +- .../apis/ship/v2alpha1/cruiser_webhook.go | 2 +- .../apis/ship/v2alpha1/groupversion_info.go | 2 +- .../apis/ship/v2alpha1/webhook_suite_test.go | 2 +- .../ship/v2alpha1/zz_generated.deepcopy.go | 3 +- .../apis/v1/groupversion_info.go | 2 +- .../apis/v1/lakers_types.go | 2 +- .../apis/v1/lakers_webhook.go | 2 +- .../apis/v1/webhook_suite_test.go | 2 +- .../apis/v1/zz_generated.deepcopy.go | 3 +- .../controllers/apps/deployment_controller.go | 4 +- .../controllers/apps/suite_test.go | 2 +- .../controllers/crew/captain_controller.go | 4 +- .../controllers/crew/suite_test.go | 2 +- .../healthcheckpolicy_controller.go | 4 +- .../controllers/foo.policy/suite_test.go | 2 +- .../controllers/lakers_controller.go | 4 +- .../sea-creatures/kraken_controller.go | 4 +- .../sea-creatures/leviathan_controller.go | 4 +- .../controllers/sea-creatures/suite_test.go | 2 +- .../controllers/ship/cruiser_controller.go | 4 +- .../controllers/ship/destroyer_controller.go | 4 +- .../controllers/ship/frigate_controller.go | 4 +- .../controllers/ship/suite_test.go | 2 +- .../controllers/suite_test.go | 2 +- testdata/project-v3-multigroup/go.mod | 76 ++++++++++- .../hack/boilerplate.go.txt | 2 +- testdata/project-v3-multigroup/main.go | 2 +- testdata/project-v3-v1beta1/Dockerfile | 2 +- .../api/v1/admiral_types.go | 2 +- .../api/v1/admiral_webhook.go | 2 +- .../api/v1/groupversion_info.go | 2 +- .../api/v1/webhook_suite_test.go | 2 +- .../api/v1/zz_generated.deepcopy.go | 3 +- .../controllers/admiral_controller.go | 4 +- .../controllers/suite_test.go | 2 +- testdata/project-v3-v1beta1/go.mod | 70 +++++++++- .../hack/boilerplate.go.txt | 2 +- testdata/project-v3-v1beta1/main.go | 2 +- testdata/project-v3/Dockerfile | 2 +- testdata/project-v3/api/v1/admiral_types.go | 2 +- testdata/project-v3/api/v1/admiral_webhook.go | 2 +- testdata/project-v3/api/v1/captain_types.go | 2 +- testdata/project-v3/api/v1/captain_webhook.go | 2 +- testdata/project-v3/api/v1/firstmate_types.go | 2 +- .../project-v3/api/v1/firstmate_webhook.go | 2 +- .../project-v3/api/v1/groupversion_info.go | 2 +- .../project-v3/api/v1/webhook_suite_test.go | 2 +- .../api/v1/zz_generated.deepcopy.go | 3 +- .../controllers/admiral_controller.go | 4 +- .../controllers/captain_controller.go | 4 +- .../controllers/firstmate_controller.go | 4 +- .../controllers/laker_controller.go | 4 +- testdata/project-v3/controllers/suite_test.go | 2 +- testdata/project-v3/go.mod | 76 ++++++++++- testdata/project-v3/hack/boilerplate.go.txt | 2 +- testdata/project-v3/main.go | 2 +- 189 files changed, 754 insertions(+), 273 deletions(-) diff --git a/docs/book/src/component-config-tutorial/testdata/project/Dockerfile b/docs/book/src/component-config-tutorial/testdata/project/Dockerfile index 4152680b742..456533d4c2d 100644 --- a/docs/book/src/component-config-tutorial/testdata/project/Dockerfile +++ b/docs/book/src/component-config-tutorial/testdata/project/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.16 as builder +FROM golang:1.17 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/docs/book/src/component-config-tutorial/testdata/project/go.mod b/docs/book/src/component-config-tutorial/testdata/project/go.mod index c7c37076aec..22797107923 100644 --- a/docs/book/src/component-config-tutorial/testdata/project/go.mod +++ b/docs/book/src/component-config-tutorial/testdata/project/go.mod @@ -1,6 +1,6 @@ module tutorial.kubebuilder.io/project -go 1.16 +go 1.17 require ( k8s.io/apimachinery v0.21.2 diff --git a/docs/book/src/cronjob-tutorial/testdata/project/Dockerfile b/docs/book/src/cronjob-tutorial/testdata/project/Dockerfile index 4152680b742..456533d4c2d 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/Dockerfile +++ b/docs/book/src/cronjob-tutorial/testdata/project/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.16 as builder +FROM golang:1.17 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/docs/book/src/migration/manually_migration_guide_v2_v3.md b/docs/book/src/migration/manually_migration_guide_v2_v3.md index 85346b3577c..dab3f35b357 100644 --- a/docs/book/src/migration/manually_migration_guide_v2_v3.md +++ b/docs/book/src/migration/manually_migration_guide_v2_v3.md @@ -377,7 +377,7 @@ FROM golang:1.13 as builder With: ``` # Build the manager binary -FROM golang:1.16 as builder +FROM golang:1.17 as builder ``` #### Update your Makefile diff --git a/docs/book/src/multiversion-tutorial/testdata/project/Dockerfile b/docs/book/src/multiversion-tutorial/testdata/project/Dockerfile index 4152680b742..456533d4c2d 100644 --- a/docs/book/src/multiversion-tutorial/testdata/project/Dockerfile +++ b/docs/book/src/multiversion-tutorial/testdata/project/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.16 as builder +FROM golang:1.17 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/docs/book/utils/go.mod b/docs/book/utils/go.mod index 34b34552009..bc4ca16ac76 100644 --- a/docs/book/utils/go.mod +++ b/docs/book/utils/go.mod @@ -1,3 +1,3 @@ module sigs.k8s.io/kubebuilder/docs/book/utils -go 1.16 +go 1.17 diff --git a/go.mod b/go.mod index 26f3634a7bf..ae1421cd9f5 100644 --- a/go.mod +++ b/go.mod @@ -1,22 +1,82 @@ module sigs.k8s.io/kubebuilder/v3 -go 1.16 +go 1.17 require ( github.com/cloudflare/cfssl v1.5.0 // for `kubebuilder alpha config-gen` github.com/gobuffalo/flect v0.2.3 github.com/joelanford/go-apidiff v0.1.0 - github.com/onsi/ginkgo v1.16.4 - github.com/onsi/gomega v1.15.0 + github.com/onsi/ginkgo v1.16.5 + github.com/onsi/gomega v1.17.0 github.com/sirupsen/logrus v1.8.1 github.com/spf13/afero v1.6.0 github.com/spf13/cobra v1.2.1 github.com/spf13/pflag v1.0.5 - golang.org/x/text v0.3.7 // indirect - golang.org/x/tools v0.1.5 - k8s.io/apimachinery v0.22.2 // for `kubebuilder alpha config-gen` - sigs.k8s.io/controller-runtime v0.10.0 + golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff + k8s.io/apimachinery v0.23.0 // for `kubebuilder alpha config-gen` + sigs.k8s.io/controller-runtime v0.11.0 sigs.k8s.io/controller-tools v0.7.0 // for `kubebuilder alpha config-gen` sigs.k8s.io/kustomize/kyaml v0.10.21 // for `kubebuilder alpha config-gen` - sigs.k8s.io/yaml v1.2.0 + sigs.k8s.io/yaml v1.3.0 +) + +require ( + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/emirpasic/gods v1.12.0 // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/go-errors/errors v1.0.1 // indirect + github.com/go-logr/logr v1.2.0 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.19.5 // indirect + github.com/go-openapi/swag v0.19.14 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/certificate-transparency-go v1.0.21 // indirect + github.com/google/go-cmp v0.5.6 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/jmoiron/sqlx v1.2.0 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect + github.com/mailru/easyjson v0.7.6 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/sergi/go-diff v1.1.0 // indirect + github.com/src-d/gcfg v1.4.0 // indirect + github.com/stretchr/testify v1.7.0 // indirect + github.com/weppos/publicsuffix-go v0.13.0 // indirect + github.com/xanzy/ssh-agent v0.2.1 // indirect + github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect + github.com/zmap/zcrypto v0.0.0-20200911161511-43ff0ea04f21 // indirect + github.com/zmap/zlint/v2 v2.2.1 // indirect + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect + golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 // indirect + golang.org/x/mod v0.4.2 // indirect + golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect + golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect + gopkg.in/src-d/go-git.v4 v4.13.1 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + k8s.io/api v0.23.0 // indirect + k8s.io/apiextensions-apiserver v0.23.0 // indirect + k8s.io/klog/v2 v2.30.0 // indirect + k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect + k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect + sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect ) diff --git a/go.sum b/go.sum index a781db08878..5befc21b65e 100644 --- a/go.sum +++ b/go.sum @@ -69,6 +69,7 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= @@ -103,6 +104,7 @@ github.com/cloudflare/redoctober v0.0.0-20171127175943-746a508df14c/go.mod h1:6S github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= @@ -140,9 +142,11 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= @@ -150,8 +154,10 @@ github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= +github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/getsentry/raven-go v0.0.0-20180121060056-563b81fc02b7/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -170,9 +176,10 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/zapr v0.4.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= +github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= @@ -194,6 +201,7 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -228,6 +236,8 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= +github.com/google/cel-go v0.9.0/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w= +github.com/google/cel-spec v0.6.0/go.mod h1:Nwjgxy5CbjlPrtCWjeDjUyKMl8w41YBYGjsyDdqk0xA= github.com/google/certificate-transparency-go v1.0.21 h1:Yf1aXowfZ2nuboBsg7iYGLmwsOARdV86pfH3g95wXmE= github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -268,6 +278,7 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= @@ -318,8 +329,9 @@ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFF github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= @@ -380,8 +392,9 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8= @@ -401,14 +414,15 @@ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.14.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= -github.com/onsi/gomega v1.15.0 h1:WjP/FQ/sk43MRmnEcT+MlDw2TFvkrXlprrPST/IudjU= -github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= +github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= @@ -439,6 +453,7 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -524,6 +539,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE= github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod h1:5iU54tB79AMBcySS0R2XIyZBAVmeHranShAFELYx7is= @@ -564,11 +580,14 @@ go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0H go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -584,8 +603,9 @@ golang.org/x/crypto v0.0.0-20200124225646-8b5121be2f68/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -671,8 +691,11 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 h1:ADo5wSpq2gqaCGQWzk7S5vd//0iyyLeAratkEoG5dLE= golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210825183410-e898025ed96a h1:bRuuGXV8wwSdGTB+CtJf+FjgO1APK1CoO39T4BN/XBw= +golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -685,6 +708,8 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -760,13 +785,18 @@ golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo= -golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 h1:M69LAlWZCshgp0QSzyDcSsSIejIEeuaCVpmwcKwyLMk= +golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE= +golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -842,8 +872,9 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff h1:VX/uD7MK0AHXGiScH3fsieUQUcpmRERPDYtqZdJnA+Q= +golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff/go.mod h1:YD9qOF0M9xpSpdWTBbzEl5e/RnCefISl8E5Noe10jFM= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -912,6 +943,7 @@ google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201102152239-715cce707fb0/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -922,6 +954,7 @@ google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -944,6 +977,7 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -955,8 +989,9 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1005,47 +1040,55 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.22.1/go.mod h1:bh13rkTp3F1XEaLGykbyRD2QaTTzPm0e/BMd8ptFONY= -k8s.io/api v0.22.2 h1:M8ZzAD0V6725Fjg53fKeTJxGsJvRbk4TEm/fexHMtfw= k8s.io/api v0.22.2/go.mod h1:y3ydYpLJAaDI+BbSe2xmGcqxiWHmWjkEeIbiwHvnPR8= -k8s.io/apiextensions-apiserver v0.22.1/go.mod h1:HeGmorjtRmRLE+Q8dJu6AYRoZccvCMsghwS8XTUYb2c= -k8s.io/apiextensions-apiserver v0.22.2 h1:zK7qI8Ery7j2CaN23UCFaC1hj7dMiI87n01+nKuewd4= +k8s.io/api v0.23.0 h1:WrL1gb73VSC8obi8cuYETJGXEoFNEh3LU0Pt+Sokgro= +k8s.io/api v0.23.0/go.mod h1:8wmDdLBHBNxtOIytwLstXt5E9PddnZb0GaMcqsvDBpg= k8s.io/apiextensions-apiserver v0.22.2/go.mod h1:2E0Ve/isxNl7tWLSUDgi6+cmwHi5fQRdwGVCxbC+KFA= -k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= -k8s.io/apimachinery v0.22.2 h1:ejz6y/zNma8clPVfNDLnPbleBo6MpoFy/HBiBqCouVk= +k8s.io/apiextensions-apiserver v0.23.0 h1:uii8BYmHYiT2ZTAJxmvc3X8UhNYMxl2A0z0Xq3Pm+WY= +k8s.io/apiextensions-apiserver v0.23.0/go.mod h1:xIFAEEDlAZgpVBl/1VSjGDmLoXAWRG40+GsWhKhAxY4= k8s.io/apimachinery v0.22.2/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= -k8s.io/apiserver v0.22.1/go.mod h1:2mcM6dzSt+XndzVQJX21Gx0/Klo7Aen7i0Ai6tIa400= +k8s.io/apimachinery v0.23.0 h1:mIfWRMjBuMdolAWJ3Fd+aPTMv3X9z+waiARMpvvb0HQ= +k8s.io/apimachinery v0.23.0/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc= k8s.io/apiserver v0.22.2/go.mod h1:vrpMmbyjWrgdyOvZTSpsusQq5iigKNWv9o9KlDAbBHI= -k8s.io/client-go v0.22.1/go.mod h1:BquC5A4UOo4qVDUtoc04/+Nxp1MeHcVc1HJm1KmG8kk= +k8s.io/apiserver v0.23.0/go.mod h1:Cec35u/9zAepDPPFyT+UMrgqOCjgJ5qtfVJDxjZYmt4= k8s.io/client-go v0.22.2/go.mod h1:sAlhrkVDf50ZHx6z4K0S40wISNTarf1r800F+RlCF6U= -k8s.io/code-generator v0.22.1/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o= +k8s.io/client-go v0.23.0/go.mod h1:hrDnpnK1mSr65lHHcUuIZIXDgEbzc7/683c6hyG4jTA= k8s.io/code-generator v0.22.2/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o= -k8s.io/component-base v0.22.1/go.mod h1:0D+Bl8rrnsPN9v0dyYvkqFfBeAd4u7n77ze+p8CMiPo= +k8s.io/code-generator v0.23.0/go.mod h1:vQvOhDXhuzqiVfM/YHp+dmg10WDZCchJVObc9MvowsE= k8s.io/component-base v0.22.2/go.mod h1:5Br2QhI9OTe79p+TzPe9JKNQYvEKbq9rTJDWllunGug= +k8s.io/component-base v0.23.0/go.mod h1:DHH5uiFvLC1edCpvcTDV++NKULdYYU6pR9Tt3HIKMKI= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM= +k8s.io/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw= +k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4= +k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a h1:8dYfu/Fc9Gz2rNJKB9IQRGgQOh2clmRzNIPPY1xLY5g= k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs= +k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/controller-runtime v0.10.0 h1:HgyZmMpjUOrtkaFtCnfxsR1bGRuFoAczSNbn2MoKj5U= -sigs.k8s.io/controller-runtime v0.10.0/go.mod h1:GCdh6kqV6IY4LK0JLwX0Zm6g233RtVGdb/f0+KSfprg= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I= +sigs.k8s.io/controller-runtime v0.11.0 h1:DqO+c8mywcZLFJWILq4iktoECTyn30Bkj0CwgqMpZWQ= +sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA= sigs.k8s.io/controller-tools v0.7.0 h1:iZIz1vEcavyEfxjcTLs1WH/MPf4vhPCtTKhoHqV8/G0= sigs.k8s.io/controller-tools v0.7.0/go.mod h1:bpBAo0VcSDDLuWt47evLhMLPxRPxMDInTEH/YbdeMK0= +sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s= +sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/kustomize/kyaml v0.10.21 h1:KdoEgz3HzmcaLUTFqs6aaqFpsaA9MVRIwOZbi8vMaD0= sigs.k8s.io/kustomize/kyaml v0.10.21/go.mod h1:TYWhGwW9vjoRh3rWqBwB/ZOXyEGRVWe7Ggc3+KZIO+c= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno= sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= -sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= +sigs.k8s.io/structured-merge-diff/v4 v4.2.0 h1:kDvPBbnPk+qYmkHmSo8vKGp438IASWofnbbUKDE/bv0= +sigs.k8s.io/structured-merge-diff/v4 v4.2.0/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= +sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/pkg/plugins/golang/v3/scaffolds/init.go b/pkg/plugins/golang/v3/scaffolds/init.go index 7b3d180dc31..5a134137cc6 100644 --- a/pkg/plugins/golang/v3/scaffolds/init.go +++ b/pkg/plugins/golang/v3/scaffolds/init.go @@ -30,7 +30,7 @@ import ( const ( // ControllerRuntimeVersion is the kubernetes-sigs/controller-runtime version to be used in the project - ControllerRuntimeVersion = "v0.10.0" + ControllerRuntimeVersion = "v0.11.0" // ControllerToolsVersion is the kubernetes-sigs/controller-tools version to be used in the project ControllerToolsVersion = "v0.7.0" // KustomizeVersion is the kubernetes-sigs/kustomize version to be used in the project diff --git a/pkg/plugins/golang/v3/scaffolds/internal/templates/dockerfile.go b/pkg/plugins/golang/v3/scaffolds/internal/templates/dockerfile.go index b9bd3f60272..a072725ccac 100644 --- a/pkg/plugins/golang/v3/scaffolds/internal/templates/dockerfile.go +++ b/pkg/plugins/golang/v3/scaffolds/internal/templates/dockerfile.go @@ -39,7 +39,7 @@ func (f *Dockerfile) SetTemplateDefaults() error { } const dockerfileTemplate = `# Build the manager binary -FROM golang:1.16 as builder +FROM golang:1.17 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/pkg/plugins/golang/v3/scaffolds/internal/templates/gomod.go b/pkg/plugins/golang/v3/scaffolds/internal/templates/gomod.go index 69bd6d7ba55..f2cd7df7a35 100644 --- a/pkg/plugins/golang/v3/scaffolds/internal/templates/gomod.go +++ b/pkg/plugins/golang/v3/scaffolds/internal/templates/gomod.go @@ -46,7 +46,7 @@ func (f *GoMod) SetTemplateDefaults() error { const goModTemplate = ` module {{ .Repo }} -go 1.16 +go 1.17 require ( sigs.k8s.io/controller-runtime {{ .ControllerRuntimeVersion }} diff --git a/testdata/project-v2-addon/api/v1/admiral_types.go b/testdata/project-v2-addon/api/v1/admiral_types.go index 00f0c908dde..027432be46a 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 2021 The Kubernetes authors. +Copyright 2022 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 f562e51d26f..b4bea01a9fb 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 2021 The Kubernetes authors. +Copyright 2022 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 375efbca120..12f64ad0697 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 2021 The Kubernetes authors. +Copyright 2022 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 70a80cb74b6..33458c7506e 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 2021 The Kubernetes authors. +Copyright 2022 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 2c7ff18b02a..d7d62dbdb1c 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,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 47b7abf2cec..746527d62ca 100644 --- a/testdata/project-v2-addon/controllers/admiral_controller.go +++ b/testdata/project-v2-addon/controllers/admiral_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 30d7f55c72d..a294c6f590c 100644 --- a/testdata/project-v2-addon/controllers/captain_controller.go +++ b/testdata/project-v2-addon/controllers/captain_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 283168ebfd8..f92f02f6760 100644 --- a/testdata/project-v2-addon/controllers/firstmate_controller.go +++ b/testdata/project-v2-addon/controllers/firstmate_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 c9e9e3c8ec9..5ae88aa56ce 100644 --- a/testdata/project-v2-addon/controllers/suite_test.go +++ b/testdata/project-v2-addon/controllers/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 99e0a002dd8..b54e305f300 100644 --- a/testdata/project-v2-addon/hack/boilerplate.go.txt +++ b/testdata/project-v2-addon/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 bd4a0903396..70a31af5643 100644 --- a/testdata/project-v2-addon/main.go +++ b/testdata/project-v2-addon/main.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 8ec2699beb0..e81debb719c 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 2021 The Kubernetes authors. +Copyright 2022 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 295dfdfd5ff..0c10648727b 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 2021 The Kubernetes authors. +Copyright 2022 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 70a80cb74b6..33458c7506e 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 2021 The Kubernetes authors. +Copyright 2022 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 dc8e3791ad0..3d19f0cd037 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,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 c308d363e05..29bb003c035 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 2021 The Kubernetes authors. +Copyright 2022 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 c2d1c322e8c..db63b3139a5 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 2021 The Kubernetes authors. +Copyright 2022 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 a60d7e6746e..384b31870fe 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,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 4aabbebe436..7613a89964a 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 2021 The Kubernetes authors. +Copyright 2022 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 0d44cb9fe1b..afb57fff4b0 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 2021 The Kubernetes authors. +Copyright 2022 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 e25c50ce9ec..e8b5ea29fc8 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,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 799b799178f..4334497f3a0 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 2021 The Kubernetes authors. +Copyright 2022 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 39a0d5f9e48..47da45524f6 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 2021 The Kubernetes authors. +Copyright 2022 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 d5897d6f283..e5a09f90a46 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,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 7c4fb62775a..8efa6fad827 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 2021 The Kubernetes authors. +Copyright 2022 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_webhook.go b/testdata/project-v2-multigroup/apis/ship/v1/destroyer_webhook.go index 45489468aab..5c769aa4ae8 100644 --- a/testdata/project-v2-multigroup/apis/ship/v1/destroyer_webhook.go +++ b/testdata/project-v2-multigroup/apis/ship/v1/destroyer_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 b287f4796aa..633f5a4e398 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 2021 The Kubernetes authors. +Copyright 2022 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 7eafe038015..c02c174f0d0 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,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 465bb762e47..c8734a6cf9e 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 2021 The Kubernetes authors. +Copyright 2022 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 62b410b55c6..5e4c482ead0 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 2021 The Kubernetes authors. +Copyright 2022 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 63a0c0483e3..26b0fbd2752 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 2021 The Kubernetes authors. +Copyright 2022 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 00fe91f2c62..d1ac770b5c7 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,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 3e3f99c4efb..6160dc14b1d 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 2021 The Kubernetes authors. +Copyright 2022 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_webhook.go b/testdata/project-v2-multigroup/apis/ship/v2alpha1/cruiser_webhook.go index 91ec949f5ad..bda86bdb977 100644 --- a/testdata/project-v2-multigroup/apis/ship/v2alpha1/cruiser_webhook.go +++ b/testdata/project-v2-multigroup/apis/ship/v2alpha1/cruiser_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 fd609526ee2..ac5d9ee826a 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 2021 The Kubernetes authors. +Copyright 2022 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 e7e42679f78..e335a81bb7d 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,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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/apps/deployment_controller.go b/testdata/project-v2-multigroup/controllers/apps/deployment_controller.go index 73baf3b5cd9..2e375e1ff89 100644 --- a/testdata/project-v2-multigroup/controllers/apps/deployment_controller.go +++ b/testdata/project-v2-multigroup/controllers/apps/deployment_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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/apps/suite_test.go b/testdata/project-v2-multigroup/controllers/apps/suite_test.go index 9c3d92e900b..acd92873518 100644 --- a/testdata/project-v2-multigroup/controllers/apps/suite_test.go +++ b/testdata/project-v2-multigroup/controllers/apps/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 eff2cb1d0d1..8c7754f4586 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 2021 The Kubernetes authors. +Copyright 2022 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 b1d390c13c0..a7a1ac95d49 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 2021 The Kubernetes authors. +Copyright 2022 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 d59f9053e66..0c8b45c0a61 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 2021 The Kubernetes authors. +Copyright 2022 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 d5c280ce764..3d8eb1ba06c 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 2021 The Kubernetes authors. +Copyright 2022 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 8e4554cbb8e..22b843b6bcb 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 2021 The Kubernetes authors. +Copyright 2022 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 dfbd1c3746f..9113b06000c 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 2021 The Kubernetes authors. +Copyright 2022 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 bb4499c780a..4e758228087 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 2021 The Kubernetes authors. +Copyright 2022 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 684ca3ccbea..204c23f7182 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 2021 The Kubernetes authors. +Copyright 2022 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 992ba10d84a..5d22ad6e5ea 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 2021 The Kubernetes authors. +Copyright 2022 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 ff3db41946c..ea90f2a5440 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 2021 The Kubernetes authors. +Copyright 2022 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 72fb2b0b961..3bd1fd0c25d 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 2021 The Kubernetes authors. +Copyright 2022 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 99e0a002dd8..b54e305f300 100644 --- a/testdata/project-v2-multigroup/hack/boilerplate.go.txt +++ b/testdata/project-v2-multigroup/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 9d8addc71ec..53cf8617c7d 100644 --- a/testdata/project-v2-multigroup/main.go +++ b/testdata/project-v2-multigroup/main.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 fe0d8308a70..55d2b767089 100644 --- a/testdata/project-v2/api/v1/admiral_types.go +++ b/testdata/project-v2/api/v1/admiral_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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_webhook.go b/testdata/project-v2/api/v1/admiral_webhook.go index b1b61dfb9c0..9e10e8107d9 100644 --- a/testdata/project-v2/api/v1/admiral_webhook.go +++ b/testdata/project-v2/api/v1/admiral_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 8ec2699beb0..e81debb719c 100644 --- a/testdata/project-v2/api/v1/captain_types.go +++ b/testdata/project-v2/api/v1/captain_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 295dfdfd5ff..0c10648727b 100644 --- a/testdata/project-v2/api/v1/captain_webhook.go +++ b/testdata/project-v2/api/v1/captain_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 99387e72e30..7515759833a 100644 --- a/testdata/project-v2/api/v1/firstmate_types.go +++ b/testdata/project-v2/api/v1/firstmate_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 3b9ec92565b..fda7fac46dc 100644 --- a/testdata/project-v2/api/v1/firstmate_webhook.go +++ b/testdata/project-v2/api/v1/firstmate_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 70a80cb74b6..33458c7506e 100644 --- a/testdata/project-v2/api/v1/groupversion_info.go +++ b/testdata/project-v2/api/v1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 aa7f8f665cc..eb076ea05ea 100644 --- a/testdata/project-v2/api/v1/zz_generated.deepcopy.go +++ b/testdata/project-v2/api/v1/zz_generated.deepcopy.go @@ -1,7 +1,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 47f7ecda573..986ad16922b 100644 --- a/testdata/project-v2/controllers/admiral_controller.go +++ b/testdata/project-v2/controllers/admiral_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 bc643699ec2..57e601b478c 100644 --- a/testdata/project-v2/controllers/captain_controller.go +++ b/testdata/project-v2/controllers/captain_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 071d76da1bf..907cff57dce 100644 --- a/testdata/project-v2/controllers/firstmate_controller.go +++ b/testdata/project-v2/controllers/firstmate_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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/laker_controller.go b/testdata/project-v2/controllers/laker_controller.go index 83642fd5b69..deef42ddca3 100644 --- a/testdata/project-v2/controllers/laker_controller.go +++ b/testdata/project-v2/controllers/laker_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 f94893df865..8564ba7cfff 100644 --- a/testdata/project-v2/controllers/suite_test.go +++ b/testdata/project-v2/controllers/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 99e0a002dd8..b54e305f300 100644 --- a/testdata/project-v2/hack/boilerplate.go.txt +++ b/testdata/project-v2/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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 7f829219857..40f6c91c886 100644 --- a/testdata/project-v2/main.go +++ b/testdata/project-v2/main.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-addon/Dockerfile b/testdata/project-v3-addon/Dockerfile index 4152680b742..456533d4c2d 100644 --- a/testdata/project-v3-addon/Dockerfile +++ b/testdata/project-v3-addon/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.16 as builder +FROM golang:1.17 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/testdata/project-v3-addon/api/v1/admiral_types.go b/testdata/project-v3-addon/api/v1/admiral_types.go index 00f0c908dde..027432be46a 100644 --- a/testdata/project-v3-addon/api/v1/admiral_types.go +++ b/testdata/project-v3-addon/api/v1/admiral_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-addon/api/v1/captain_types.go b/testdata/project-v3-addon/api/v1/captain_types.go index f562e51d26f..b4bea01a9fb 100644 --- a/testdata/project-v3-addon/api/v1/captain_types.go +++ b/testdata/project-v3-addon/api/v1/captain_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-addon/api/v1/firstmate_types.go b/testdata/project-v3-addon/api/v1/firstmate_types.go index 375efbca120..12f64ad0697 100644 --- a/testdata/project-v3-addon/api/v1/firstmate_types.go +++ b/testdata/project-v3-addon/api/v1/firstmate_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-addon/api/v1/groupversion_info.go b/testdata/project-v3-addon/api/v1/groupversion_info.go index 70a80cb74b6..33458c7506e 100644 --- a/testdata/project-v3-addon/api/v1/groupversion_info.go +++ b/testdata/project-v3-addon/api/v1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-addon/api/v1/zz_generated.deepcopy.go b/testdata/project-v3-addon/api/v1/zz_generated.deepcopy.go index 2c7ff18b02a..d7d62dbdb1c 100644 --- a/testdata/project-v3-addon/api/v1/zz_generated.deepcopy.go +++ b/testdata/project-v3-addon/api/v1/zz_generated.deepcopy.go @@ -1,7 +1,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-addon/controllers/admiral_controller.go b/testdata/project-v3-addon/controllers/admiral_controller.go index 0eb73c9ed5a..93599c62d5a 100644 --- a/testdata/project-v3-addon/controllers/admiral_controller.go +++ b/testdata/project-v3-addon/controllers/admiral_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-addon/controllers/captain_controller.go b/testdata/project-v3-addon/controllers/captain_controller.go index f4f2470e9ff..224b1aed121 100644 --- a/testdata/project-v3-addon/controllers/captain_controller.go +++ b/testdata/project-v3-addon/controllers/captain_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-addon/controllers/firstmate_controller.go b/testdata/project-v3-addon/controllers/firstmate_controller.go index d5386353ab6..289b2c07ac6 100644 --- a/testdata/project-v3-addon/controllers/firstmate_controller.go +++ b/testdata/project-v3-addon/controllers/firstmate_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-addon/controllers/suite_test.go b/testdata/project-v3-addon/controllers/suite_test.go index 38766e6559a..cace735160a 100644 --- a/testdata/project-v3-addon/controllers/suite_test.go +++ b/testdata/project-v3-addon/controllers/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-addon/go.mod b/testdata/project-v3-addon/go.mod index 7839dd7079a..aca4c26700e 100644 --- a/testdata/project-v3-addon/go.mod +++ b/testdata/project-v3-addon/go.mod @@ -1,13 +1,122 @@ module sigs.k8s.io/kubebuilder/testdata/project-v3-addon -go 1.16 +go 1.17 require ( - github.com/go-logr/logr v0.4.0 - github.com/onsi/ginkgo v1.16.4 - github.com/onsi/gomega v1.15.0 - k8s.io/apimachinery v0.22.1 - k8s.io/client-go v0.22.1 - sigs.k8s.io/controller-runtime v0.10.0 + github.com/go-logr/logr v1.2.0 + github.com/onsi/ginkgo v1.16.5 + github.com/onsi/gomega v1.17.0 + k8s.io/apimachinery v0.23.0 + k8s.io/client-go v0.23.0 + sigs.k8s.io/controller-runtime v0.11.0 sigs.k8s.io/kubebuilder-declarative-pattern v0.0.0-20210630174303-f77bb4933dfb ) + +require ( + cloud.google.com/go v0.81.0 // indirect + github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/Azure/go-autorest v14.2.0+incompatible // indirect + github.com/Azure/go-autorest/autorest v0.11.18 // indirect + github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect + github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect + github.com/Azure/go-autorest/logger v0.2.1 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/blang/semver/v4 v4.0.0 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/emirpasic/gods v1.12.0 // indirect + github.com/evanphx/json-patch v4.12.0+incompatible // indirect + github.com/evanphx/json-patch/v5 v5.1.0 // indirect + github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect + github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/go-errors/errors v1.0.1 // indirect + github.com/go-git/gcfg v1.5.0 // indirect + github.com/go-git/go-billy/v5 v5.0.0 // indirect + github.com/go-git/go-git/v5 v5.1.0 // indirect + github.com/go-logr/zapr v1.2.0 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.19.5 // indirect + github.com/go-openapi/spec v0.19.5 // indirect + github.com/go-openapi/swag v0.19.14 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/btree v1.0.1 // indirect + github.com/google/go-cmp v0.5.5 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect + github.com/google/uuid v1.1.2 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/jonboulle/clockwork v0.2.2 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect + github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect + github.com/mailru/easyjson v0.7.6 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/go-wordwrap v1.0.0 // indirect + github.com/moby/spdystream v0.2.0 // indirect + github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/peterbourgon/diskv v2.0.1+incompatible // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_golang v1.11.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.28.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/russross/blackfriday v1.5.2 // indirect + github.com/sergi/go-diff v1.1.0 // indirect + github.com/spf13/cobra v1.2.1 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/stretchr/testify v1.7.0 // indirect + github.com/xanzy/ssh-agent v0.2.1 // indirect + github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect + go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + go.uber.org/zap v1.19.1 // indirect + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect + golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect + golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect + golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect + golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect + gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + k8s.io/api v0.23.0 // indirect + k8s.io/apiextensions-apiserver v0.23.0 // indirect + k8s.io/cli-runtime v0.21.1 // indirect + k8s.io/component-base v0.23.0 // indirect + k8s.io/klog/v2 v2.30.0 // indirect + k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect + k8s.io/kubectl v0.21.1 // indirect + k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect + sigs.k8s.io/cli-utils v0.16.0 // indirect + sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect + sigs.k8s.io/kustomize/api v0.8.8 // indirect + sigs.k8s.io/kustomize/kyaml v0.10.17 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect +) diff --git a/testdata/project-v3-addon/hack/boilerplate.go.txt b/testdata/project-v3-addon/hack/boilerplate.go.txt index 99e0a002dd8..b54e305f300 100644 --- a/testdata/project-v3-addon/hack/boilerplate.go.txt +++ b/testdata/project-v3-addon/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-addon/main.go b/testdata/project-v3-addon/main.go index a4dcc9aa2f1..dc898dab8f1 100644 --- a/testdata/project-v3-addon/main.go +++ b/testdata/project-v3-addon/main.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-config/Dockerfile b/testdata/project-v3-config/Dockerfile index 4152680b742..456533d4c2d 100644 --- a/testdata/project-v3-config/Dockerfile +++ b/testdata/project-v3-config/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.16 as builder +FROM golang:1.17 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/testdata/project-v3-config/api/v1/admiral_types.go b/testdata/project-v3-config/api/v1/admiral_types.go index fe0d8308a70..55d2b767089 100644 --- a/testdata/project-v3-config/api/v1/admiral_types.go +++ b/testdata/project-v3-config/api/v1/admiral_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-config/api/v1/admiral_webhook.go b/testdata/project-v3-config/api/v1/admiral_webhook.go index 43b49191cf3..52fbc5ce79f 100644 --- a/testdata/project-v3-config/api/v1/admiral_webhook.go +++ b/testdata/project-v3-config/api/v1/admiral_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-config/api/v1/captain_types.go b/testdata/project-v3-config/api/v1/captain_types.go index 8ec2699beb0..e81debb719c 100644 --- a/testdata/project-v3-config/api/v1/captain_types.go +++ b/testdata/project-v3-config/api/v1/captain_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-config/api/v1/captain_webhook.go b/testdata/project-v3-config/api/v1/captain_webhook.go index dab73ef7551..ba00000c137 100644 --- a/testdata/project-v3-config/api/v1/captain_webhook.go +++ b/testdata/project-v3-config/api/v1/captain_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-config/api/v1/firstmate_types.go b/testdata/project-v3-config/api/v1/firstmate_types.go index 99387e72e30..7515759833a 100644 --- a/testdata/project-v3-config/api/v1/firstmate_types.go +++ b/testdata/project-v3-config/api/v1/firstmate_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-config/api/v1/firstmate_webhook.go b/testdata/project-v3-config/api/v1/firstmate_webhook.go index 23e26d068ea..5fa6046165d 100644 --- a/testdata/project-v3-config/api/v1/firstmate_webhook.go +++ b/testdata/project-v3-config/api/v1/firstmate_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-config/api/v1/groupversion_info.go b/testdata/project-v3-config/api/v1/groupversion_info.go index 70a80cb74b6..33458c7506e 100644 --- a/testdata/project-v3-config/api/v1/groupversion_info.go +++ b/testdata/project-v3-config/api/v1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-config/api/v1/webhook_suite_test.go b/testdata/project-v3-config/api/v1/webhook_suite_test.go index 0443528d2d8..2795330aeb2 100644 --- a/testdata/project-v3-config/api/v1/webhook_suite_test.go +++ b/testdata/project-v3-config/api/v1/webhook_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-config/api/v1/zz_generated.deepcopy.go b/testdata/project-v3-config/api/v1/zz_generated.deepcopy.go index aa7f8f665cc..eb076ea05ea 100644 --- a/testdata/project-v3-config/api/v1/zz_generated.deepcopy.go +++ b/testdata/project-v3-config/api/v1/zz_generated.deepcopy.go @@ -1,7 +1,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-config/controllers/admiral_controller.go b/testdata/project-v3-config/controllers/admiral_controller.go index 0fd1fca98a8..6797ae78dd4 100644 --- a/testdata/project-v3-config/controllers/admiral_controller.go +++ b/testdata/project-v3-config/controllers/admiral_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -45,7 +45,7 @@ type AdmiralReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *AdmiralReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3-config/controllers/captain_controller.go b/testdata/project-v3-config/controllers/captain_controller.go index 14f2104c313..0423c071eec 100644 --- a/testdata/project-v3-config/controllers/captain_controller.go +++ b/testdata/project-v3-config/controllers/captain_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -45,7 +45,7 @@ type CaptainReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *CaptainReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3-config/controllers/firstmate_controller.go b/testdata/project-v3-config/controllers/firstmate_controller.go index 101fe8c62bc..c1f96b0439a 100644 --- a/testdata/project-v3-config/controllers/firstmate_controller.go +++ b/testdata/project-v3-config/controllers/firstmate_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -45,7 +45,7 @@ type FirstMateReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *FirstMateReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3-config/controllers/laker_controller.go b/testdata/project-v3-config/controllers/laker_controller.go index d2863ebf1eb..b4b109f501e 100644 --- a/testdata/project-v3-config/controllers/laker_controller.go +++ b/testdata/project-v3-config/controllers/laker_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -43,7 +43,7 @@ type LakerReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *LakerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3-config/controllers/suite_test.go b/testdata/project-v3-config/controllers/suite_test.go index 4b33a72429e..ed1a5a3bccb 100644 --- a/testdata/project-v3-config/controllers/suite_test.go +++ b/testdata/project-v3-config/controllers/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-config/go.mod b/testdata/project-v3-config/go.mod index d753d98a5f3..33a26f9cf4b 100644 --- a/testdata/project-v3-config/go.mod +++ b/testdata/project-v3-config/go.mod @@ -1,12 +1,74 @@ module sigs.k8s.io/kubebuilder/testdata/project-v3-config -go 1.16 +go 1.17 require ( - github.com/onsi/ginkgo v1.16.4 - github.com/onsi/gomega v1.15.0 - k8s.io/api v0.22.1 - k8s.io/apimachinery v0.22.1 - k8s.io/client-go v0.22.1 - sigs.k8s.io/controller-runtime v0.10.0 + github.com/onsi/ginkgo v1.16.5 + github.com/onsi/gomega v1.17.0 + k8s.io/api v0.23.0 + k8s.io/apimachinery v0.23.0 + k8s.io/client-go v0.23.0 + sigs.k8s.io/controller-runtime v0.11.0 +) + +require ( + cloud.google.com/go v0.81.0 // indirect + github.com/Azure/go-autorest v14.2.0+incompatible // indirect + github.com/Azure/go-autorest/autorest v0.11.18 // indirect + github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect + github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect + github.com/Azure/go-autorest/logger v0.2.1 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/evanphx/json-patch v4.12.0+incompatible // indirect + github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/go-logr/logr v1.2.0 // indirect + github.com/go-logr/zapr v1.2.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.5 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/google/uuid v1.1.2 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/prometheus/client_golang v1.11.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.28.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + go.uber.org/zap v1.19.1 // indirect + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect + golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect + golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect + golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect + golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect + gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + k8s.io/apiextensions-apiserver v0.23.0 // indirect + k8s.io/component-base v0.23.0 // indirect + k8s.io/klog/v2 v2.30.0 // indirect + k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect + k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect + sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/testdata/project-v3-config/hack/boilerplate.go.txt b/testdata/project-v3-config/hack/boilerplate.go.txt index 99e0a002dd8..b54e305f300 100644 --- a/testdata/project-v3-config/hack/boilerplate.go.txt +++ b/testdata/project-v3-config/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-config/main.go b/testdata/project-v3-config/main.go index edec1e0fb19..d3fd27640fe 100644 --- a/testdata/project-v3-config/main.go +++ b/testdata/project-v3-config/main.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/Dockerfile b/testdata/project-v3-multigroup/Dockerfile index 3ab32a14c7e..9a23dc6ee57 100644 --- a/testdata/project-v3-multigroup/Dockerfile +++ b/testdata/project-v3-multigroup/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.16 as builder +FROM golang:1.17 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/testdata/project-v3-multigroup/apis/crew/v1/captain_types.go b/testdata/project-v3-multigroup/apis/crew/v1/captain_types.go index 8ec2699beb0..e81debb719c 100644 --- a/testdata/project-v3-multigroup/apis/crew/v1/captain_types.go +++ b/testdata/project-v3-multigroup/apis/crew/v1/captain_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/crew/v1/captain_webhook.go b/testdata/project-v3-multigroup/apis/crew/v1/captain_webhook.go index dab73ef7551..ba00000c137 100644 --- a/testdata/project-v3-multigroup/apis/crew/v1/captain_webhook.go +++ b/testdata/project-v3-multigroup/apis/crew/v1/captain_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/crew/v1/groupversion_info.go b/testdata/project-v3-multigroup/apis/crew/v1/groupversion_info.go index 70a80cb74b6..33458c7506e 100644 --- a/testdata/project-v3-multigroup/apis/crew/v1/groupversion_info.go +++ b/testdata/project-v3-multigroup/apis/crew/v1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/crew/v1/webhook_suite_test.go b/testdata/project-v3-multigroup/apis/crew/v1/webhook_suite_test.go index f74387dca86..5ef4da2ccd8 100644 --- a/testdata/project-v3-multigroup/apis/crew/v1/webhook_suite_test.go +++ b/testdata/project-v3-multigroup/apis/crew/v1/webhook_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/crew/v1/zz_generated.deepcopy.go b/testdata/project-v3-multigroup/apis/crew/v1/zz_generated.deepcopy.go index dc8e3791ad0..3d19f0cd037 100644 --- a/testdata/project-v3-multigroup/apis/crew/v1/zz_generated.deepcopy.go +++ b/testdata/project-v3-multigroup/apis/crew/v1/zz_generated.deepcopy.go @@ -1,7 +1,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/foo.policy/v1/groupversion_info.go b/testdata/project-v3-multigroup/apis/foo.policy/v1/groupversion_info.go index c308d363e05..29bb003c035 100644 --- a/testdata/project-v3-multigroup/apis/foo.policy/v1/groupversion_info.go +++ b/testdata/project-v3-multigroup/apis/foo.policy/v1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/foo.policy/v1/healthcheckpolicy_types.go b/testdata/project-v3-multigroup/apis/foo.policy/v1/healthcheckpolicy_types.go index c2d1c322e8c..db63b3139a5 100644 --- a/testdata/project-v3-multigroup/apis/foo.policy/v1/healthcheckpolicy_types.go +++ b/testdata/project-v3-multigroup/apis/foo.policy/v1/healthcheckpolicy_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/foo.policy/v1/zz_generated.deepcopy.go b/testdata/project-v3-multigroup/apis/foo.policy/v1/zz_generated.deepcopy.go index a60d7e6746e..384b31870fe 100644 --- a/testdata/project-v3-multigroup/apis/foo.policy/v1/zz_generated.deepcopy.go +++ b/testdata/project-v3-multigroup/apis/foo.policy/v1/zz_generated.deepcopy.go @@ -1,7 +1,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/sea-creatures/v1beta1/groupversion_info.go b/testdata/project-v3-multigroup/apis/sea-creatures/v1beta1/groupversion_info.go index 4aabbebe436..7613a89964a 100644 --- a/testdata/project-v3-multigroup/apis/sea-creatures/v1beta1/groupversion_info.go +++ b/testdata/project-v3-multigroup/apis/sea-creatures/v1beta1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/sea-creatures/v1beta1/kraken_types.go b/testdata/project-v3-multigroup/apis/sea-creatures/v1beta1/kraken_types.go index 0d44cb9fe1b..afb57fff4b0 100644 --- a/testdata/project-v3-multigroup/apis/sea-creatures/v1beta1/kraken_types.go +++ b/testdata/project-v3-multigroup/apis/sea-creatures/v1beta1/kraken_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/sea-creatures/v1beta1/zz_generated.deepcopy.go b/testdata/project-v3-multigroup/apis/sea-creatures/v1beta1/zz_generated.deepcopy.go index e25c50ce9ec..e8b5ea29fc8 100644 --- a/testdata/project-v3-multigroup/apis/sea-creatures/v1beta1/zz_generated.deepcopy.go +++ b/testdata/project-v3-multigroup/apis/sea-creatures/v1beta1/zz_generated.deepcopy.go @@ -1,7 +1,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/sea-creatures/v1beta2/groupversion_info.go b/testdata/project-v3-multigroup/apis/sea-creatures/v1beta2/groupversion_info.go index 799b799178f..4334497f3a0 100644 --- a/testdata/project-v3-multigroup/apis/sea-creatures/v1beta2/groupversion_info.go +++ b/testdata/project-v3-multigroup/apis/sea-creatures/v1beta2/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/sea-creatures/v1beta2/leviathan_types.go b/testdata/project-v3-multigroup/apis/sea-creatures/v1beta2/leviathan_types.go index 39a0d5f9e48..47da45524f6 100644 --- a/testdata/project-v3-multigroup/apis/sea-creatures/v1beta2/leviathan_types.go +++ b/testdata/project-v3-multigroup/apis/sea-creatures/v1beta2/leviathan_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/sea-creatures/v1beta2/zz_generated.deepcopy.go b/testdata/project-v3-multigroup/apis/sea-creatures/v1beta2/zz_generated.deepcopy.go index d5897d6f283..e5a09f90a46 100644 --- a/testdata/project-v3-multigroup/apis/sea-creatures/v1beta2/zz_generated.deepcopy.go +++ b/testdata/project-v3-multigroup/apis/sea-creatures/v1beta2/zz_generated.deepcopy.go @@ -1,7 +1,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/ship/v1/destroyer_types.go b/testdata/project-v3-multigroup/apis/ship/v1/destroyer_types.go index 7c4fb62775a..8efa6fad827 100644 --- a/testdata/project-v3-multigroup/apis/ship/v1/destroyer_types.go +++ b/testdata/project-v3-multigroup/apis/ship/v1/destroyer_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/ship/v1/destroyer_webhook.go b/testdata/project-v3-multigroup/apis/ship/v1/destroyer_webhook.go index 4aa366df6af..e1c0a0a05db 100644 --- a/testdata/project-v3-multigroup/apis/ship/v1/destroyer_webhook.go +++ b/testdata/project-v3-multigroup/apis/ship/v1/destroyer_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/ship/v1/groupversion_info.go b/testdata/project-v3-multigroup/apis/ship/v1/groupversion_info.go index b287f4796aa..633f5a4e398 100644 --- a/testdata/project-v3-multigroup/apis/ship/v1/groupversion_info.go +++ b/testdata/project-v3-multigroup/apis/ship/v1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/ship/v1/webhook_suite_test.go b/testdata/project-v3-multigroup/apis/ship/v1/webhook_suite_test.go index 218761a8fcb..f90b9f33bd0 100644 --- a/testdata/project-v3-multigroup/apis/ship/v1/webhook_suite_test.go +++ b/testdata/project-v3-multigroup/apis/ship/v1/webhook_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/ship/v1/zz_generated.deepcopy.go b/testdata/project-v3-multigroup/apis/ship/v1/zz_generated.deepcopy.go index 7eafe038015..c02c174f0d0 100644 --- a/testdata/project-v3-multigroup/apis/ship/v1/zz_generated.deepcopy.go +++ b/testdata/project-v3-multigroup/apis/ship/v1/zz_generated.deepcopy.go @@ -1,7 +1,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/ship/v1beta1/frigate_types.go b/testdata/project-v3-multigroup/apis/ship/v1beta1/frigate_types.go index 465bb762e47..c8734a6cf9e 100644 --- a/testdata/project-v3-multigroup/apis/ship/v1beta1/frigate_types.go +++ b/testdata/project-v3-multigroup/apis/ship/v1beta1/frigate_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/ship/v1beta1/frigate_webhook.go b/testdata/project-v3-multigroup/apis/ship/v1beta1/frigate_webhook.go index 2aac07bc9b7..8cf9bc5b41a 100644 --- a/testdata/project-v3-multigroup/apis/ship/v1beta1/frigate_webhook.go +++ b/testdata/project-v3-multigroup/apis/ship/v1beta1/frigate_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/ship/v1beta1/groupversion_info.go b/testdata/project-v3-multigroup/apis/ship/v1beta1/groupversion_info.go index 63a0c0483e3..26b0fbd2752 100644 --- a/testdata/project-v3-multigroup/apis/ship/v1beta1/groupversion_info.go +++ b/testdata/project-v3-multigroup/apis/ship/v1beta1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/ship/v1beta1/zz_generated.deepcopy.go b/testdata/project-v3-multigroup/apis/ship/v1beta1/zz_generated.deepcopy.go index 00fe91f2c62..d1ac770b5c7 100644 --- a/testdata/project-v3-multigroup/apis/ship/v1beta1/zz_generated.deepcopy.go +++ b/testdata/project-v3-multigroup/apis/ship/v1beta1/zz_generated.deepcopy.go @@ -1,7 +1,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/ship/v2alpha1/cruiser_types.go b/testdata/project-v3-multigroup/apis/ship/v2alpha1/cruiser_types.go index 3e3f99c4efb..6160dc14b1d 100644 --- a/testdata/project-v3-multigroup/apis/ship/v2alpha1/cruiser_types.go +++ b/testdata/project-v3-multigroup/apis/ship/v2alpha1/cruiser_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/ship/v2alpha1/cruiser_webhook.go b/testdata/project-v3-multigroup/apis/ship/v2alpha1/cruiser_webhook.go index 41e44856ac8..877deb965a3 100644 --- a/testdata/project-v3-multigroup/apis/ship/v2alpha1/cruiser_webhook.go +++ b/testdata/project-v3-multigroup/apis/ship/v2alpha1/cruiser_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/ship/v2alpha1/groupversion_info.go b/testdata/project-v3-multigroup/apis/ship/v2alpha1/groupversion_info.go index fd609526ee2..ac5d9ee826a 100644 --- a/testdata/project-v3-multigroup/apis/ship/v2alpha1/groupversion_info.go +++ b/testdata/project-v3-multigroup/apis/ship/v2alpha1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/ship/v2alpha1/webhook_suite_test.go b/testdata/project-v3-multigroup/apis/ship/v2alpha1/webhook_suite_test.go index 0c344b7cc48..a32ef2df8b5 100644 --- a/testdata/project-v3-multigroup/apis/ship/v2alpha1/webhook_suite_test.go +++ b/testdata/project-v3-multigroup/apis/ship/v2alpha1/webhook_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/ship/v2alpha1/zz_generated.deepcopy.go b/testdata/project-v3-multigroup/apis/ship/v2alpha1/zz_generated.deepcopy.go index e7e42679f78..e335a81bb7d 100644 --- a/testdata/project-v3-multigroup/apis/ship/v2alpha1/zz_generated.deepcopy.go +++ b/testdata/project-v3-multigroup/apis/ship/v2alpha1/zz_generated.deepcopy.go @@ -1,7 +1,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/v1/groupversion_info.go b/testdata/project-v3-multigroup/apis/v1/groupversion_info.go index fe5d478d2f0..a6ea0aa2b65 100644 --- a/testdata/project-v3-multigroup/apis/v1/groupversion_info.go +++ b/testdata/project-v3-multigroup/apis/v1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/v1/lakers_types.go b/testdata/project-v3-multigroup/apis/v1/lakers_types.go index 84ff6d21584..5dca1f9accf 100644 --- a/testdata/project-v3-multigroup/apis/v1/lakers_types.go +++ b/testdata/project-v3-multigroup/apis/v1/lakers_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/v1/lakers_webhook.go b/testdata/project-v3-multigroup/apis/v1/lakers_webhook.go index 333eb028bc2..c358e00ad67 100644 --- a/testdata/project-v3-multigroup/apis/v1/lakers_webhook.go +++ b/testdata/project-v3-multigroup/apis/v1/lakers_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/v1/webhook_suite_test.go b/testdata/project-v3-multigroup/apis/v1/webhook_suite_test.go index 27f56f01860..92a35983ee0 100644 --- a/testdata/project-v3-multigroup/apis/v1/webhook_suite_test.go +++ b/testdata/project-v3-multigroup/apis/v1/webhook_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/apis/v1/zz_generated.deepcopy.go b/testdata/project-v3-multigroup/apis/v1/zz_generated.deepcopy.go index b9e0e7ed74f..523ce2ac7ac 100644 --- a/testdata/project-v3-multigroup/apis/v1/zz_generated.deepcopy.go +++ b/testdata/project-v3-multigroup/apis/v1/zz_generated.deepcopy.go @@ -1,7 +1,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/controllers/apps/deployment_controller.go b/testdata/project-v3-multigroup/controllers/apps/deployment_controller.go index 0f48fb5f96b..40d6f651fb4 100644 --- a/testdata/project-v3-multigroup/controllers/apps/deployment_controller.go +++ b/testdata/project-v3-multigroup/controllers/apps/deployment_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -44,7 +44,7 @@ type DeploymentReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *DeploymentReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3-multigroup/controllers/apps/suite_test.go b/testdata/project-v3-multigroup/controllers/apps/suite_test.go index d0c244d0aed..8b5942f04f7 100644 --- a/testdata/project-v3-multigroup/controllers/apps/suite_test.go +++ b/testdata/project-v3-multigroup/controllers/apps/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/controllers/crew/captain_controller.go b/testdata/project-v3-multigroup/controllers/crew/captain_controller.go index 2b461192265..dae99e57536 100644 --- a/testdata/project-v3-multigroup/controllers/crew/captain_controller.go +++ b/testdata/project-v3-multigroup/controllers/crew/captain_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -45,7 +45,7 @@ type CaptainReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *CaptainReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3-multigroup/controllers/crew/suite_test.go b/testdata/project-v3-multigroup/controllers/crew/suite_test.go index cc032534909..5a243446011 100644 --- a/testdata/project-v3-multigroup/controllers/crew/suite_test.go +++ b/testdata/project-v3-multigroup/controllers/crew/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/controllers/foo.policy/healthcheckpolicy_controller.go b/testdata/project-v3-multigroup/controllers/foo.policy/healthcheckpolicy_controller.go index 4f7a4283fb8..60d2933e9d1 100644 --- a/testdata/project-v3-multigroup/controllers/foo.policy/healthcheckpolicy_controller.go +++ b/testdata/project-v3-multigroup/controllers/foo.policy/healthcheckpolicy_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -45,7 +45,7 @@ type HealthCheckPolicyReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *HealthCheckPolicyReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3-multigroup/controllers/foo.policy/suite_test.go b/testdata/project-v3-multigroup/controllers/foo.policy/suite_test.go index d376c0f8533..4ed4a04a663 100644 --- a/testdata/project-v3-multigroup/controllers/foo.policy/suite_test.go +++ b/testdata/project-v3-multigroup/controllers/foo.policy/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/controllers/lakers_controller.go b/testdata/project-v3-multigroup/controllers/lakers_controller.go index fdc34424b78..e96c043adde 100644 --- a/testdata/project-v3-multigroup/controllers/lakers_controller.go +++ b/testdata/project-v3-multigroup/controllers/lakers_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -45,7 +45,7 @@ type LakersReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *LakersReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3-multigroup/controllers/sea-creatures/kraken_controller.go b/testdata/project-v3-multigroup/controllers/sea-creatures/kraken_controller.go index 1ca883307d7..323607679c9 100644 --- a/testdata/project-v3-multigroup/controllers/sea-creatures/kraken_controller.go +++ b/testdata/project-v3-multigroup/controllers/sea-creatures/kraken_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -45,7 +45,7 @@ type KrakenReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *KrakenReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3-multigroup/controllers/sea-creatures/leviathan_controller.go b/testdata/project-v3-multigroup/controllers/sea-creatures/leviathan_controller.go index b1af36be999..1a40208fffd 100644 --- a/testdata/project-v3-multigroup/controllers/sea-creatures/leviathan_controller.go +++ b/testdata/project-v3-multigroup/controllers/sea-creatures/leviathan_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -45,7 +45,7 @@ type LeviathanReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *LeviathanReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3-multigroup/controllers/sea-creatures/suite_test.go b/testdata/project-v3-multigroup/controllers/sea-creatures/suite_test.go index 77f7bf69512..c070d5dcee5 100644 --- a/testdata/project-v3-multigroup/controllers/sea-creatures/suite_test.go +++ b/testdata/project-v3-multigroup/controllers/sea-creatures/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/controllers/ship/cruiser_controller.go b/testdata/project-v3-multigroup/controllers/ship/cruiser_controller.go index 3afb03b06bc..d6b39d896ab 100644 --- a/testdata/project-v3-multigroup/controllers/ship/cruiser_controller.go +++ b/testdata/project-v3-multigroup/controllers/ship/cruiser_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -45,7 +45,7 @@ type CruiserReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *CruiserReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3-multigroup/controllers/ship/destroyer_controller.go b/testdata/project-v3-multigroup/controllers/ship/destroyer_controller.go index 7d76361e796..cfda9ff2cff 100644 --- a/testdata/project-v3-multigroup/controllers/ship/destroyer_controller.go +++ b/testdata/project-v3-multigroup/controllers/ship/destroyer_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -45,7 +45,7 @@ type DestroyerReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *DestroyerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3-multigroup/controllers/ship/frigate_controller.go b/testdata/project-v3-multigroup/controllers/ship/frigate_controller.go index 638ac21b86b..3295081041a 100644 --- a/testdata/project-v3-multigroup/controllers/ship/frigate_controller.go +++ b/testdata/project-v3-multigroup/controllers/ship/frigate_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -45,7 +45,7 @@ type FrigateReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *FrigateReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3-multigroup/controllers/ship/suite_test.go b/testdata/project-v3-multigroup/controllers/ship/suite_test.go index fe4d45cbc9a..67d48c9df62 100644 --- a/testdata/project-v3-multigroup/controllers/ship/suite_test.go +++ b/testdata/project-v3-multigroup/controllers/ship/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/controllers/suite_test.go b/testdata/project-v3-multigroup/controllers/suite_test.go index a6b57cd4c2a..948ce8b633b 100644 --- a/testdata/project-v3-multigroup/controllers/suite_test.go +++ b/testdata/project-v3-multigroup/controllers/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/go.mod b/testdata/project-v3-multigroup/go.mod index 17ff4568a9c..747e27bc323 100644 --- a/testdata/project-v3-multigroup/go.mod +++ b/testdata/project-v3-multigroup/go.mod @@ -1,12 +1,74 @@ module sigs.k8s.io/kubebuilder/testdata/project-v3-multigroup -go 1.16 +go 1.17 require ( - github.com/onsi/ginkgo v1.16.4 - github.com/onsi/gomega v1.15.0 - k8s.io/api v0.22.1 - k8s.io/apimachinery v0.22.1 - k8s.io/client-go v0.22.1 - sigs.k8s.io/controller-runtime v0.10.0 + github.com/onsi/ginkgo v1.16.5 + github.com/onsi/gomega v1.17.0 + k8s.io/api v0.23.0 + k8s.io/apimachinery v0.23.0 + k8s.io/client-go v0.23.0 + sigs.k8s.io/controller-runtime v0.11.0 +) + +require ( + cloud.google.com/go v0.81.0 // indirect + github.com/Azure/go-autorest v14.2.0+incompatible // indirect + github.com/Azure/go-autorest/autorest v0.11.18 // indirect + github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect + github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect + github.com/Azure/go-autorest/logger v0.2.1 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/evanphx/json-patch v4.12.0+incompatible // indirect + github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/go-logr/logr v1.2.0 // indirect + github.com/go-logr/zapr v1.2.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.5 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/google/uuid v1.1.2 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/prometheus/client_golang v1.11.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.28.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + go.uber.org/zap v1.19.1 // indirect + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect + golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect + golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect + golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect + golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect + gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + k8s.io/apiextensions-apiserver v0.23.0 // indirect + k8s.io/component-base v0.23.0 // indirect + k8s.io/klog/v2 v2.30.0 // indirect + k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect + k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect + sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/testdata/project-v3-multigroup/hack/boilerplate.go.txt b/testdata/project-v3-multigroup/hack/boilerplate.go.txt index 99e0a002dd8..b54e305f300 100644 --- a/testdata/project-v3-multigroup/hack/boilerplate.go.txt +++ b/testdata/project-v3-multigroup/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-multigroup/main.go b/testdata/project-v3-multigroup/main.go index f8b560c1f0b..229a21f11a6 100644 --- a/testdata/project-v3-multigroup/main.go +++ b/testdata/project-v3-multigroup/main.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-v1beta1/Dockerfile b/testdata/project-v3-v1beta1/Dockerfile index 4152680b742..456533d4c2d 100644 --- a/testdata/project-v3-v1beta1/Dockerfile +++ b/testdata/project-v3-v1beta1/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.16 as builder +FROM golang:1.17 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/testdata/project-v3-v1beta1/api/v1/admiral_types.go b/testdata/project-v3-v1beta1/api/v1/admiral_types.go index fe0d8308a70..55d2b767089 100644 --- a/testdata/project-v3-v1beta1/api/v1/admiral_types.go +++ b/testdata/project-v3-v1beta1/api/v1/admiral_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-v1beta1/api/v1/admiral_webhook.go b/testdata/project-v3-v1beta1/api/v1/admiral_webhook.go index 02f0db310c6..6e71c3f8a62 100644 --- a/testdata/project-v3-v1beta1/api/v1/admiral_webhook.go +++ b/testdata/project-v3-v1beta1/api/v1/admiral_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-v1beta1/api/v1/groupversion_info.go b/testdata/project-v3-v1beta1/api/v1/groupversion_info.go index 70a80cb74b6..33458c7506e 100644 --- a/testdata/project-v3-v1beta1/api/v1/groupversion_info.go +++ b/testdata/project-v3-v1beta1/api/v1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-v1beta1/api/v1/webhook_suite_test.go b/testdata/project-v3-v1beta1/api/v1/webhook_suite_test.go index 1b9852b20b5..f58b8584301 100644 --- a/testdata/project-v3-v1beta1/api/v1/webhook_suite_test.go +++ b/testdata/project-v3-v1beta1/api/v1/webhook_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-v1beta1/api/v1/zz_generated.deepcopy.go b/testdata/project-v3-v1beta1/api/v1/zz_generated.deepcopy.go index 05f58c4da6d..c51d9c3130f 100644 --- a/testdata/project-v3-v1beta1/api/v1/zz_generated.deepcopy.go +++ b/testdata/project-v3-v1beta1/api/v1/zz_generated.deepcopy.go @@ -1,7 +1,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-v1beta1/controllers/admiral_controller.go b/testdata/project-v3-v1beta1/controllers/admiral_controller.go index 8eeaacaea14..fdbe6be74b8 100644 --- a/testdata/project-v3-v1beta1/controllers/admiral_controller.go +++ b/testdata/project-v3-v1beta1/controllers/admiral_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -45,7 +45,7 @@ type AdmiralReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *AdmiralReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3-v1beta1/controllers/suite_test.go b/testdata/project-v3-v1beta1/controllers/suite_test.go index 7fbc6dec020..1efda9befe0 100644 --- a/testdata/project-v3-v1beta1/controllers/suite_test.go +++ b/testdata/project-v3-v1beta1/controllers/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-v1beta1/go.mod b/testdata/project-v3-v1beta1/go.mod index 2d55ab76cc8..fd64d00b7cb 100644 --- a/testdata/project-v3-v1beta1/go.mod +++ b/testdata/project-v3-v1beta1/go.mod @@ -1,12 +1,74 @@ module sigs.k8s.io/kubebuilder/testdata/project-v3-v1beta1 -go 1.16 +go 1.17 require ( github.com/onsi/ginkgo v1.16.4 github.com/onsi/gomega v1.13.0 - k8s.io/api v0.22.1 - k8s.io/apimachinery v0.22.1 - k8s.io/client-go v0.22.1 + k8s.io/api v0.23.0 + k8s.io/apimachinery v0.23.0 + k8s.io/client-go v0.23.0 sigs.k8s.io/controller-runtime v0.9.2 ) + +require ( + cloud.google.com/go v0.81.0 // indirect + github.com/Azure/go-autorest v14.2.0+incompatible // indirect + github.com/Azure/go-autorest/autorest v0.11.18 // indirect + github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect + github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect + github.com/Azure/go-autorest/logger v0.2.1 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/evanphx/json-patch v4.12.0+incompatible // indirect + github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/go-logr/logr v1.2.0 // indirect + github.com/go-logr/zapr v1.2.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.5 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/google/uuid v1.1.2 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/prometheus/client_golang v1.11.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.28.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + go.uber.org/zap v1.19.1 // indirect + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect + golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect + golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect + golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect + golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect + gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + k8s.io/apiextensions-apiserver v0.23.0 // indirect + k8s.io/component-base v0.23.0 // indirect + k8s.io/klog/v2 v2.30.0 // indirect + k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect + k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect + sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect +) diff --git a/testdata/project-v3-v1beta1/hack/boilerplate.go.txt b/testdata/project-v3-v1beta1/hack/boilerplate.go.txt index 99e0a002dd8..b54e305f300 100644 --- a/testdata/project-v3-v1beta1/hack/boilerplate.go.txt +++ b/testdata/project-v3-v1beta1/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3-v1beta1/main.go b/testdata/project-v3-v1beta1/main.go index 445a3f60466..44ed897a511 100644 --- a/testdata/project-v3-v1beta1/main.go +++ b/testdata/project-v3-v1beta1/main.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3/Dockerfile b/testdata/project-v3/Dockerfile index 4152680b742..456533d4c2d 100644 --- a/testdata/project-v3/Dockerfile +++ b/testdata/project-v3/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.16 as builder +FROM golang:1.17 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/testdata/project-v3/api/v1/admiral_types.go b/testdata/project-v3/api/v1/admiral_types.go index 20f58e77112..9cbac39e7d2 100644 --- a/testdata/project-v3/api/v1/admiral_types.go +++ b/testdata/project-v3/api/v1/admiral_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3/api/v1/admiral_webhook.go b/testdata/project-v3/api/v1/admiral_webhook.go index 17337cb590e..acc74d793f0 100644 --- a/testdata/project-v3/api/v1/admiral_webhook.go +++ b/testdata/project-v3/api/v1/admiral_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3/api/v1/captain_types.go b/testdata/project-v3/api/v1/captain_types.go index 8ec2699beb0..e81debb719c 100644 --- a/testdata/project-v3/api/v1/captain_types.go +++ b/testdata/project-v3/api/v1/captain_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3/api/v1/captain_webhook.go b/testdata/project-v3/api/v1/captain_webhook.go index dab73ef7551..ba00000c137 100644 --- a/testdata/project-v3/api/v1/captain_webhook.go +++ b/testdata/project-v3/api/v1/captain_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3/api/v1/firstmate_types.go b/testdata/project-v3/api/v1/firstmate_types.go index 99387e72e30..7515759833a 100644 --- a/testdata/project-v3/api/v1/firstmate_types.go +++ b/testdata/project-v3/api/v1/firstmate_types.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3/api/v1/firstmate_webhook.go b/testdata/project-v3/api/v1/firstmate_webhook.go index 23e26d068ea..5fa6046165d 100644 --- a/testdata/project-v3/api/v1/firstmate_webhook.go +++ b/testdata/project-v3/api/v1/firstmate_webhook.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3/api/v1/groupversion_info.go b/testdata/project-v3/api/v1/groupversion_info.go index 70a80cb74b6..33458c7506e 100644 --- a/testdata/project-v3/api/v1/groupversion_info.go +++ b/testdata/project-v3/api/v1/groupversion_info.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3/api/v1/webhook_suite_test.go b/testdata/project-v3/api/v1/webhook_suite_test.go index 862dd88c709..b62d86e64bb 100644 --- a/testdata/project-v3/api/v1/webhook_suite_test.go +++ b/testdata/project-v3/api/v1/webhook_suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3/api/v1/zz_generated.deepcopy.go b/testdata/project-v3/api/v1/zz_generated.deepcopy.go index aa7f8f665cc..eb076ea05ea 100644 --- a/testdata/project-v3/api/v1/zz_generated.deepcopy.go +++ b/testdata/project-v3/api/v1/zz_generated.deepcopy.go @@ -1,7 +1,8 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3/controllers/admiral_controller.go b/testdata/project-v3/controllers/admiral_controller.go index 248ac6e6b9f..97f48dcca16 100644 --- a/testdata/project-v3/controllers/admiral_controller.go +++ b/testdata/project-v3/controllers/admiral_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -45,7 +45,7 @@ type AdmiralReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *AdmiralReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3/controllers/captain_controller.go b/testdata/project-v3/controllers/captain_controller.go index eb816bcffac..66410688e1b 100644 --- a/testdata/project-v3/controllers/captain_controller.go +++ b/testdata/project-v3/controllers/captain_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -45,7 +45,7 @@ type CaptainReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *CaptainReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3/controllers/firstmate_controller.go b/testdata/project-v3/controllers/firstmate_controller.go index a1aeef64955..4f5ba379d3d 100644 --- a/testdata/project-v3/controllers/firstmate_controller.go +++ b/testdata/project-v3/controllers/firstmate_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -45,7 +45,7 @@ type FirstMateReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *FirstMateReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3/controllers/laker_controller.go b/testdata/project-v3/controllers/laker_controller.go index d2863ebf1eb..b4b109f501e 100644 --- a/testdata/project-v3/controllers/laker_controller.go +++ b/testdata/project-v3/controllers/laker_controller.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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. @@ -43,7 +43,7 @@ type LakerReconciler struct { // the user. // // For more details, check Reconcile and its Result here: -// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile func (r *LakerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { _ = log.FromContext(ctx) diff --git a/testdata/project-v3/controllers/suite_test.go b/testdata/project-v3/controllers/suite_test.go index 00a477037df..6e19e09b0af 100644 --- a/testdata/project-v3/controllers/suite_test.go +++ b/testdata/project-v3/controllers/suite_test.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3/go.mod b/testdata/project-v3/go.mod index 79d6065d07d..80916bf762d 100644 --- a/testdata/project-v3/go.mod +++ b/testdata/project-v3/go.mod @@ -1,12 +1,74 @@ module sigs.k8s.io/kubebuilder/testdata/project-v3 -go 1.16 +go 1.17 require ( - github.com/onsi/ginkgo v1.16.4 - github.com/onsi/gomega v1.15.0 - k8s.io/api v0.22.1 - k8s.io/apimachinery v0.22.1 - k8s.io/client-go v0.22.1 - sigs.k8s.io/controller-runtime v0.10.0 + github.com/onsi/ginkgo v1.16.5 + github.com/onsi/gomega v1.17.0 + k8s.io/api v0.23.0 + k8s.io/apimachinery v0.23.0 + k8s.io/client-go v0.23.0 + sigs.k8s.io/controller-runtime v0.11.0 +) + +require ( + cloud.google.com/go v0.81.0 // indirect + github.com/Azure/go-autorest v14.2.0+incompatible // indirect + github.com/Azure/go-autorest/autorest v0.11.18 // indirect + github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect + github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect + github.com/Azure/go-autorest/logger v0.2.1 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/evanphx/json-patch v4.12.0+incompatible // indirect + github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/go-logr/logr v1.2.0 // indirect + github.com/go-logr/zapr v1.2.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.5 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/google/uuid v1.1.2 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/prometheus/client_golang v1.11.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.28.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + go.uber.org/zap v1.19.1 // indirect + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect + golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect + golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect + golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect + golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect + gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + k8s.io/apiextensions-apiserver v0.23.0 // indirect + k8s.io/component-base v0.23.0 // indirect + k8s.io/klog/v2 v2.30.0 // indirect + k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect + k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect + sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/testdata/project-v3/hack/boilerplate.go.txt b/testdata/project-v3/hack/boilerplate.go.txt index 99e0a002dd8..b54e305f300 100644 --- a/testdata/project-v3/hack/boilerplate.go.txt +++ b/testdata/project-v3/hack/boilerplate.go.txt @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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-v3/main.go b/testdata/project-v3/main.go index 213b443fe06..c8f85f0b275 100644 --- a/testdata/project-v3/main.go +++ b/testdata/project-v3/main.go @@ -1,5 +1,5 @@ /* -Copyright 2021 The Kubernetes authors. +Copyright 2022 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.