Merge pull request #279 from openshift-cherrypick-robot/cherry-pick-2…

…76-to-release-4.14 [release-4.14] OCPBUGS-30015: fix: convert `continue` field between v1beta1 and v1alpha1
openshift · Mar 1, 2024 · a4b845a · a4b845a
2 parents 73729ed + 444cde1
commit a4b845a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/pkg/apis/monitoring/v1beta1/conversion_from.go b/pkg/apis/monitoring/v1beta1/conversion_from.go
@@ -32,6 +32,7 @@ func convertRouteFrom(in *v1alpha1.Route) (*Route, error) {
 
 	out := &Route{
 		Receiver:            in.Receiver,
+		Continue:            in.Continue,
 		GroupBy:             in.GroupBy,
 		GroupWait:           in.GroupWait,
 		GroupInterval:       in.GroupInterval,

diff --git a/pkg/apis/monitoring/v1beta1/conversion_to.go b/pkg/apis/monitoring/v1beta1/conversion_to.go
@@ -32,6 +32,7 @@ func convertRouteTo(in *Route) (*v1alpha1.Route, error) {
 
 	out := &v1alpha1.Route{
 		Receiver:            in.Receiver,
+		Continue:            in.Continue,
 		GroupBy:             in.GroupBy,
 		GroupWait:           in.GroupWait,
 		GroupInterval:       in.GroupInterval,

diff --git a/...om/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1beta1/conversion_from.go b/...om/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1beta1/conversion_from.go
diff --git a/....com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1beta1/conversion_to.go b/....com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1beta1/conversion_to.go