Skip to content

Commit 503ba3b

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1886 from estroz/deps/c-r-v0.7.0
⚠️ (go/v3-alpha) bump controller-runtime to v0.7.0
2 parents 30df583 + 6248071 commit 503ba3b

38 files changed

+52
-40
lines changed

‎pkg/plugins/golang/v3/scaffolds/init.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636

3737
const (
3838
// ControllerRuntimeVersion is the kubernetes-sigs/controller-runtime version to be used in the project
39-
ControllerRuntimeVersion = "v0.7.0-alpha.8"
39+
ControllerRuntimeVersion = "v0.7.0"
4040
// ControllerToolsVersion is the kubernetes-sigs/controller-tools version to be used in the project
4141
ControllerToolsVersion = "v0.4.1"
4242
// KustomizeVersion is the kubernetes-sigs/kustomize version to be used in the project

‎pkg/plugins/golang/v3/scaffolds/internal/templates/api/webhook.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func (r *{{ .Resource.Kind }}) SetupWebhookWithManager(mgr ctrl.Manager) error {
111111
// TODO(estroz): update admissionReviewVersions to include v1 when controller-runtime supports that version.
112112
//nolint:lll
113113
defaultingWebhookTemplate = `
114-
// +kubebuilder:webhook:{{ if ne .WebhookVersion "v1" }}webhookVersions={{"{"}}{{ .WebhookVersion }}{{"}"}},{{ end }}path=/mutate-{{ .GroupDomainWithDash }}-{{ .Resource.Version }}-{{ lower .Resource.Kind }},mutating=true,failurePolicy=fail,sideEffects=None,groups={{ .Resource.Domain }},resources={{ .Resource.Plural }},verbs=create;update,versions={{ .Resource.Version }},name=m{{ lower .Resource.Kind }}.kb.io,admissionReviewVersions={v1beta1}
114+
// +kubebuilder:webhook:{{ if ne .WebhookVersion "v1" }}webhookVersions={{"{"}}{{ .WebhookVersion }}{{"}"}},{{ end }}path=/mutate-{{ .GroupDomainWithDash }}-{{ .Resource.Version }}-{{ lower .Resource.Kind }},mutating=true,failurePolicy=fail,sideEffects=None,groups={{ .Resource.Domain }},resources={{ .Resource.Plural }},verbs=create;update,versions={{ .Resource.Version }},name=m{{ lower .Resource.Kind }}.kb.io,admissionReviewVersions={v1,v1beta1}
115115
116116
var _ webhook.Defaulter = &{{ .Resource.Kind }}{}
117117
@@ -127,7 +127,7 @@ func (r *{{ .Resource.Kind }}) Default() {
127127
//nolint:lll
128128
validatingWebhookTemplate = `
129129
// TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
130-
// +kubebuilder:webhook:{{ if ne .WebhookVersion "v1" }}webhookVersions={{"{"}}{{ .WebhookVersion }}{{"}"}},{{ end }}path=/validate-{{ .GroupDomainWithDash }}-{{ .Resource.Version }}-{{ lower .Resource.Kind }},mutating=false,failurePolicy=fail,sideEffects=None,groups={{ .Resource.Domain }},resources={{ .Resource.Plural }},verbs=create;update,versions={{ .Resource.Version }},name=v{{ lower .Resource.Kind }}.kb.io,admissionReviewVersions={v1beta1}
130+
// +kubebuilder:webhook:{{ if ne .WebhookVersion "v1" }}webhookVersions={{"{"}}{{ .WebhookVersion }}{{"}"}},{{ end }}path=/validate-{{ .GroupDomainWithDash }}-{{ .Resource.Version }}-{{ lower .Resource.Kind }},mutating=false,failurePolicy=fail,sideEffects=None,groups={{ .Resource.Domain }},resources={{ .Resource.Plural }},verbs=create;update,versions={{ .Resource.Version }},name=v{{ lower .Resource.Kind }}.kb.io,admissionReviewVersions={v1,v1beta1}
131131
132132
var _ webhook.Validator = &{{ .Resource.Kind }}{}
133133

‎testdata/project-v3-addon/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ all: manager
1717
ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
1818
test: generate fmt vet manifests
1919
mkdir -p ${ENVTEST_ASSETS_DIR}
20-
test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.7.0-alpha.8/hack/setup-envtest.sh
20+
test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.7.0/hack/setup-envtest.sh
2121
source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./... -coverprofile cover.out
2222

2323
# Build manager binary

‎testdata/project-v3-addon/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ require (
88
github.com/onsi/gomega v1.10.2
99
k8s.io/apimachinery v0.19.2
1010
k8s.io/client-go v0.19.2
11-
sigs.k8s.io/controller-runtime v0.7.0-alpha.8
11+
sigs.k8s.io/controller-runtime v0.7.0
1212
sigs.k8s.io/kubebuilder-declarative-pattern v0.0.0-20201109180626-1cbf859290ca
1313
)

‎testdata/project-v3-config/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ all: manager
1717
ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
1818
test: generate fmt vet manifests
1919
mkdir -p ${ENVTEST_ASSETS_DIR}
20-
test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.7.0-alpha.8/hack/setup-envtest.sh
20+
test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.7.0/hack/setup-envtest.sh
2121
source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./... -coverprofile cover.out
2222

2323
# Build manager binary

‎testdata/project-v3-config/api/v1/admiral_webhook.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func (r *Admiral) SetupWebhookWithManager(mgr ctrl.Manager) error {
3333

3434
// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
3535

36-
// +kubebuilder:webhook:path=/mutate-crew-testproject-org-v1-admiral,mutating=true,failurePolicy=fail,sideEffects=None,groups=crew.testproject.org,resources=admirals,verbs=create;update,versions=v1,name=madmiral.kb.io,admissionReviewVersions={v1beta1}
36+
// +kubebuilder:webhook:path=/mutate-crew-testproject-org-v1-admiral,mutating=true,failurePolicy=fail,sideEffects=None,groups=crew.testproject.org,resources=admirals,verbs=create;update,versions=v1,name=madmiral.kb.io,admissionReviewVersions={v1,v1beta1}
3737

3838
var _ webhook.Defaulter = &Admiral{}
3939

‎testdata/project-v3-config/api/v1/captain_webhook.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func (r *Captain) SetupWebhookWithManager(mgr ctrl.Manager) error {
3434

3535
// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
3636

37-
// +kubebuilder:webhook:path=/mutate-crew-testproject-org-v1-captain,mutating=true,failurePolicy=fail,sideEffects=None,groups=crew.testproject.org,resources=captains,verbs=create;update,versions=v1,name=mcaptain.kb.io,admissionReviewVersions={v1beta1}
37+
// +kubebuilder:webhook:path=/mutate-crew-testproject-org-v1-captain,mutating=true,failurePolicy=fail,sideEffects=None,groups=crew.testproject.org,resources=captains,verbs=create;update,versions=v1,name=mcaptain.kb.io,admissionReviewVersions={v1,v1beta1}
3838

3939
var _ webhook.Defaulter = &Captain{}
4040

@@ -46,7 +46,7 @@ func (r *Captain) Default() {
4646
}
4747

4848
// TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
49-
// +kubebuilder:webhook:path=/validate-crew-testproject-org-v1-captain,mutating=false,failurePolicy=fail,sideEffects=None,groups=crew.testproject.org,resources=captains,verbs=create;update,versions=v1,name=vcaptain.kb.io,admissionReviewVersions={v1beta1}
49+
// +kubebuilder:webhook:path=/validate-crew-testproject-org-v1-captain,mutating=false,failurePolicy=fail,sideEffects=None,groups=crew.testproject.org,resources=captains,verbs=create;update,versions=v1,name=vcaptain.kb.io,admissionReviewVersions={v1,v1beta1}
5050

5151
var _ webhook.Validator = &Captain{}
5252

‎testdata/project-v3-config/config/webhook/manifests.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ metadata:
77
name: mutating-webhook-configuration
88
webhooks:
99
- admissionReviewVersions:
10+
- v1
1011
- v1beta1
1112
clientConfig:
1213
service:
@@ -27,6 +28,7 @@ webhooks:
2728
- admirals
2829
sideEffects: None
2930
- admissionReviewVersions:
31+
- v1
3032
- v1beta1
3133
clientConfig:
3234
service:
@@ -55,6 +57,7 @@ metadata:
5557
name: validating-webhook-configuration
5658
webhooks:
5759
- admissionReviewVersions:
60+
- v1
5861
- v1beta1
5962
clientConfig:
6063
service:

‎testdata/project-v3-config/controllers/admiral_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ type AdmiralReconciler struct {
4646
// the user.
4747
//
4848
// For more details, check Reconcile and its Result here:
49-
// - https://pkg.go.dev/sigs.k8s.io/[email protected]-alpha.8/pkg/reconcile
49+
// - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
5050
func (r *AdmiralReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
5151
_ = r.Log.WithValues("admiral", req.NamespacedName)
5252

‎testdata/project-v3-config/controllers/captain_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ type CaptainReconciler struct {
4646
// the user.
4747
//
4848
// For more details, check Reconcile and its Result here:
49-
// - https://pkg.go.dev/sigs.k8s.io/[email protected]-alpha.8/pkg/reconcile
49+
// - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
5050
func (r *CaptainReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
5151
_ = r.Log.WithValues("captain", req.NamespacedName)
5252

0 commit comments

Comments
 (0)