Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 15, 2025
+84 −84
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/book/src/cronjob-tutorial/testdata/project/api/v1/cronjob_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

Expand Down
6 changes: 3 additions & 3 deletions docs/book/src/getting-started/testdata/project/api/v1alpha1/memcached_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

Expand Down
6 changes: 3 additions & 3 deletions docs/book/src/multiversion-tutorial/testdata/project/api/v1/cronjob_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

/*
Expand All @@ -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"`
}

Expand Down
6 changes: 3 additions & 3 deletions docs/book/src/multiversion-tutorial/testdata/project/api/v2/cronjob_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

Expand Down
6 changes: 3 additions & 3 deletions pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/api/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"` + "`" + `
}

Expand Down
6 changes: 3 additions & 3 deletions pkg/plugins/golang/v4/scaffolds/internal/templates/api/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"` + "`" + `
}

Expand Down
6 changes: 3 additions & 3 deletions testdata/project-v4-multigroup/api/crew/v1/captain_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

Expand Down
6 changes: 3 additions & 3 deletions testdata/project-v4-multigroup/api/example.com/v1/wordpress_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

Expand Down
6 changes: 3 additions & 3 deletions testdata/project-v4-multigroup/api/example.com/v1alpha1/busybox_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

Expand Down
6 changes: 3 additions & 3 deletions testdata/project-v4-multigroup/api/example.com/v1alpha1/memcached_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

Expand Down
6 changes: 3 additions & 3 deletions testdata/project-v4-multigroup/api/example.com/v2/wordpress_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,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"`
}

Expand Down
6 changes: 3 additions & 3 deletions testdata/project-v4-multigroup/api/fiz/v1/bar_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,23 @@ type Bar 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 Bar
// +required
Spec BarSpec `json:"spec"`

// status defines the observed state of Bar
// +optional
Status BarStatus `json:"status,omitempty,omitzero"`
Status BarStatus `json:"status,omitzero"`
}

// +kubebuilder:object:root=true

// BarList contains a list of Bar
type BarList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
metav1.ListMeta `json:"metadata,omitzero"`
Items []Bar `json:"items"`
}

Expand Down
6 changes: 3 additions & 3 deletions testdata/project-v4-multigroup/api/foo.policy/v1/healthcheckpolicy_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,23 @@ type HealthCheckPolicy 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 HealthCheckPolicy
// +required
Spec HealthCheckPolicySpec `json:"spec"`

// status defines the observed state of HealthCheckPolicy
// +optional
Status HealthCheckPolicyStatus `json:"status,omitempty,omitzero"`
Status HealthCheckPolicyStatus `json:"status,omitzero"`
}

// +kubebuilder:object:root=true

// HealthCheckPolicyList contains a list of HealthCheckPolicy
type HealthCheckPolicyList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
metav1.ListMeta `json:"metadata,omitzero"`
Items []HealthCheckPolicy `json:"items"`
}

Expand Down
6 changes: 3 additions & 3 deletions testdata/project-v4-multigroup/api/foo/v1/bar_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,23 @@ type Bar 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 Bar
// +required
Spec BarSpec `json:"spec"`

// status defines the observed state of Bar
// +optional
Status BarStatus `json:"status,omitempty,omitzero"`
Status BarStatus `json:"status,omitzero"`
}

// +kubebuilder:object:root=true

// BarList contains a list of Bar
type BarList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
metav1.ListMeta `json:"metadata,omitzero"`
Items []Bar `json:"items"`
}

Expand Down
Loading
Loading