Merge pull request #1957 from munnerz/fixup-req-status

Add omitempty to spec and status fields
cert-manager · Aug 2, 2019 · 7575e26 · 7575e26
2 parents c67c53c + 987967c
commit 7575e26
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/deploy/manifests/00-crds.yaml b/deploy/manifests/00-crds.yaml
@@ -1796,8 +1796,6 @@ spec:
           type: object
       required:
       - metadata
-      - spec
-      - status
       type: object
   versions:
   - name: v1alpha1
@@ -7324,8 +7322,6 @@ spec:
           type: object
       required:
       - metadata
-      - spec
-      - status
       type: object
   versions:
   - name: v1alpha1

diff --git a/pkg/apis/certmanager/v1alpha1/types_challenge.go b/pkg/apis/certmanager/v1alpha1/types_challenge.go
@@ -37,8 +37,8 @@ type Challenge struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata"`
 
-	Spec   ChallengeSpec   `json:"spec"`
-	Status ChallengeStatus `json:"status"`
+	Spec   ChallengeSpec   `json:"spec,omitempty"`
+	Status ChallengeStatus `json:"status,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/pkg/apis/certmanager/v1alpha1/types_order.go b/pkg/apis/certmanager/v1alpha1/types_order.go
@@ -37,8 +37,8 @@ type Order struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata"`
 
-	Spec   OrderSpec   `json:"spec"`
-	Status OrderStatus `json:"status"`
+	Spec   OrderSpec   `json:"spec,omitempty"`
+	Status OrderStatus `json:"status,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object