Merge pull request #8925 from k8s-infra-cherrypick-robot/cherry-pick-…

…8924-to-release-1.4 [release-1.4] 🐛 Fix deprecation marker for RolloutAfter
kubernetes-sigs · Jun 27, 2023 · 00dbf7b · 00dbf7b
2 parents 0691165 + 2d84a18
commit 00dbf7b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/api/v1beta1/cluster_types.go b/api/v1beta1/cluster_types.go
@@ -80,8 +80,10 @@ type Topology struct {
 
 	// RolloutAfter performs a rollout of the entire cluster one component at a time,
 	// control plane first and then machine deployments.
-	// +optional
+	//
 	// Deprecated: This field has no function and is going to be removed in the next apiVersion.
+	//
+	// +optional
 	RolloutAfter *metav1.Time `json:"rolloutAfter,omitempty"`
 
 	// ControlPlane describes the cluster control plane.

diff --git a/api/v1beta1/zz_generated.openapi.go b/api/v1beta1/zz_generated.openapi.go
diff --git a/config/crd/bases/cluster.x-k8s.io_clusters.yaml b/config/crd/bases/cluster.x-k8s.io_clusters.yaml