Skip to content

Commit 8c56b45

Browse files
sbueringersbueringer
committed
Renaming namingStrategy => naming, machineNamingStrategy =>
machineNaming Signed-off-by: Stefan Büringer [email protected]
1 parent 12e6357 commit 8c56b45

File tree

48 files changed

+446
-603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+446
-603
lines changed

‎.golangci-kal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ linters:
192192
linters:
193193
- kubeapilinter
194194
- path: "api/core/v1beta2/*|api/controlplane/kubeadm/v1beta2/*"
195-
text: "optionalfields: field Deletion is optional and should (be a pointer|have the omitempty tag)"
195+
text: "optionalfields: field (Naming|MachineNaming|Deletion) is optional and should (be a pointer|have the omitempty tag)"
196196
linters:
197197
- kubeapilinter
198198

‎api/controlplane/kubeadm/v1beta1/conversion.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,11 @@ func Convert_v1beta2_KubeadmControlPlaneSpec_To_v1beta1_KubeadmControlPlaneSpec(
182182
out.RolloutStrategy.RollingUpdate.MaxSurge = in.Rollout.Strategy.RollingUpdate.MaxSurge
183183
}
184184
}
185+
if in.MachineNaming.Template != "" {
186+
out.MachineNamingStrategy = &MachineNamingStrategy{
187+
Template: in.MachineNaming.Template,
188+
}
189+
}
185190

186191
return nil
187192
}
@@ -206,6 +211,9 @@ func Convert_v1beta1_KubeadmControlPlaneSpec_To_v1beta2_KubeadmControlPlaneSpec(
206211
out.Rollout.Strategy.RollingUpdate.MaxSurge = in.RolloutStrategy.RollingUpdate.MaxSurge
207212
}
208213
}
214+
if in.MachineNamingStrategy != nil {
215+
out.MachineNaming.Template = in.MachineNamingStrategy.Template
216+
}
209217

210218
return nil
211219
}
@@ -241,6 +249,11 @@ func Convert_v1beta2_KubeadmControlPlaneTemplateResourceSpec_To_v1beta1_KubeadmC
241249
out.RolloutStrategy.RollingUpdate.MaxSurge = in.Rollout.Strategy.RollingUpdate.MaxSurge
242250
}
243251
}
252+
if in.MachineNaming.Template != "" {
253+
out.MachineNamingStrategy = &MachineNamingStrategy{
254+
Template: in.MachineNaming.Template,
255+
}
256+
}
244257

245258
return nil
246259
}
@@ -271,6 +284,9 @@ func Convert_v1beta1_KubeadmControlPlaneTemplateResourceSpec_To_v1beta2_KubeadmC
271284
out.Rollout.Strategy.RollingUpdate.MaxSurge = in.RolloutStrategy.RollingUpdate.MaxSurge
272285
}
273286
}
287+
if in.MachineNamingStrategy != nil {
288+
out.MachineNaming.Template = in.MachineNamingStrategy.Template
289+
}
274290

275291
return nil
276292
}

‎api/controlplane/kubeadm/v1beta1/conversion_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,9 @@ func spokeKubeadmControlPlane(in *KubeadmControlPlane, c randfill.Continue) {
170170
if reflect.DeepEqual(in.Spec.RolloutStrategy, &RolloutStrategy{}) {
171171
in.Spec.RolloutStrategy = nil
172172
}
173+
if reflect.DeepEqual(in.Spec.MachineNamingStrategy, &MachineNamingStrategy{}) {
174+
in.Spec.MachineNamingStrategy = nil
175+
}
173176
}
174177

