Skip to content

Commit 9ad6d09

Browse files
sbueringersbueringer
committed
Restructure strategy fields in MD, Cluster and ClusterClass
Signed-off-by: Stefan Büringer buringerst@vmware.com
1 parent 46d994c commit 9ad6d09

38 files changed

+1161
-770
lines changed

‎.golangci-kal.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,19 +171,19 @@ linters:
171171
linters:
172172
- kubeapilinter
173173
- path: "api/core/v1beta2/cluster_types.go"
174-
text: "optionalfields: field (ClusterNetwork|Services|Pods|ControlPlaneEndpoint|ControlPlane|Workers|Metadata|Variables|Strategy) is optional and should (be a pointer|have the omitempty tag)"
174+
text: "optionalfields: field (ClusterNetwork|Services|Pods|ControlPlaneEndpoint|ControlPlane|Workers|Metadata|Variables|Strategy|Rollout|RollingUpdate) is optional and should (be a pointer|have the omitempty tag)"
175175
linters:
176176
- kubeapilinter
177177
- path: "api/core/v1beta2/clusterclass_types.go"
178-
text: "optionalfields: field (Workers|Metadata|ControlPlane|Strategy|Infrastructure|DeprecatedV1Beta1Metadata) is optional and should (be a pointer|have the omitempty tag)"
178+
text: "optionalfields: field (Workers|Metadata|ControlPlane|Strategy|Infrastructure|DeprecatedV1Beta1Metadata|Rollout|RollingUpdate) is optional and should (be a pointer|have the omitempty tag)"
179179
linters:
180180
- kubeapilinter
181181
- path: "api/core/v1beta2/(cluster_types.go|clusterclass_types.go|machinehealthcheck_types.go)"
182182
text: "optionalfields: field (Checks|Remediation|TriggerIf) is optional and should (be a pointer|have the omitempty tag)"
183183
linters:
184184
- kubeapilinter
185185
- path: "api/core/v1beta2/machinedeployment_types.go"
186-
text: "optionalfields: field (Strategy|RollingUpdate|Remediation) is optional and should (be a pointer|have the omitempty tag)"
186+
text: "optionalfields: field (Strategy|Rollout|RollingUpdate|Remediation) is optional and should (be a pointer|have the omitempty tag)"
187187
linters:
188188
- kubeapilinter
189189
- path: "api/ipam/v1beta2/ipaddressclaim_types.go"

‎api/core/v1beta1/conversion.go

