Tag Status field as omitempty

Checked that nobody depends on the Status field since we're technically breaking source backward compat https://pkg.go.dev/github.com/bitnami-labs/sealed-secrets@v0.11.0/pkg/apis/sealed-secrets/v1alpha1?tab=doc#SealedSecretStatus
bitnami-labs · Mar 26, 2020 · 047c24c · 047c24c
1 parent 4c1a221
commit 047c24c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/cmd/controller/controller.go b/cmd/controller/controller.go
@@ -288,7 +288,11 @@ func (c *Controller) unseal(key string) (unsealErr error) {
 
 func (c *Controller) updateSealedSecretStatus(ssecret *ssv1alpha1.SealedSecret, unsealError error) error {
 	ssecret = ssecret.DeepCopy()
-	st := &ssecret.Status
+	st := ssecret.Status
+	if st == nil {
+		st = &ssv1alpha1.SealedSecretStatus{}
+	}
+	ssecret.Status = st
 
 	st.ObservedGeneration = ssecret.ObjectMeta.Generation
 	updateSealedSecretsStatusConditions(st, unsealError)

diff --git a/pkg/apis/sealed-secrets/v1alpha1/types.go b/pkg/apis/sealed-secrets/v1alpha1/types.go
@@ -24,7 +24,7 @@ const (
 
 	// SealedSecretManagedAnnotation is the name for the annotation for
 	// flaging the existing secrets be managed by SealedSecret controller.
- 	SealedSecretManagedAnnotation = annoNs + "managed"
+	SealedSecretManagedAnnotation = annoNs + "managed"
 )
 
 // SecretTemplateSpec describes the structure a Secret should have
@@ -101,8 +101,9 @@ type SealedSecret struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   SealedSecretSpec   `json:"spec"`
-	Status SealedSecretStatus `json:"status"`
+	Spec SealedSecretSpec `json:"spec"`
+	// +optional
+	Status *SealedSecretStatus `json:"status,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/pkg/apis/sealed-secrets/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/sealed-secrets/v1alpha1/zz_generated.deepcopy.go