Skip to content

Commit 63beb63

Browse files
fix marker for webhook server in the tutorial samples
Apply the fix introduced in PR #4122. The default markers in the code have been replaced with the values defined in the hack/docs, but this change was missed in the tutorial samples.
1 parent 26c4b55 commit 63beb63

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

docs/book/src/cronjob-tutorial/testdata/project/api/v1/cronjob_webhook.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ This marker is responsible for generating a mutating webhook manifest.
6666
The meaning of each marker can be found [here](/reference/markers/webhook.md).
6767
*/
6868

69-
// +kubebuilder:webhook:path=/mutate-batch-tutorial-kubebuilder-io-v1-cronjob,mutating=true,failurePolicy=fail,groups=batch.tutorial.kubebuilder.io,resources=cronjobs,verbs=create;update,versions=v1,name=mcronjob.kb.io,sideEffects=None,admissionReviewVersions=v1
69+
// +kubebuilder:webhook:path=/mutate-batch-tutorial-kubebuilder-io-v1-cronjob,mutating=true,failurePolicy=fail,groups=batch.tutorial.kubebuilder.io,resources=cronjobs,verbs=create;update,versions=v1,name=mcronjob-v1.kb.io,sideEffects=None,admissionReviewVersions=v1
7070

7171
/*
7272
We use the `webhook.CustomDefaulter` interface to set defaults to our CRD.
@@ -129,7 +129,7 @@ func (r *CronJob) Default() {
129129
This marker is responsible for generating a validating webhook manifest.
130130
*/
131131

132-
// +kubebuilder:webhook:verbs=create;update;delete,path=/validate-batch-tutorial-kubebuilder-io-v1-cronjob,mutating=false,failurePolicy=fail,groups=batch.tutorial.kubebuilder.io,resources=cronjobs,versions=v1,name=vcronjob.kb.io,sideEffects=None,admissionReviewVersions=v1
132+
// +kubebuilder:webhook:verbs=create;update;delete,path=/validate-batch-tutorial-kubebuilder-io-v1-cronjob,mutating=false,failurePolicy=fail,groups=batch.tutorial.kubebuilder.io,resources=cronjobs,versions=v1,name=vcronjob-v1.kb.io,sideEffects=None,admissionReviewVersions=v1
133133

134134
/*
135135
We can validate our CRD beyond what's possible with declarative

docs/book/src/cronjob-tutorial/testdata/project/config/webhook/manifests.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ webhooks:
3232
namespace: system
3333
path: /mutate-batch-tutorial-kubebuilder-io-v1-cronjob
3434
failurePolicy: Fail
35-
name: mcronjob.kb.io
35+
name: mcronjob-v1.kb.io
3636
rules:
3737
- apiGroups:
3838
- batch.tutorial.kubebuilder.io
@@ -67,6 +67,7 @@ webhooks:
6767
operations:
6868
- CREATE
6969
- UPDATE
70+
- DELETE
7071
resources:
7172
- cronjobs
7273
sideEffects: None
@@ -78,7 +79,7 @@ webhooks:
7879
namespace: system
7980
path: /validate-batch-tutorial-kubebuilder-io-v1-cronjob
8081
failurePolicy: Fail
81-
name: vcronjob.kb.io
82+
name: vcronjob-v1.kb.io
8283
rules:
8384
- apiGroups:
8485
- batch.tutorial.kubebuilder.io
@@ -87,7 +88,6 @@ webhooks:
8788
operations:
8889
- CREATE
8990
- UPDATE
90-
- DELETE
9191
resources:
9292
- cronjobs
9393
sideEffects: None

docs/book/src/multiversion-tutorial/testdata/project/api/v1/cronjob_webhook.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ This marker is responsible for generating a mutating webhook manifest.
7070
The meaning of each marker can be found [here](/reference/markers/webhook.md).
7171
*/
7272

73-
// +kubebuilder:webhook:path=/mutate-batch-tutorial-kubebuilder-io-v1-cronjob,mutating=true,failurePolicy=fail,groups=batch.tutorial.kubebuilder.io,resources=cronjobs,verbs=create;update,versions=v1,name=mcronjob.kb.io,sideEffects=None,admissionReviewVersions=v1
73+
// +kubebuilder:webhook:path=/mutate-batch-tutorial-kubebuilder-io-v1-cronjob,mutating=true,failurePolicy=fail,groups=batch.tutorial.kubebuilder.io,resources=cronjobs,verbs=create;update,versions=v1,name=mcronjob-v1.kb.io,sideEffects=None,admissionReviewVersions=v1
7474

