feat: add infrastructurename hostname source

Allow hostname to follow infrastructure name.

Signed-off-by: Andrey Smirnov <[email protected]>
Signed-off-by: Chris <[email protected]>

Author: echozio

api/v1alpha3/talosconfig_types.go

@@ -33,11 +33,16 @@ type HostnameSource string
 // HostnameSourceMachineName sets the hostname in the generated configuration to the machine name.
 const HostnameSourceMachineName HostnameSource = "MachineName"
 
+// HostnameSourceInfrastructureName sets the hostname in the generated configuration to the name of the machine's infrastructure.
+const HostnameSourceInfrastructureName HostnameSource = "InfrastructureName"
+
 // HostnameSpec defines the hostname source.
 type HostnameSpec struct {
 	// Source of the hostname.
 	//
-	// Allowed values: "MachineName" (use linked Machine's Name).
+	// Allowed values:
+	// "MachineName" (use linked Machine's Name).
+	// "InfrastructureName" (use linked Machine's infrastructure's name).
 	Source HostnameSource `json:"source,omitempty"`
 }
 

api/v1alpha3/talosconfig_webhook.go

@@ -54,10 +54,11 @@ func (r *TalosConfig) validate() error {
 	switch r.Spec.Hostname.Source {
 	case "":
 	case HostnameSourceMachineName:
+	case HostnameSourceInfrastructureName:
 	default:
 		allErrs = append(allErrs,
 			field.Invalid(field.NewPath("spec").Child("hostname").Child("source"), r.Spec.Hostname.Source,
-				fmt.Sprintf("valid values are: %q", []HostnameSource{HostnameSourceMachineName}),
+				fmt.Sprintf("valid values are: %q", []HostnameSource{HostnameSourceMachineName, HostnameSourceInfrastructureName}),
 			),
 		)
 	}

config/crd/bases/bootstrap.cluster.x-k8s.io_talosconfigs.yaml

@@ -125,7 +125,9 @@ spec:
                     description: |-
                       Source of the hostname.
 
-                      Allowed values: "MachineName" (use linked Machine's Name).
+                      Allowed values:
+                      "MachineName" (use linked Machine's Name).
+                      "InfrastructureName" (use linked Machine's infrastructure's name).
                     type: string
                 type: object
               strategicPatches:

config/crd/bases/bootstrap.cluster.x-k8s.io_talosconfigtemplates.yaml

@@ -120,7 +120,9 @@ spec:
                             description: |-
                               Source of the hostname.
 
-                              Allowed values: "MachineName" (use linked Machine's Name).
+                              Allowed values:
+                              "MachineName" (use linked Machine's Name).
+                              "InfrastructureName" (use linked Machine's infrastructure's name).
                             type: string
                         type: object
                       strategicPatches:

controllers/talosconfig_controller.go

@@ -544,12 +544,22 @@ func (r *TalosConfigReconciler) genConfigs(ctx context.Context, scope *TalosConf
 		data.RawV1Alpha1().ClusterConfig.ClusterNetwork.ServiceSubnet = scope.Cluster.Spec.ClusterNetwork.Services.CIDRBlocks
 	}
 
-	if !scope.ConfigOwner.IsMachinePool() && scope.Config.Spec.Hostname.Source == v1alpha3.HostnameSourceMachineName {
+	if !scope.ConfigOwner.IsMachinePool() && scope.Config.Spec.Hostname.Source != "" {
 		if data.RawV1Alpha1().MachineConfig.MachineNetwork == nil {
 			data.RawV1Alpha1().MachineConfig.MachineNetwork = &v1alpha1.NetworkConfig{}
 		}
 
-		data.RawV1Alpha1().MachineConfig.MachineNetwork.NetworkHostname = scope.ConfigOwner.GetName()
+		if scope.Config.Spec.Hostname.Source == v1alpha3.HostnameSourceMachineName {
+			data.RawV1Alpha1().MachineConfig.MachineNetwork.NetworkHostname = scope.ConfigOwner.GetName()
+		}
+
+		if scope.Config.Spec.Hostname.Source == v1alpha3.HostnameSourceInfrastructureName {
+			machine := &capiv1.Machine{}
+			if err := runtime.DefaultUnstructuredConverter.FromUnstructured(scope.ConfigOwner.Object, machine); err != nil {
+				return retBundle, err
+			}
+			data.RawV1Alpha1().MachineConfig.MachineNetwork.NetworkHostname = machine.Spec.InfrastructureRef.Name
+		}
 	}
 
 	dataOut, err := data.EncodeString(encoder.WithComments(encoder.CommentsDisabled))

internal/integration/helpers_test.go

@@ -118,6 +118,10 @@ func createMachine(ctx context.Context, t *testing.T, c client.Client, cluster *
 					UID:        talosconfig.GetUID(),
 				},
 			},
+			InfrastructureRef: corev1.ObjectReference{
+				Name: generateName(t, "infrastructure"),
+				Namespace: cluster.Namespace,
+			},
 		},
 	}
 

internal/integration/integration_test.go

@@ -456,6 +456,30 @@ func TestIntegration(t *testing.T) {
 
 		assert.Equal(t, machine.Name, provider.Machine().Network().Hostname())
 	})
+	t.Run("HostnameFromInfraName", func(t *testing.T) {
+		t.Parallel()
+
+		namespaceName := setupTest(ctx, t, c)
+		cluster := createCluster(ctx, t, c, namespaceName, &capiv1.ClusterSpec{
+			ControlPlaneEndpoint: capiv1.APIEndpoint{
+				Host: "example.com",
+				Port: 443,
+			},
+		})
+		talosConfig := createTalosConfig(ctx, t, c, namespaceName, bootstrapv1alpha3.TalosConfigSpec{
+			GenerateType: talosmachine.TypeControlPlane.String(),
+			TalosVersion: TalosVersion,
+			Hostname: bootstrapv1alpha3.HostnameSpec{
+				Source: bootstrapv1alpha3.HostnameSourceInfrastructureName,
+			},
+		})
+		machine := createMachine(ctx, t, c, cluster, talosConfig, true)
+		waitForReady(ctx, t, c, talosConfig)
+
+		provider := assertMachineConfiguration(ctx, t, c, talosConfig)
+
+		assert.Equal(t, machine.Spec.InfrastructureRef.Name, provider.Machine().Network().Hostname())
+	})
 	t.Run("TalosConfigValidate", func(t *testing.T) {
 		t.Parallel()