Skip to content

Commit 31ce2a0

Browse files
committed
Remove deprecated Cluster.spec.topology.rolloutAfter field
Signed-off-by: Stefan Büringer buringerst@vmware.com
1 parent 2cef1f0 commit 31ce2a0

File tree

9 files changed

+20
-31
lines changed

9 files changed

+20
-31
lines changed

api/core/v1beta1/conversion_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ func TestFuzzyConversion(t *testing.T) {
7676
func ClusterFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
7777
return []interface{}{
7878
hubClusterStatus,
79+
spokeClusterTopology,
7980
spokeClusterStatus,
8081
spokeClusterVariable,
8182
}
@@ -98,6 +99,13 @@ func hubClusterStatus(in *clusterv1.ClusterStatus, c fuzz.Continue) {
9899
}
99100
}
100101

102+
func spokeClusterTopology(in *Topology, c fuzz.Continue) {
103+
c.FuzzNoCustom(in)
104+
105+
// RolloutAfter was unused and has been removed in v1beta2.
106+
in.RolloutAfter = nil
107+
}
108+
101109
func spokeClusterStatus(in *ClusterStatus, c fuzz.Continue) {
102110
c.FuzzNoCustom(in)
103111
// Drop empty structs with only omit empty fields.

api/core/v1beta1/zz_generated.conversion.go

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/core/v1beta2/cluster_types.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -548,14 +548,6 @@ type Topology struct {
548548
// +kubebuilder:validation:MaxLength=256
549549
Version string `json:"version"`
550550

551-
// rolloutAfter performs a rollout of the entire cluster one component at a time,
552-
// control plane first and then machine deployments.
553-
//
554-
// Deprecated: This field has no function and is going to be removed in the next apiVersion.
555-
//
556-
// +optional
557-
RolloutAfter *metav1.Time `json:"rolloutAfter,omitempty"`
558-
559551
// controlPlane describes the cluster control plane.
560552
// +optional
561553
ControlPlane ControlPlaneTopology `json:"controlPlane,omitempty"`

api/core/v1beta2/zz_generated.deepcopy.go

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/core/v1beta2/zz_generated.openapi.go

Lines changed: 1 addition & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/cluster.x-k8s.io_clusters.yaml

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/book/src/developer/providers/migrations/v1.10-to-v1.11.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ proposal because most of the changes described below are a consequence of the wo
8484
- See changes that apply to [all CRDs](#all-crds)
8585
- The `spec.topology.class` field has been renamed to `spec.topology.classRef.name`
8686
- The `spec.topology.classNamespace` field has been renamed to `spec.topology.classRef.namespace`
87+
- The `spec.topology.rolloutAfter` field has been removed (the corresponding functionality was never implemented)
8788
- The `definitionFrom` field (deprecated since CAPI v1.8) has been removed from
8889
- `spec.topology.variables`
8990
- `spec.topology.controlPlane.variables.overrides`

internal/apis/core/v1alpha4/conversion_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ func ClusterFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
109109
return []interface{}{
110110
hubClusterVariable,
111111
hubClusterStatus,
112+
spokeClusterTopology,
112113
}
113114
}
114115

@@ -136,6 +137,13 @@ func hubClusterVariable(in *clusterv1.ClusterVariable, c fuzz.Continue) {
136137
in.Value = apiextensionsv1.JSON{Raw: []byte("\"test-string\"")}
137138
}
138139

140+
func spokeClusterTopology(in *Topology, c fuzz.Continue) {
141+
c.FuzzNoCustom(in)
142+
143+
// RolloutAfter was unused and has been removed in v1beta2.
144+
in.RolloutAfter = nil
145+
}
146+
139147
func ClusterClassFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
140148
return []interface{}{
141149
hubJSONPatch,

internal/apis/core/v1alpha4/zz_generated.conversion.go

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)