Skip to content

Commit b9c3ab6

Browse files
authored
Merge pull request #4849 from camilamacedo86/fix-scenario-unused-marker
🐛 (go/v4)(fix): remove unused marker +kubebuilder:conversion:hub for conversion webhooks
2 parents 2b808a6 + d9eb4de commit b9c3ab6

File tree

5 files changed

+2
-6
lines changed

5 files changed

+2
-6
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ type CronJobStatus struct {
128128

129129
// +kubebuilder:object:root=true
130130
// +kubebuilder:storageversion
131-
// +kubebuilder:conversion:hub
132131
// +kubebuilder:subresource:status
133132
// +versionName=v1
134133
// +kubebuilder:storageversion

pkg/plugins/golang/v4/scaffolds/webhook.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ func (s *webhookScaffolder) Scaffold() error {
124124

125125
err = pluginutil.InsertCodeIfNotExist(resourceFilePath,
126126
"// +kubebuilder:object:root=true",
127-
"\n// +kubebuilder:storageversion\n// +kubebuilder:conversion:hub")
127+
"\n// +kubebuilder:storageversion")
128128
if err != nil {
129129
log.Errorf("Unable to insert storage version marker "+
130-
"(// +kubebuilder:storageversion) and the hub conversion (// +kubebuilder:conversion:hub) "+
130+
"(// +kubebuilder:storageversion)"+
131131
"in file %s: %v", resourceFilePath, err)
132132
}
133133

testdata/project-v4-multigroup/api/example.com/v1/wordpress_types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ type WordpressStatus struct {
4040

4141
// +kubebuilder:object:root=true
4242
// +kubebuilder:storageversion
43-
// +kubebuilder:conversion:hub
4443
// +kubebuilder:subresource:status
4544

4645
// Wordpress is the Schema for the wordpresses API.

testdata/project-v4-with-plugins/api/v1/wordpress_types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ type WordpressStatus struct {
4040

4141
// +kubebuilder:object:root=true
4242
// +kubebuilder:storageversion
43-
// +kubebuilder:conversion:hub
4443
// +kubebuilder:subresource:status
4544

4645
// Wordpress is the Schema for the wordpresses API.

testdata/project-v4/api/v1/firstmate_types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ type FirstMateStatus struct {
4040

4141
// +kubebuilder:object:root=true
4242
// +kubebuilder:storageversion
43-
// +kubebuilder:conversion:hub
4443
// +kubebuilder:subresource:status
4544

4645
// FirstMate is the Schema for the firstmates API.

0 commit comments

Comments
 (0)