feat(nodeadm): add network name resolution aspect (#2556)

This PR adds support for network name resolution config to the NodeConfig, allow users to override DNS nameservers and/or search domains.

---------

Co-authored-by: Nick Baker <nbakerd@amazon.com>

Author: fletcherw

nodeadm/api/v1alpha1/nodeconfig_types.go

@@ -92,6 +92,19 @@ type ContainerdOptions struct {
 type InstanceOptions struct {
 	LocalStorage LocalStorageOptions `json:"localStorage,omitempty"`
 	Environment  EnvironmentOptions  `json:"environment,omitempty"`
+	Network      NetworkOptions      `json:"network,omitempty"`
+}
+
+// NetworkOptions are parameters used to configure networking on the host OS.
+type NetworkOptions struct {
+	// Nameservers are servers for the instance's network name resolution. The
+	// list may include both IPv4 and IPv6 addresses.
+	// see: https://www.freedesktop.org/software/systemd/man/latest/resolved.conf.html#DNS=
+	Nameservers []string `json:"nameservers,omitempty"`
+
+	// Domains are search entries for the instance's network name resolution.
+	// see: https://www.freedesktop.org/software/systemd/man/latest/resolved.conf.html#Domains=
+	Domains []string `json:"domains,omitempty"`
 }
 
 // EnvironmentOptions configures environment variables for the system and systemd services.

nodeadm/api/v1alpha1/zz_generated.deepcopy.go

@@ -125,6 +125,7 @@ func (c *initCmd) Run(log *zap.Logger, opts *cli.GlobalOptions) error {
 		log.Info("Setting up system config aspects...")
 		configAspects := []system.SystemAspect{
 			system.NewInstanceEnvironmentAspect(),
+			system.NewResolveAspect(),
 		}
 		if err := c.setupAspects(log, nodeConfig, configAspects); err != nil {
 			return err

nodeadm/cmd/nodeadm/init/init.go

@@ -141,6 +141,26 @@ spec:
                         - Mount
                         type: string
                     type: object
+                  network:
+                    description: NetworkOptions are parameters used to configure networking
+                      on the host OS.
+                    properties:
+                      domains:
+                        description: |-
+                          Domains are search entries for the instance's network name resolution.
+                          see: https://www.freedesktop.org/software/systemd/man/latest/resolved.conf.html#Domains=
+                        items:
+                          type: string
+                        type: array
+                      nameservers:
+                        description: |-
+                          Nameservers are servers for the instance's network name resolution. The
+                          list may include both IPv4 and IPv6 addresses.
+                          see: https://www.freedesktop.org/software/systemd/man/latest/resolved.conf.html#DNS=
+                        items:
+                          type: string
+                        type: array
+                    type: object
                 type: object
               kubelet:
                 description: KubeletOptions are additional parameters passed to `kubelet`.

nodeadm/crds/node.eks.aws_nodeconfigs.yaml

@@ -86,6 +86,7 @@ _Appears in:_
 | --- | --- |
 | `localStorage` _[LocalStorageOptions](#localstorageoptions)_ |  |
 | `environment` _[EnvironmentOptions](#environmentoptions)_ |  |
+| `network` _[NetworkOptions](#networkoptions)_ |  |
 
 #### KubeletOptions
 
@@ -126,6 +127,18 @@ _Appears in:_
 .Validation:
 - Enum: [RAID0 RAID10 Mount]
 
+#### NetworkOptions
+
+NetworkOptions are parameters used to configure networking on the host OS.
+
+_Appears in:_
+- [InstanceOptions](#instanceoptions)
+
+| Field | Description |
+| --- | --- |
+| `nameservers` _string array_ | Nameservers are servers for the instance's network name resolution. The<br />list may include both IPv4 and IPv6 addresses.<br />see: https://www.freedesktop.org/software/systemd/man/latest/resolved.conf.html#DNS= |
+| `domains` _string array_ | Domains are search entries for the instance's network name resolution.<br />see: https://www.freedesktop.org/software/systemd/man/latest/resolved.conf.html#Domains= |
+
 #### NodeConfig
 
 NodeConfig is the primary configuration object for `nodeadm`.

nodeadm/doc/api.md

@@ -102,6 +102,12 @@ const (
 type InstanceOptions struct {
 	LocalStorage LocalStorageOptions `json:"localStorage,omitempty"`
 	Environment  EnvironmentOptions  `json:"environment,omitempty"`
+	Network      NetworkOptions      `json:"network,omitempty"`
+}
+
+type NetworkOptions struct {
+	Nameservers []string `json:"nameservers,omitempty"`
+	Domains     []string `json:"domains,omitempty"`
 }
 
 type EnvironmentOptions map[string]map[string]string

nodeadm/internal/api/bridge/zz_generated.conversion.go

@@ -17,10 +17,8 @@ import (
 )
 
 const (
-	instanceEnvironmentAspectName = "instance-environment"
-	nodeadmEnvironmentAspectName  = "nodeadm-environment"
-	systemdEnvironmentConfPath    = "/etc/systemd/system.conf.d/environment.conf"
-	serviceDropinPathBase         = "/etc/systemd/system"
+	systemdEnvironmentConfPath = "/etc/systemd/system.conf.d/environment.conf"
+	serviceDropinPathBase      = "/etc/systemd/system"
 )
 
 const systemdConfigTemplate = `[Manager]
@@ -48,7 +46,7 @@ type nodeadmEnvironmentAspect struct{}
 type instanceEnvironmentAspect struct{}
 
 func (a *nodeadmEnvironmentAspect) Name() string {
-	return nodeadmEnvironmentAspectName
+	return "nodeadm-environment"
 }
 
 func (a *nodeadmEnvironmentAspect) Setup(cfg *api.NodeConfig) error {
@@ -66,7 +64,7 @@ func (a *nodeadmEnvironmentAspect) Setup(cfg *api.NodeConfig) error {
 }
 
 func (a *instanceEnvironmentAspect) Name() string {
-	return instanceEnvironmentAspectName
+	return "instance-environment"
 }
 
 func (a *instanceEnvironmentAspect) Setup(cfg *api.NodeConfig) error {

nodeadm/internal/api/types.go

@@ -9,16 +9,14 @@ import (
 	"go.uber.org/zap"
 )
 
-const localDiskAspectName = "local-disk"
-
 func NewLocalDiskAspect() SystemAspect {
 	return &localDiskAspect{}
 }
 
 type localDiskAspect struct{}
 
 func (a *localDiskAspect) Name() string {
-	return localDiskAspectName
+	return "local-disk"
 }
 
 func (a *localDiskAspect) Setup(cfg *api.NodeConfig) error {