Skip to content

Commit d43e0ac

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #12524 from sbueringer/pr-namingstrategy
⚠️ Rename namingStrategy => naming, machineNamingStrategy => machineNaming
2 parents 8bb9510 + c229aba commit d43e0ac

File tree

49 files changed

+467
-616
lines changed

Some content is hidden

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

49 files changed

+467
-616
lines changed

‎.golangci-kal.yml

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

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,11 @@ func Convert_v1beta2_KubeadmControlPlaneSpec_To_v1beta1_KubeadmControlPlaneSpec(
184184
out.RolloutStrategy.RollingUpdate.MaxSurge = in.Rollout.Strategy.RollingUpdate.MaxSurge
185185
}
186186
}
187+
if in.MachineNaming.Template != "" {
188+
out.MachineNamingStrategy = &MachineNamingStrategy{
189+
Template: in.MachineNaming.Template,
190+
}
191+
}
187192

188193
return nil
189194
}
@@ -210,6 +215,9 @@ func Convert_v1beta1_KubeadmControlPlaneSpec_To_v1beta2_KubeadmControlPlaneSpec(
210215
out.Rollout.Strategy.RollingUpdate.MaxSurge = in.RolloutStrategy.RollingUpdate.MaxSurge
211216
}
212217
}
218+
if in.MachineNamingStrategy != nil {
219+
out.MachineNaming.Template = in.MachineNamingStrategy.Template
220+
}
213221

214222
return nil
215223
}
@@ -247,6 +255,11 @@ func Convert_v1beta2_KubeadmControlPlaneTemplateResourceSpec_To_v1beta1_KubeadmC
247255
out.RolloutStrategy.RollingUpdate.MaxSurge = in.Rollout.Strategy.RollingUpdate.MaxSurge
248256
}
249257
}
258+
if in.MachineNaming.Template != "" {
259+
out.MachineNamingStrategy = &MachineNamingStrategy{
260+
Template: in.MachineNaming.Template,
261+
}
262+
}
250263

251264
return nil
252265
}
@@ -279,6 +292,9 @@ func Convert_v1beta1_KubeadmControlPlaneTemplateResourceSpec_To_v1beta2_KubeadmC
279292
out.Rollout.Strategy.RollingUpdate.MaxSurge = in.RolloutStrategy.RollingUpdate.MaxSurge
280293
}
281294
}
295+
if in.MachineNamingStrategy != nil {
296+
out.MachineNaming.Template = in.MachineNamingStrategy.Template
297+
}
282298

283299
return nil
284300
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,9 @@ func spokeKubeadmControlPlane(in *KubeadmControlPlane, c randfill.Continue) {
173173
if reflect.DeepEqual(in.Spec.RolloutAfter, &metav1.Time{}) {
174174
in.Spec.RolloutAfter = nil
175175
}
176+
if reflect.DeepEqual(in.Spec.MachineNamingStrategy, &MachineNamingStrategy{}) {
177+
in.Spec.MachineNamingStrategy = nil
178+
}
176179
}
177180

178181
func hubKubeadmControlPlaneStatus(in *controlplanev1.KubeadmControlPlaneStatus, c randfill.Continue) {
@@ -255,6 +258,9 @@ func spokeKubeadmControlPlaneTemplate(in *KubeadmControlPlaneTemplate, c randfil
255258
if reflect.DeepEqual(in.Spec.Template.Spec.RolloutAfter, &metav1.Time{}) {
256259
in.Spec.Template.Spec.RolloutAfter = nil
257260
}
261+
if reflect.DeepEqual(in.Spec.Template.Spec.MachineNamingStrategy, &MachineNamingStrategy{}) {
262+
in.Spec.Template.Spec.MachineNamingStrategy = nil
263+
}
258264
}
259265

260266
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 & 8 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

@@ -1989,6 +2016,11 @@ func Convert_v1beta1_MachineSetSpec_To_v1beta2_MachineSetSpec(in *MachineSetSpec
19892016
}
19902017

19912018
out.Deletion.Order = clusterv1.MachineSetDeletionOrder(in.DeletePolicy)
2019+
if in.MachineNamingStrategy != nil {
2020+
out.MachineNaming = clusterv1.MachineNamingSpec{
2021+
Template: in.MachineNamingStrategy.Template,
2022+
}
2023+
}
19922024
return nil
19932025
}
19942026

@@ -1998,6 +2030,11 @@ func Convert_v1beta2_MachineSetSpec_To_v1beta1_MachineSetSpec(in *clusterv1.Mach
19982030
}
19992031

20002032
out.DeletePolicy = string(in.Deletion.Order)
2033+
if in.MachineNaming.Template != "" {
2034+
out.MachineNamingStrategy = &MachineNamingStrategy{
2035+
Template: in.MachineNaming.Template,
2036+
}
2037+
}
20012038
return nil
20022039
}
20032040

@@ -2088,6 +2125,11 @@ func Convert_v1beta1_MachineDeploymentSpec_To_v1beta2_MachineDeploymentSpec(in *
20882125
if in.RolloutAfter != nil && !reflect.DeepEqual(in.RolloutAfter, &metav1.Time{}) {
20892126
out.Rollout.After = *in.RolloutAfter
20902127
}
2128+
if in.MachineNamingStrategy != nil {
2129+
out.MachineNaming = clusterv1.MachineNamingSpec{
2130+
Template: in.MachineNamingStrategy.Template,
2131+
}
2132+
}
20912133

20922134
return nil
20932135
}
@@ -2126,7 +2168,11 @@ func Convert_v1beta2_MachineDeploymentSpec_To_v1beta1_MachineDeploymentSpec(in *
21262168
if !reflect.DeepEqual(in.Rollout.After, metav1.Time{}) {
21272169
out.RolloutAfter = ptr.To(in.Rollout.After)
21282170
}
2129-
2171+
if in.MachineNaming.Template != "" {
2172+
out.MachineNamingStrategy = &MachineNamingStrategy{
2173+
Template: in.MachineNaming.Template,
2174+
}
2175+
}
21302176
return nil
21312177
}
21322178

0 commit comments

Comments
 (0)