Skip to content

Commit 1e802f3

Browse files
authored
Merge pull request #337 from marun/fix-defaulting-tag
✨ s/kubebuilder:validation:Default/kubebuilder:Default/
2 parents c3bf566 + 4a548a7 commit 1e802f3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pkg/crd/markers/validation.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ var FieldOnlyMarkers = []*definitionWithHelp{
7373
must(markers.MakeDefinition("nullable", markers.DescribesField, Nullable{})).
7474
WithHelp(Nullable{}.Help()),
7575

76-
must(markers.MakeAnyTypeDefinition("kubebuilder:validation:Default", markers.DescribesField, Default{})).
76+
must(markers.MakeAnyTypeDefinition("kubebuilder:default", markers.DescribesField, Default{})).
7777
WithHelp(Default{}.Help()),
7878
}
7979

pkg/crd/testdata/cronjob_types.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ type CronJobSpec struct {
9595
TwoOfAKindPart1 LongerString `json:"twoOfAKindPart1"`
9696

9797
// This tests that primitive defaulting can be performed.
98-
// +kubebuilder:validation:Default=forty-two
98+
// +kubebuilder:default=forty-two
9999
DefaultedString string `json:"defaultedString"`
100100

101101
// This tests that slice defaulting can be performed.
102-
// +kubebuilder:validation:Default={a,b}
102+
// +kubebuilder:default={a,b}
103103
DefaultedSlice []string `json:"defaultedSlice"`
104104

105105
// This tests that object defaulting can be performed.
106-
// +kubebuilder:validation:Default={{nested: {foo: "baz", bar: true}},{nested: {bar: false}}}
106+
// +kubebuilder:default={{nested: {foo: "baz", bar: true}},{nested: {bar: false}}}
107107
DefaultedObject []RootObject `json:"defaultedObject"`
108108
}
109109

0 commit comments

Comments
 (0)