Allow empty status fields

kubernetes-sigs · Feb 26, 2020 · 2ccd5c2 · 2ccd5c2
1 parent fbab1a2
commit 2ccd5c2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/api/v1alpha3/machinehealthcheck_types.go b/api/v1alpha3/machinehealthcheck_types.go
@@ -78,11 +78,11 @@ type UnhealthyCondition struct {
 type MachineHealthCheckStatus struct {
 	// total number of machines counted by this machine health check
 	// +kubebuilder:validation:Minimum=0
-	ExpectedMachines int32 `json:"expectedMachines"`
+	ExpectedMachines int32 `json:"expectedMachines,omitempty"`
 
 	// total number of healthy machines counted by this machine health check
 	// +kubebuilder:validation:Minimum=0
-	CurrentHealthy int32 `json:"currentHealthy"`
+	CurrentHealthy int32 `json:"currentHealthy,omitempty"`
 }
 
 // ANCHOR_END: MachineHealthCheckStatus

diff --git a/api/v1alpha3/machinehealthcheck_webhook_test.go b/api/v1alpha3/machinehealthcheck_webhook_test.go
@@ -31,6 +31,8 @@ func TestMachineHealthCheckDefault(t *testing.T) {
 	mhc.Default()
 
 	g.Expect(mhc.Spec.MaxUnhealthy.String()).To(Equal("100%"))
+	g.Expect(mhc.Spec.NodeStartupTimeout).ToNot(BeNil())
+	g.Expect(*mhc.Spec.NodeStartupTimeout).To(Equal(metav1.Duration{Duration: 10 * time.Minute}))
 }
 
 func TestMachineHealthCheckLabelSelectorAsSelectorValidation(t *testing.T) {

diff --git a/config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml b/config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml
@@ -162,9 +162,6 @@ spec:
                 format: int32
                 minimum: 0
                 type: integer
-            required:
-            - currentHealthy
-            - expectedMachines
             type: object
         type: object
     served: true