Merge pull request #4913 from camilamacedo86/fix-go-deploy-image

🐛 (deploy-image/v1-alpha1) - Revert changes to make status a pointer in favor of use omitzero; keep aligned with latest review changes for go/v4

Author: k8s-ci-robot

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

@@ -127,15 +127,15 @@ type {{ .Resource.Kind }} struct {
 
 	// metadata is a standard object metadata
 	// +optional
-	metav1.ObjectMeta ` + "`" + `json:"metadata,omitempty"` + "`" + `
+	metav1.ObjectMeta ` + "`" + `json:"metadata,omitempty,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"` + "`" + `
+	Status {{ .Resource.Kind }}Status ` + "`" + `json:"status,omitempty,omitzero"` + "`" + `
 }
 
 // +kubebuilder:object:root=true

pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller.go

@@ -153,11 +153,6 @@ func (r *{{ .Resource.Kind }}Reconciler) Reconcile(ctx context.Context, req ctrl
 		log.Error(err, "Failed to get {{ lower .Resource.Kind }}")
 		return ctrl.Result{}, err
 	}
-
-	// Let's just set the status as Unknown when no status is available
-	if {{ lower .Resource.Kind }}.Status == nil {
-		{{ lower .Resource.Kind }}.Status = &{{ .Resource.ImportAlias }}.{{ .Resource.Kind }}Status{}
-	}
 	
 	if len({{ lower .Resource.Kind }}.Status.Conditions) == 0 {
 		meta.SetStatusCondition(&{{ lower .Resource.Kind }}.Status.Conditions, metav1.Condition{Type: typeAvailable{{ .Resource.Kind }}, Status: metav1.ConditionUnknown, Reason: "Reconciling", Message: "Starting reconciliation"})

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

@@ -66,15 +66,15 @@ type Busybox struct {
 
 	// metadata is a standard object metadata
 	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.ObjectMeta `json:"metadata,omitempty,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"`
+	Status BusyboxStatus `json:"status,omitempty,omitzero"`
 }
 
 // +kubebuilder:object:root=true

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

@@ -70,15 +70,15 @@ type Memcached struct {
 
 	// metadata is a standard object metadata
 	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.ObjectMeta `json:"metadata,omitempty,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"`
+	Status MemcachedStatus `json:"status,omitempty,omitzero"`
 }
 
 // +kubebuilder:object:root=true

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

@@ -99,11 +99,6 @@ func (r *BusyboxReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		return ctrl.Result{}, err
 	}
 
-	// Let's just set the status as Unknown when no status is available
-	if busybox.Status == nil {
-		busybox.Status = &examplecomv1alpha1.BusyboxStatus{}
-	}
-
 	if len(busybox.Status.Conditions) == 0 {
 		meta.SetStatusCondition(&busybox.Status.Conditions, metav1.Condition{Type: typeAvailableBusybox, Status: metav1.ConditionUnknown, Reason: "Reconciling", Message: "Starting reconciliation"})
 		if err = r.Status().Update(ctx, busybox); err != nil {

testdata/project-v4-multigroup/internal/controller/example.com/busybox_controller.go

@@ -99,11 +99,6 @@ func (r *MemcachedReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		return ctrl.Result{}, err
 	}
 
-	// Let's just set the status as Unknown when no status is available
-	if memcached.Status == nil {
-		memcached.Status = &examplecomv1alpha1.MemcachedStatus{}
-	}
-
 	if len(memcached.Status.Conditions) == 0 {
 		meta.SetStatusCondition(&memcached.Status.Conditions, metav1.Condition{Type: typeAvailableMemcached, Status: metav1.ConditionUnknown, Reason: "Reconciling", Message: "Starting reconciliation"})
 		if err = r.Status().Update(ctx, memcached); err != nil {

testdata/project-v4-multigroup/internal/controller/example.com/memcached_controller.go

@@ -66,15 +66,15 @@ type Busybox struct {
 
 	// metadata is a standard object metadata
 	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.ObjectMeta `json:"metadata,omitempty,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"`
+	Status BusyboxStatus `json:"status,omitempty,omitzero"`
 }
 
 // +kubebuilder:object:root=true

testdata/project-v4-with-plugins/api/v1alpha1/busybox_types.go

@@ -70,15 +70,15 @@ type Memcached struct {
 
 	// metadata is a standard object metadata
 	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.ObjectMeta `json:"metadata,omitempty,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"`
+	Status MemcachedStatus `json:"status,omitempty,omitzero"`
 }
 
 // +kubebuilder:object:root=true