175178
func hubKubeadmControlPlaneStatus(in *controlplanev1.KubeadmControlPlaneStatus, c randfill.Continue) {
@@ -249,6 +252,9 @@ func spokeKubeadmControlPlaneTemplate(in *KubeadmControlPlaneTemplate, c randfil
249252
if reflect.DeepEqual(in.Spec.Template.Spec.RolloutStrategy, &RolloutStrategy{}) {
250253
in.Spec.Template.Spec.RolloutStrategy = nil
251254
}
255+
if reflect.DeepEqual(in.Spec.Template.Spec.MachineNamingStrategy, &MachineNamingStrategy{}) {
256+
in.Spec.Template.Spec.MachineNamingStrategy = nil
257+
}
252258
}
253259

254260
func spokeRemediationStrategy(in *RemediationStrategy, c randfill.Continue) {

‎api/controlplane/kubeadm/v1beta1/zz_generated.conversion.go

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

‎api/controlplane/kubeadm/v1beta2/kubeadm_control_plane_types.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -454,10 +454,10 @@ type KubeadmControlPlaneSpec struct {
454454
// +optional
455455
Remediation KubeadmControlPlaneRemediationSpec `json:"remediation,omitempty,omitzero"`
456456

457-
// machineNamingStrategy allows changing the naming pattern used when creating Machines.
457+
// machineNaming allows changing the naming pattern used when creating Machines.
458458
// InfraMachines & KubeadmConfigs will use the same name as the corresponding Machines.
459459
// +optional
460-
MachineNamingStrategy *MachineNamingStrategy `json:"machineNamingStrategy,omitempty"`
460+
MachineNaming MachineNamingSpec `json:"machineNaming,omitempty,omitzero"`
461461
}
462462

463463
// KubeadmControlPlaneMachineTemplate defines the template for Machines
@@ -637,9 +637,10 @@ type KubeadmControlPlaneRemediationSpec struct {
637637
MinHealthyPeriodSeconds *int32 `json:"minHealthyPeriodSeconds,omitempty"`
638638
}
639639

640-
// MachineNamingStrategy allows changing the naming pattern used when creating Machines.
640+
// MachineNamingSpec allows changing the naming pattern used when creating Machines.
641641
// InfraMachines & KubeadmConfigs will use the same name as the corresponding Machines.
642-
type MachineNamingStrategy struct {
642+
// +kubebuilder:validation:MinProperties=1
643+
type MachineNamingSpec struct {
643644
// template defines the template to use for generating the names of the Machine objects.
644645
// If not defined, it will fallback to `{{ .kubeadmControlPlane.name }}-{{ .random }}`.
645646
// If the generated name string exceeds 63 characters, it will be trimmed to 58 characters and will

‎api/controlplane/kubeadm/v1beta2/kubeadmcontrolplanetemplate_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ type KubeadmControlPlaneTemplateResourceSpec struct {
105105
// +optional
106106
Remediation KubeadmControlPlaneRemediationSpec `json:"remediation,omitempty,omitzero"`
107107

108-
// machineNamingStrategy allows changing the naming pattern used when creating Machines.
108+
// machineNaming allows changing the naming pattern used when creating Machines.
109109
// InfraMachines & KubeadmConfigs will use the same name as the corresponding Machines.
110110
// +optional
111-
MachineNamingStrategy *MachineNamingStrategy `json:"machineNamingStrategy,omitempty"`
111+
MachineNaming MachineNamingSpec `json:"machineNaming,omitempty,omitzero"`
112112
}
113113

114114
// KubeadmControlPlaneTemplateMachineTemplate defines the template for Machines

‎api/controlplane/kubeadm/v1beta2/zz_generated.deepcopy.go

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

‎api/core/v1beta1/conversion.go

Lines changed: 54 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -627,15 +627,12 @@ func Convert_v1beta2_ClusterClassSpec_To_v1beta1_ClusterClassSpec(in *clusterv1.
627627
return err
628628
}
629629

630-
if in.Infrastructure.NamingStrategy != nil {
631-
var template *string
632-
if in.Infrastructure.NamingStrategy.Template != "" {
633-
template = ptr.To(in.Infrastructure.NamingStrategy.Template)
634-
}
630+
if in.Infrastructure.Naming.Template != "" {
635631
out.InfrastructureNamingStrategy = &InfrastructureNamingStrategy{
636-
Template: template,
632+
Template: ptr.To(in.Infrastructure.Naming.Template),
637633
}
638634
}
635+
639636
return nil
640637
}
641638

@@ -654,7 +651,7 @@ func Convert_v1beta1_ClusterClassSpec_To_v1beta2_ClusterClassSpec(in *ClusterCla
654651
}
655652

656653
if in.InfrastructureNamingStrategy != nil {
657-
out.Infrastructure.NamingStrategy = &clusterv1.InfrastructureClassNamingStrategy{
654+
out.Infrastructure.Naming = clusterv1.InfrastructureClassNamingSpec{
658655
Template: ptr.Deref(in.InfrastructureNamingStrategy.Template, ""),
659656
}
660657
}
@@ -698,6 +695,11 @@ func Convert_v1beta1_ControlPlaneClass_To_v1beta2_ControlPlaneClass(in *ControlP
698695
}
699696
}
700697
}
698+
if in.NamingStrategy != nil {
699+
out.Naming = clusterv1.ControlPlaneClassNamingSpec{
700+
Template: ptr.Deref(in.NamingStrategy.Template, ""),
701+
}
702+
}
701703
return nil
702704
}
703705

@@ -731,6 +733,11 @@ func Convert_v1beta2_ControlPlaneClass_To_v1beta1_ControlPlaneClass(in *clusterv
731733
}
732734
}
733735
}
736+
if in.Naming.Template != "" {
737+
out.NamingStrategy = &ControlPlaneClassNamingStrategy{
738+
Template: ptr.To(in.Naming.Template),
739+
}
740+
}
734741
return nil
735742
}
736743

