Merge pull request #1621 from hernit/main

stefanprodan · web-flow · commit f3be47d90bb7 · 2024-03-26T00:59:11.000+02:00
Add omitempty to statuses to allow better marshalling
diff --git a/pkg/apis/flagger/v1beta1/alert.go b/pkg/apis/flagger/v1beta1/alert.go
@@ -34,7 +34,7 @@ type AlertProvider struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	Spec   AlertProviderSpec   `json:"spec"`
-	Status AlertProviderStatus `json:"status"`
+	Status AlertProviderStatus `json:"status,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
diff --git a/pkg/apis/flagger/v1beta1/canary.go b/pkg/apis/flagger/v1beta1/canary.go
@@ -46,7 +46,7 @@ type Canary struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	Spec   CanarySpec   `json:"spec"`
-	Status CanaryStatus `json:"status"`
+	Status CanaryStatus `json:"status,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
diff --git a/pkg/apis/flagger/v1beta1/metric.go b/pkg/apis/flagger/v1beta1/metric.go
@@ -36,7 +36,7 @@ type MetricTemplate struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	Spec   MetricTemplateSpec   `json:"spec"`
-	Status MetricTemplateStatus `json:"status"`
+	Status MetricTemplateStatus `json:"status,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ type AlertProvider struct {`
`34`	`34`	metav1.ObjectMeta `json:"metadata,omitempty"`
`35`	`35`
`36`	`36`	Spec AlertProviderSpec `json:"spec"`
`37`		- Status AlertProviderStatus `json:"status"`
	`37`	+ Status AlertProviderStatus `json:"status,omitempty"`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ type Canary struct {`
`46`	`46`	metav1.ObjectMeta `json:"metadata,omitempty"`
`47`	`47`
`48`	`48`	Spec CanarySpec `json:"spec"`
`49`		- Status CanaryStatus `json:"status"`
	`49`	+ Status CanaryStatus `json:"status,omitempty"`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ type MetricTemplate struct {`
`36`	`36`	metav1.ObjectMeta `json:"metadata,omitempty"`
`37`	`37`
`38`	`38`	Spec MetricTemplateSpec `json:"spec"`
`39`		- Status MetricTemplateStatus `json:"status"`
	`39`	+ Status MetricTemplateStatus `json:"status,omitempty"`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object`