Merge pull request #5212 from camilamacedo86/fix-api-linter

🐛 (go/v4;deploy-image/v1-alpha): Remove omitempty from nested struct JSON tags in API scaffolds

Author: k8s-ci-robot

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

@@ -192,23 +192,23 @@ type CronJob struct {
 
 	// metadata is a standard object metadata
 	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty,omitzero"`
+	metav1.ObjectMeta `json:"metadata,omitzero"`
 
 	// spec defines the desired state of CronJob
 	// +required
 	Spec CronJobSpec `json:"spec"`
 
 	// status defines the observed state of CronJob
 	// +optional
-	Status CronJobStatus `json:"status,omitempty,omitzero"`
+	Status CronJobStatus `json:"status,omitzero"`
 }
 
 // +kubebuilder:object:root=true
 
 // CronJobList contains a list of CronJob
 type CronJobList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta `json:"metadata,omitzero"`
 	Items           []CronJob `json:"items"`
 }
 

docs/book/src/getting-started/testdata/project/api/v1alpha1/memcached_types.go

@@ -75,23 +75,23 @@ type Memcached struct {
 
 	// metadata is a standard object metadata
 	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty,omitzero"`
+	metav1.ObjectMeta `json:"metadata,omitzero"`
 
 	// spec defines the desired state of Memcached
 	// +required
 	Spec MemcachedSpec `json:"spec"`
 
 	// status defines the observed state of Memcached
 	// +optional
-	Status MemcachedStatus `json:"status,omitempty,omitzero"`
+	Status MemcachedStatus `json:"status,omitzero"`
 }
 
 // +kubebuilder:object:root=true
 
 // MemcachedList contains a list of Memcached
 type MemcachedList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta `json:"metadata,omitzero"`
 	Items           []Memcached `json:"items"`
 }
 

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