@@ -863,6 +870,11 @@ func Convert_v1beta1_MachineDeploymentClass_To_v1beta2_MachineDeploymentClass(in
863870
}
864871
}
865872
}
873+
if in.NamingStrategy != nil {
874+
out.Naming = clusterv1.MachineDeploymentClassNamingSpec{
875+
Template: ptr.Deref(in.NamingStrategy.Template, ""),
876+
}
877+
}
866878
return nil
867879
}
868880

@@ -934,6 +946,11 @@ func Convert_v1beta2_MachineDeploymentClass_To_v1beta1_MachineDeploymentClass(in
934946
}
935947
}
936948
}
949+
if in.Naming.Template != "" {
950+
out.NamingStrategy = &MachineDeploymentClassNamingStrategy{
951+
Template: ptr.To(in.Naming.Template),
952+
}
953+
}
937954
return nil
938955
}
939956

@@ -1076,6 +1093,11 @@ func Convert_v1beta1_MachinePoolClass_To_v1beta2_MachinePoolClass(in *MachinePoo
10761093
out.Deletion.NodeDrainTimeoutSeconds = clusterv1.ConvertToSeconds(in.NodeDrainTimeout)
10771094
out.Deletion.NodeVolumeDetachTimeoutSeconds = clusterv1.ConvertToSeconds(in.NodeVolumeDetachTimeout)
10781095
out.Deletion.NodeDeletionTimeoutSeconds = clusterv1.ConvertToSeconds(in.NodeDeletionTimeout)
1096+
if in.NamingStrategy != nil {
1097+
out.Naming = clusterv1.MachinePoolClassNamingSpec{
1098+
Template: ptr.Deref(in.NamingStrategy.Template, ""),
1099+
}
1100+
}
10791101
return nil
10801102
}
10811103

@@ -1095,6 +1117,11 @@ func Convert_v1beta2_MachinePoolClass_To_v1beta1_MachinePoolClass(in *clusterv1.
10951117
out.NodeDrainTimeout = clusterv1.ConvertFromSeconds(in.Deletion.NodeDrainTimeoutSeconds)
10961118
out.NodeVolumeDetachTimeout = clusterv1.ConvertFromSeconds(in.Deletion.NodeVolumeDetachTimeoutSeconds)
10971119
out.NodeDeletionTimeout = clusterv1.ConvertFromSeconds(in.Deletion.NodeDeletionTimeoutSeconds)
1120+
if in.Naming.Template != "" {
1121+
out.NamingStrategy = &MachinePoolClassNamingStrategy{
1122+
Template: ptr.To(in.Naming.Template),
1123+
}
1124+
}
10981125
return nil
10991126
}
11001127

@@ -1976,6 +2003,11 @@ func Convert_v1beta1_MachineSetSpec_To_v1beta2_MachineSetSpec(in *MachineSetSpec
19762003
}
19772004

19782005
out.Deletion.Order = clusterv1.MachineSetDeletionOrder(in.DeletePolicy)
2006+
if in.MachineNamingStrategy != nil {
2007+
out.MachineNaming = clusterv1.MachineNamingSpec{
2008+
Template: in.MachineNamingStrategy.Template,
2009+
}
2010+
}
19792011
return nil
19802012
}
19812013

@@ -1985,6 +2017,11 @@ func Convert_v1beta2_MachineSetSpec_To_v1beta1_MachineSetSpec(in *clusterv1.Mach
19852017
}
19862018

19872019
out.DeletePolicy = string(in.Deletion.Order)
2020+
if in.MachineNaming.Template != "" {
2021+
out.MachineNamingStrategy = &MachineNamingStrategy{
2022+
Template: in.MachineNaming.Template,
2023+
}
2024+
}
19882025
return nil
19892026
}
19902027

@@ -2073,7 +2110,11 @@ func Convert_v1beta1_MachineDeploymentSpec_To_v1beta2_MachineDeploymentSpec(in *
20732110
}
20742111
}
20752112
out.Rollout.After = in.RolloutAfter
2076-
2113+
if in.MachineNamingStrategy != nil {
2114+
out.MachineNaming = clusterv1.MachineNamingSpec{
2115+
Template: in.MachineNamingStrategy.Template,
2116+
}
2117+
}
20772118
return nil
20782119
}
20792120

@@ -2109,7 +2150,11 @@ func Convert_v1beta2_MachineDeploymentSpec_To_v1beta1_MachineDeploymentSpec(in *
21092150
out.Strategy.Remediation.MaxInFlight = in.Remediation.MaxInFlight
21102151
}
21112152
out.RolloutAfter = in.Rollout.After
2112-
2153+
if in.MachineNaming.Template != "" {
2154+
out.MachineNamingStrategy = &MachineNamingStrategy{
2155+
Template: in.MachineNaming.Template,
2156+
}
2157+
}
21132158
return nil
21142159
}
21152160

0 commit comments

Comments
 (0)