7575
/*
7676
We use the `webhook.CustomDefaulter` interface to set defaults to our CRD.
@@ -133,7 +133,7 @@ func (r *CronJob) Default() {
133133
This marker is responsible for generating a validating webhook manifest.
134134
*/
135135

136-
// +kubebuilder:webhook:verbs=create;update;delete,path=/validate-batch-tutorial-kubebuilder-io-v1-cronjob,mutating=false,failurePolicy=fail,groups=batch.tutorial.kubebuilder.io,resources=cronjobs,versions=v1,name=vcronjob.kb.io,sideEffects=None,admissionReviewVersions=v1
136+
// +kubebuilder:webhook:verbs=create;update;delete,path=/validate-batch-tutorial-kubebuilder-io-v1-cronjob,mutating=false,failurePolicy=fail,groups=batch.tutorial.kubebuilder.io,resources=cronjobs,versions=v1,name=vcronjob-v1.kb.io,sideEffects=None,admissionReviewVersions=v1
137137

138138
/*
139139
We can validate our CRD beyond what's possible with declarative

docs/book/src/multiversion-tutorial/testdata/project/config/webhook/manifests.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ webhooks:
3232
namespace: system
3333
path: /mutate-batch-tutorial-kubebuilder-io-v1-cronjob
3434
failurePolicy: Fail
35-
name: mcronjob.kb.io
35+
name: mcronjob-v1.kb.io
3636
rules:
3737
- apiGroups:
3838
- batch.tutorial.kubebuilder.io
@@ -87,6 +87,7 @@ webhooks:
8787
operations:
8888
- CREATE
8989
- UPDATE
90+
- DELETE
9091
resources:
9192
- cronjobs
9293
sideEffects: None
@@ -98,7 +99,7 @@ webhooks:
9899
namespace: system
99100
path: /validate-batch-tutorial-kubebuilder-io-v1-cronjob
100101
failurePolicy: Fail
101-
name: vcronjob.kb.io
102+
name: vcronjob-v1.kb.io
102103
rules:
103104
- apiGroups:
104105
- batch.tutorial.kubebuilder.io
@@ -107,7 +108,6 @@ webhooks:
107108
operations:
108109
- CREATE
109110
- UPDATE
110-
- DELETE
111111
resources:
112112
- cronjobs
113113
sideEffects: None

hack/docs/internal/cronjob-tutorial/webhook_implementation.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This marker is responsible for generating a mutating webhook manifest.
3434
The meaning of each marker can be found [here](/reference/markers/webhook.md).
3535
*/
3636
37-
// +kubebuilder:webhook:path=/mutate-batch-tutorial-kubebuilder-io-v1-cronjob,mutating=true,failurePolicy=fail,groups=batch.tutorial.kubebuilder.io,resources=cronjobs,verbs=create;update,versions=v1,name=mcronjob.kb.io,sideEffects=None,admissionReviewVersions=v1
37+
// +kubebuilder:webhook:path=/mutate-batch-tutorial-kubebuilder-io-v1-cronjob,mutating=true,failurePolicy=fail,groups=batch.tutorial.kubebuilder.io,resources=cronjobs,verbs=create;update,versions=v1,name=mcronjob-v1.kb.io,sideEffects=None,admissionReviewVersions=v1
3838
3939
/*
4040
We use the` + " `" + `webhook.CustomDefaulter` + "`" + ` interface to set defaults to our CRD.
@@ -73,7 +73,7 @@ func (r *CronJob) Default() {
7373
This marker is responsible for generating a validating webhook manifest.
7474
*/
7575
76-
// +kubebuilder:webhook:verbs=create;update;delete,path=/validate-batch-tutorial-kubebuilder-io-v1-cronjob,mutating=false,failurePolicy=fail,groups=batch.tutorial.kubebuilder.io,resources=cronjobs,versions=v1,name=vcronjob.kb.io,sideEffects=None,admissionReviewVersions=v1
76+
// +kubebuilder:webhook:verbs=create;update;delete,path=/validate-batch-tutorial-kubebuilder-io-v1-cronjob,mutating=false,failurePolicy=fail,groups=batch.tutorial.kubebuilder.io,resources=cronjobs,versions=v1,name=vcronjob-v1.kb.io,sideEffects=None,admissionReviewVersions=v1
7777
7878
/*
7979
We can validate our CRD beyond what's possible with declarative

0 commit comments

Comments
 (0)