Lines changed: 41 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -823,11 +823,13 @@ func Convert_v1beta1_MachineDeploymentClass_To_v1beta2_MachineDeploymentClass(in
823823
return err
824824
}
825825
if in.Strategy != nil {
826-
if err := Convert_v1beta1_MachineDeploymentStrategy_To_v1beta2_MachineDeploymentStrategy(in.Strategy, &out.Strategy, s); err != nil {
827-
return err
828-
}
829-
if in.Strategy.RollingUpdate != nil && in.Strategy.RollingUpdate.DeletePolicy != nil {
830-
out.Deletion.Order = clusterv1.MachineSetDeletionOrder(*in.Strategy.RollingUpdate.DeletePolicy)
826+
out.Rollout.Strategy.Type = clusterv1.MachineDeploymentRolloutStrategyType(in.Strategy.Type)
827+
if in.Strategy.RollingUpdate != nil {
828+
out.Rollout.Strategy.RollingUpdate.MaxUnavailable = in.Strategy.RollingUpdate.MaxUnavailable
829+
out.Rollout.Strategy.RollingUpdate.MaxSurge = in.Strategy.RollingUpdate.MaxSurge
830+
if in.Strategy.RollingUpdate.DeletePolicy != nil {
831+
out.Deletion.Order = clusterv1.MachineSetDeletionOrder(*in.Strategy.RollingUpdate.DeletePolicy)
832+
}
831833
}
832834
if in.Strategy.Remediation != nil && in.Strategy.Remediation.MaxInFlight != nil {
833835
if out.HealthCheck == nil {
@@ -877,10 +879,13 @@ func Convert_v1beta2_MachineDeploymentClass_To_v1beta1_MachineDeploymentClass(in
877879
if err := Convert_v1beta2_MachineDeploymentClassInfrastructureTemplate_To_v1beta1_LocalObjectTemplate(&in.Infrastructure, &out.Template.Infrastructure, s); err != nil {
878880
return err
879881
}
880-
if !reflect.DeepEqual(in.Strategy, clusterv1.MachineDeploymentStrategy{}) {
882+
if !reflect.DeepEqual(in.Rollout.Strategy, clusterv1.MachineDeploymentClassRolloutStrategy{}) {
881883
out.Strategy = &MachineDeploymentStrategy{}
882-
if err := Convert_v1beta2_MachineDeploymentStrategy_To_v1beta1_MachineDeploymentStrategy(&in.Strategy, out.Strategy, s); err != nil {
883-
return err
884+
out.Strategy.Type = MachineDeploymentStrategyType(in.Rollout.Strategy.Type)
885+
if !reflect.DeepEqual(in.Rollout.Strategy.RollingUpdate, clusterv1.MachineDeploymentClassRolloutStrategyRollingUpdate{}) {
886+
out.Strategy.RollingUpdate = &MachineRollingUpdateDeployment{}
887+
out.Strategy.RollingUpdate.MaxUnavailable = in.Rollout.Strategy.RollingUpdate.MaxUnavailable
888+
out.Strategy.RollingUpdate.MaxSurge = in.Rollout.Strategy.RollingUpdate.MaxSurge
884889
}
885890
}
886891
if in.Deletion.Order != "" {
@@ -942,11 +947,13 @@ func Convert_v1beta1_MachineDeploymentTopology_To_v1beta2_MachineDeploymentTopol
942947
}
943948
}
944949
if in.Strategy != nil {
945-
if err := Convert_v1beta1_MachineDeploymentStrategy_To_v1beta2_MachineDeploymentStrategy(in.Strategy, &out.Strategy, s); err != nil {
946-
return err
947-
}
948-
if in.Strategy.RollingUpdate != nil && in.Strategy.RollingUpdate.DeletePolicy != nil {
949-
out.Deletion.Order = clusterv1.MachineSetDeletionOrder(*in.Strategy.RollingUpdate.DeletePolicy)
950+
out.Rollout.Strategy.Type = clusterv1.MachineDeploymentRolloutStrategyType(in.Strategy.Type)
951+
if in.Strategy.RollingUpdate != nil {
952+
out.Rollout.Strategy.RollingUpdate.MaxUnavailable = in.Strategy.RollingUpdate.MaxUnavailable
953+
out.Rollout.Strategy.RollingUpdate.MaxSurge = in.Strategy.RollingUpdate.MaxSurge
954+
if in.Strategy.RollingUpdate.DeletePolicy != nil {
955+
out.Deletion.Order = clusterv1.MachineSetDeletionOrder(*in.Strategy.RollingUpdate.DeletePolicy)
956+
}
950957
}
951958
if in.Strategy.Remediation != nil && in.Strategy.Remediation.MaxInFlight != nil {
952959
if out.HealthCheck == nil {
@@ -994,10 +1001,13 @@ func Convert_v1beta2_MachineDeploymentTopology_To_v1beta1_MachineDeploymentTopol
9941001
return err
9951002
}
9961003
}
997-
if !reflect.DeepEqual(in.Strategy, clusterv1.MachineDeploymentStrategy{}) {
1004+
if !reflect.DeepEqual(in.Rollout.Strategy, clusterv1.MachineDeploymentTopologyRolloutStrategy{}) {
9981005
out.Strategy = &MachineDeploymentStrategy{}
999-
if err := Convert_v1beta2_MachineDeploymentStrategy_To_v1beta1_MachineDeploymentStrategy(&in.Strategy, out.Strategy, s); err != nil {
1000-
return err
1006+
out.Strategy.Type = MachineDeploymentStrategyType(in.Rollout.Strategy.Type)
1007+
if !reflect.DeepEqual(in.Rollout.Strategy.RollingUpdate, clusterv1.MachineDeploymentTopologyRolloutStrategyRollingUpdate{}) {
1008+
out.Strategy.RollingUpdate = &MachineRollingUpdateDeployment{}
1009+
out.Strategy.RollingUpdate.MaxUnavailable = in.Rollout.Strategy.RollingUpdate.MaxUnavailable
1010+
out.Strategy.RollingUpdate.MaxSurge = in.Rollout.Strategy.RollingUpdate.MaxSurge
10011011
}
10021012
}
10031013
if in.Deletion.Order != "" {
@@ -1978,18 +1988,6 @@ func Convert_v1beta2_MachineSetSpec_To_v1beta1_MachineSetSpec(in *clusterv1.Mach
19781988
return nil
19791989
}
19801990

1981-
func Convert_v1beta1_MachineRollingUpdateDeployment_To_v1beta2_MachineDeploymentStrategyRollingUpdate(in *MachineRollingUpdateDeployment, out *clusterv1.MachineDeploymentStrategyRollingUpdate, _ apimachineryconversion.Scope) error {
1982-
out.MaxUnavailable = in.MaxUnavailable
1983-
out.MaxSurge = in.MaxSurge
1984-
return nil
1985-
}
1986-
1987-
func Convert_v1beta2_MachineDeploymentStrategyRollingUpdate_To_v1beta1_MachineRollingUpdateDeployment(in *clusterv1.MachineDeploymentStrategyRollingUpdate, out *MachineRollingUpdateDeployment, _ apimachineryconversion.Scope) error {
1988-
out.MaxUnavailable = in.MaxUnavailable
1989-
out.MaxSurge = in.MaxSurge
1990-
return nil
1991-
}
1992-
19931991
func Convert_v1beta1_ClusterSpec_To_v1beta2_ClusterSpec(in *ClusterSpec, out *clusterv1.ClusterSpec, s apimachineryconversion.Scope) error {
19941992
if err := autoConvert_v1beta1_ClusterSpec_To_v1beta2_ClusterSpec(in, out, s); err != nil {
19951993
return err
@@ -2062,16 +2060,19 @@ func Convert_v1beta1_MachineDeploymentSpec_To_v1beta2_MachineDeploymentSpec(in *
20622060
return err
20632061
}
20642062
if in.Strategy != nil {
2065-
if err := Convert_v1beta1_MachineDeploymentStrategy_To_v1beta2_MachineDeploymentStrategy(in.Strategy, &out.Strategy, s); err != nil {
2066-
return err
2067-
}
2068-
if in.Strategy.RollingUpdate != nil && in.Strategy.RollingUpdate.DeletePolicy != nil {
2069-
out.Deletion.Order = clusterv1.MachineSetDeletionOrder(*in.Strategy.RollingUpdate.DeletePolicy)
2063+
out.Rollout.Strategy.Type = clusterv1.MachineDeploymentRolloutStrategyType(in.Strategy.Type)
2064+
if in.Strategy.RollingUpdate != nil {
2065+
out.Rollout.Strategy.RollingUpdate.MaxUnavailable = in.Strategy.RollingUpdate.MaxUnavailable
2066+
out.Rollout.Strategy.RollingUpdate.MaxSurge = in.Strategy.RollingUpdate.MaxSurge
2067+
if in.Strategy.RollingUpdate.DeletePolicy != nil {
2068+
out.Deletion.Order = clusterv1.MachineSetDeletionOrder(*in.Strategy.RollingUpdate.DeletePolicy)
2069+
}
20702070
}
20712071
if in.Strategy.Remediation != nil && in.Strategy.Remediation.MaxInFlight != nil {
20722072
out.Remediation.MaxInFlight = in.Strategy.Remediation.MaxInFlight
20732073
}
20742074
}
2075+
out.Rollout.After = in.RolloutAfter
20752076

20762077
return nil
20772078
}
@@ -2080,10 +2081,13 @@ func Convert_v1beta2_MachineDeploymentSpec_To_v1beta1_MachineDeploymentSpec(in *
20802081
if err := autoConvert_v1beta2_MachineDeploymentSpec_To_v1beta1_MachineDeploymentSpec(in, out, s); err != nil {
20812082
return err
20822083
}
2083-
if !reflect.DeepEqual(in.Strategy, clusterv1.MachineDeploymentStrategy{}) {
2084+
if !reflect.DeepEqual(in.Rollout.Strategy, clusterv1.MachineDeploymentRolloutStrategy{}) {
20842085
out.Strategy = &MachineDeploymentStrategy{}
2085-
if err := Convert_v1beta2_MachineDeploymentStrategy_To_v1beta1_MachineDeploymentStrategy(&in.Strategy, out.Strategy, s); err != nil {
2086-
return err
2086+
out.Strategy.Type = MachineDeploymentStrategyType(in.Rollout.Strategy.Type)
2087+
if !reflect.DeepEqual(in.Rollout.Strategy.RollingUpdate, clusterv1.MachineDeploymentRolloutStrategyRollingUpdate{}) {
2088+
out.Strategy.RollingUpdate = &MachineRollingUpdateDeployment{}
2089+
out.Strategy.RollingUpdate.MaxUnavailable = in.Rollout.Strategy.RollingUpdate.MaxUnavailable
2090+
out.Strategy.RollingUpdate.MaxSurge = in.Rollout.Strategy.RollingUpdate.MaxSurge
20872091
}
20882092
}
20892093
if in.Deletion.Order != "" {
@@ -2104,33 +2108,7 @@ func Convert_v1beta2_MachineDeploymentSpec_To_v1beta1_MachineDeploymentSpec(in *
21042108
}
21052109
out.Strategy.Remediation.MaxInFlight = in.Remediation.MaxInFlight
21062110
}
2107-
2108-
return nil
2109-
}
2110-
2111-
func Convert_v1beta1_MachineDeploymentStrategy_To_v1beta2_MachineDeploymentStrategy(in *MachineDeploymentStrategy, out *clusterv1.MachineDeploymentStrategy, s apimachineryconversion.Scope) error {
2112-
if err := autoConvert_v1beta1_MachineDeploymentStrategy_To_v1beta2_MachineDeploymentStrategy(in, out, s); err != nil {
2113-
return err
2114-
}
2115-
if in.RollingUpdate != nil {
2116-
if err := Convert_v1beta1_MachineRollingUpdateDeployment_To_v1beta2_MachineDeploymentStrategyRollingUpdate(in.RollingUpdate, &out.RollingUpdate, s); err != nil {
2117-
return err
2118-
}
2119-
}
2120-
2121-
return nil
2122-
}
2123-
2124-
func Convert_v1beta2_MachineDeploymentStrategy_To_v1beta1_MachineDeploymentStrategy(in *clusterv1.MachineDeploymentStrategy, out *MachineDeploymentStrategy, s apimachineryconversion.Scope) error {
2125-
if err := autoConvert_v1beta2_MachineDeploymentStrategy_To_v1beta1_MachineDeploymentStrategy(in, out, s); err != nil {
2126-
return err
2127-
}
2128-
if !reflect.DeepEqual(in.RollingUpdate, clusterv1.MachineDeploymentStrategyRollingUpdate{}) {
2129-
out.RollingUpdate = &MachineRollingUpdateDeployment{}
2130-
if err := Convert_v1beta2_MachineDeploymentStrategyRollingUpdate_To_v1beta1_MachineRollingUpdateDeployment(&in.RollingUpdate, out.RollingUpdate, s); err != nil {
2131-
return err
2132-
}
2133-
}
2111+
out.RolloutAfter = in.Rollout.After
21342112

21352113
return nil
21362114
}

0 commit comments

Comments
 (0)