@@ -156,15 +156,15 @@ type CronJob struct {
 
 	// metadata is a standard object metadata
 	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty,omitzero"`
+	metav1.ObjectMeta `json:"metadata,omitzero"`
 
 	// spec defines the desired state of CronJob
 	// +required
 	Spec CronJobSpec `json:"spec"`
 
 	// status defines the observed state of CronJob
 	// +optional
-	Status CronJobStatus `json:"status,omitempty,omitzero"`
+	Status CronJobStatus `json:"status,omitzero"`
 }
 
 /*
@@ -175,7 +175,7 @@ type CronJob struct {
 // CronJobList contains a list of CronJob
 type CronJobList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta `json:"metadata,omitzero"`
 	Items           []CronJob `json:"items"`
 }
 

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

@@ -186,23 +186,23 @@ type CronJob struct {
 
 	// metadata is a standard object metadata
 	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty,omitzero"`
+	metav1.ObjectMeta `json:"metadata,omitzero"`
 
 	// spec defines the desired state of CronJob
 	// +required
 	Spec CronJobSpec `json:"spec"`
 
 	// status defines the observed state of CronJob
 	// +optional
-	Status CronJobStatus `json:"status,omitempty,omitzero"`
+	Status CronJobStatus `json:"status,omitzero"`
 }
 
 // +kubebuilder:object:root=true
 
 // CronJobList contains a list of CronJob
 type CronJobList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta `json:"metadata,omitzero"`
 	Items           []CronJob `json:"items"`
 }
 

pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api/types.go

@@ -126,23 +126,23 @@ type {{ .Resource.Kind }} struct {
 
 	// metadata is a standard object metadata
 	// +optional
-	metav1.ObjectMeta ` + "`" + `json:"metadata,omitempty,omitzero"` + "`" + `
+	metav1.ObjectMeta ` + "`" + `json:"metadata,omitzero"` + "`" + `
 
 	// spec defines the desired state of {{ .Resource.Kind }}
 	// +required
 	Spec   {{ .Resource.Kind }}Spec   ` + "`" + `json:"spec"` + "`" + `
 
 	// status defines the observed state of {{ .Resource.Kind }}
 	// +optional
-	Status {{ .Resource.Kind }}Status ` + "`" + `json:"status,omitempty,omitzero"` + "`" + `
+	Status {{ .Resource.Kind }}Status ` + "`" + `json:"status,omitzero"` + "`" + `
 }
 
 // +kubebuilder:object:root=true
 
 // {{ .Resource.Kind }}List contains a list of {{ .Resource.Kind }}
 type {{ .Resource.Kind }}List struct {
 	metav1.TypeMeta ` + "`" + `json:",inline"` + "`" + `
-	metav1.ListMeta ` + "`" + `json:"metadata,omitempty"` + "`" + `
+	metav1.ListMeta ` + "`" + `json:"metadata,omitzero"` + "`" + `
 	Items           []{{ .Resource.Kind }} ` + "`" + `json:"items"` + "`" + `
 }
 

pkg/plugins/golang/v4/scaffolds/internal/templates/api/types.go

@@ -124,23 +124,23 @@ type {{ .Resource.Kind }} struct {
 
 	// metadata is a standard object metadata
 	// +optional
-	metav1.ObjectMeta ` + "`" + `json:"metadata,omitempty,omitzero"` + "`" + `
+	metav1.ObjectMeta ` + "`" + `json:"metadata,omitzero"` + "`" + `
 
 	// spec defines the desired state of {{ .Resource.Kind }}
 	// +required
 	Spec   {{ .Resource.Kind }}Spec   ` + "`" + `json:"spec"` + "`" + `
 
 	// status defines the observed state of {{ .Resource.Kind }}
 	// +optional
-	Status {{ .Resource.Kind }}Status ` + "`" + `json:"status,omitempty,omitzero"` + "`" + `
+	Status {{ .Resource.Kind }}Status ` + "`" + `json:"status,omitzero"` + "`" + `
 }
 
 // +kubebuilder:object:root=true
 
 // {{ .Resource.Kind }}List contains a list of {{ .Resource.Kind }}
 type {{ .Resource.Kind }}List struct {
 	metav1.TypeMeta ` + "`" + `json:",inline"` + "`" + `
-	metav1.ListMeta ` + "`" + `json:"metadata,omitempty"` + "`" + `
+	metav1.ListMeta ` + "`" + `json:"metadata,omitzero"` + "`" + `
 	Items           []{{ .Resource.Kind }} ` + "`" + `json:"items"` + "`" + `
 }
 

testdata/project-v4-multigroup/api/crew/v1/captain_types.go

@@ -67,23 +67,23 @@ type Captain struct {
 
 	// metadata is a standard object metadata
 	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty,omitzero"`
+	metav1.ObjectMeta `json:"metadata,omitzero"`
 
 	// spec defines the desired state of Captain
 	// +required
 	Spec CaptainSpec `json:"spec"`
 
 	// status defines the observed state of Captain
 	// +optional
-	Status CaptainStatus `json:"status,omitempty,omitzero"`
+	Status CaptainStatus `json:"status,omitzero"`
 }
 
 // +kubebuilder:object:root=true
 
 // CaptainList contains a list of Captain
 type CaptainList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta `json:"metadata,omitzero"`
 	Items           []Captain `json:"items"`
 }
 

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

@@ -68,23 +68,23 @@ type Wordpress struct {
 
 	// metadata is a standard object metadata
 	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty,omitzero"`
+	metav1.ObjectMeta `json:"metadata,omitzero"`
 
 	// spec defines the desired state of Wordpress
 	// +required
 	Spec WordpressSpec `json:"spec"`
 
 	// status defines the observed state of Wordpress
 	// +optional
-	Status WordpressStatus `json:"status,omitempty,omitzero"`
+	Status WordpressStatus `json:"status,omitzero"`
 }
 
 // +kubebuilder:object:root=true
 
 // WordpressList contains a list of Wordpress
 type WordpressList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta `json:"metadata,omitzero"`
 	Items           []Wordpress `json:"items"`
 }
 

testdata/project-v4-multigroup/api/example.com/v1alpha1/busybox_types.go

@@ -66,23 +66,23 @@ type Busybox struct {
 
 	// metadata is a standard object metadata
 	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty,omitzero"`
+	metav1.ObjectMeta `json:"metadata,omitzero"`
 
 	// spec defines the desired state of Busybox
 	// +required
 	Spec BusyboxSpec `json:"spec"`
 
 	// status defines the observed state of Busybox
 	// +optional
-	Status BusyboxStatus `json:"status,omitempty,omitzero"`
+	Status BusyboxStatus `json:"status,omitzero"`
 }
 
 // +kubebuilder:object:root=true
 
 // BusyboxList contains a list of Busybox
 type BusyboxList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta `json:"metadata,omitzero"`
 	Items           []Busybox `json:"items"`
 }
 

testdata/project-v4-multigroup/api/example.com/v1alpha1/memcached_types.go

@@ -70,23 +70,23 @@ type Memcached struct {
 
 	// metadata is a standard object metadata
 	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty,omitzero"`
+	metav1.ObjectMeta `json:"metadata,omitzero"`
 
 	// spec defines the desired state of Memcached
 	// +required
 	Spec MemcachedSpec `json:"spec"`
 
 	// status defines the observed state of Memcached
 	// +optional
-	Status MemcachedStatus `json:"status,omitempty,omitzero"`
+	Status MemcachedStatus `json:"status,omitzero"`
 }
 
 // +kubebuilder:object:root=true
 
 // MemcachedList contains a list of Memcached
 type MemcachedList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta `json:"metadata,omitzero"`
 	Items           []Memcached `json:"items"`
 }