Isolated clusters

pkg/generator/ignition/generator.go

@@ -3,6 +3,7 @@ package ignition
 import (
 	"encoding/json"
 	"fmt"
+	"strings"
 	"text/template"
 
 	gardenv1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
@@ -25,7 +26,7 @@ const (
 ExecStart=
 ExecStart=/usr/bin/containerd --config=/etc/containerd/config.toml
 `
-	containerdConfig = `
+	containerdBaselineConfig = `
 # created by os-extension-metal
 [plugins.cri.registry.mirrors]
   [plugins.cri.registry.mirrors."docker.io"]
@@ -72,6 +73,15 @@ func (t *IgnitionGenerator) Generate(logr logr.Logger, config *generator.Operati
 // Therefore we must update ignition to 2.0.0 in the images and transform the gardener config to the ignition config types instead.
 func ignitionFromOperatingSystemConfig(config *generator.OperatingSystemConfig) ([]byte, error) {
 	cfg := types.Config{}
+
+	networkIsolation := &metalextensionv1alpha1.NetworkIsolation{}
+	if config.Object != nil && config.Object.Spec.ProviderConfig != nil {
+		err := decodeProviderConfig(config.Object.Spec.ProviderConfig, networkIsolation)
+		if err != nil {
+			return nil, fmt.Errorf("unable to decode providerConfig")
+		}
+	}
+
 	cfg.Systemd = types.Systemd{}
 	for _, u := range config.Units {
 		contents := string(u.Content)
@@ -109,6 +119,12 @@ func ignitionFromOperatingSystemConfig(config *generator.OperatingSystemConfig)
 		cfg.Storage.Files = append(cfg.Storage.Files, ignitionFile)
 	}
 
+	dnsFiles := additionalDNSConfFiles(networkIsolation.DNSServers)
+	cfg.Storage.Files = append(cfg.Storage.Files, dnsFiles...)
+
+	ntpFiles := additionalNTPConfFiles(networkIsolation.NTPServers)
+	cfg.Storage.Files = append(cfg.Storage.Files, ntpFiles...)
+
 	if config.CRI != nil {
 		cri := config.CRI
 		if cri.Name == extensionsv1alpha1.CRINameContainerD {
@@ -123,30 +139,10 @@ func ignitionFromOperatingSystemConfig(config *generator.OperatingSystemConfig)
 				},
 			}
 			cfg.Systemd.Units = append(cfg.Systemd.Units, containerdSystemdService)
-
-			containerdConfigFile := types.File{
-				Path:       "/etc/containerd/config.toml",
-				Filesystem: "root",
-				Mode:       &types.DefaultFileMode,
-				Contents: types.FileContents{
-					Inline: containerdConfig,
-				},
-			}
-			cfg.Storage.Files = append(cfg.Storage.Files, containerdConfigFile)
+			cfg.Storage.Files = append(cfg.Storage.Files, additionalContainterdConfigFile(networkIsolation.RegistryMirrors))
 		}
 	}
 
-	if config.Object != nil && config.Object.Spec.ProviderConfig != nil {
-		networkIsolation := &metalextensionv1alpha1.NetworkIsolation{}
-		// This does not work because NetworkIsolation is not a RuntimeObject because it is missing ObjectMeta and TypeMeta
-		err := decodeProviderConfig(config.Object.Spec.ProviderConfig, networkIsolation)
-		if err != nil {
-			return nil, fmt.Errorf("unable to decode providerConfig")
-		}
-
-		fmt.Printf("networkIsolation:%#v", networkIsolation)
-	}
-
 	outCfg, report := types.Convert(cfg, "", nil)
 	if report.IsFatal() {
 		return nil, fmt.Errorf("could not transpile ignition config: %s", report.String())
@@ -181,3 +177,89 @@ func getGardenerDecoder() runtime.Decoder {
 	}
 	return decoder
 }
+
+func additionalContainterdConfigFile(mirrors []metalextensionv1alpha1.RegistryMirror) types.File {
+	containerdConfig := types.File{
+		Path:       "/etc/containerd/config.toml",
+		Filesystem: "root",
+		Mode:       &types.DefaultFileMode,
+		Contents: types.FileContents{
+			Inline: containerdBaselineConfig,
+		},
+	}
+	if len(mirrors) == 0 {
+		return containerdConfig
+	}
+
+	renderedContent := `# Generated by os-extension-metal
+imports = ["/etc/containerd/conf.d/*.toml"]
+version = 2
+
+[plugins."io.containerd.grpc.v1.cri".registry]
+  [plugins."io.containerd.grpc.v1.cri".registry.mirrors]
+`
+	for _, m := range mirrors {
+		for _, of := range m.MirrorOf {
+			renderedContent += fmt.Sprintf(`    [plugins."io.containerd.grpc.v1.cri".registry.mirrors.%q]
+      endpoint = [%q]
+`, of, m.Hostname)
+		}
+	}
+
+	containerdConfig.Contents.Inline = renderedContent
+	return containerdConfig
+}
+
+func additionalDNSConfFiles(dnsServers []string) []types.File {
+	if len(dnsServers) == 0 {
+		return nil
+	}
+	resolveDNS := strings.Join(dnsServers, " ")
+	systemdResolvedConfd := fmt.Sprintf(`# Generated by os-extension-metal
+
+[Resolve]
+DNS=%s
+Domain=~.
+
+`, resolveDNS)
+	resolvConf := "# Generated by gardener-extension-provider-metal\n"
+	for _, ip := range dnsServers {
+		resolvConf += fmt.Sprintf("nameserver %s\n", ip)
+	}
+
+	return []types.File{
+		{
+			Path: "/etc/systemd/resolved.conf.d/dns.conf",
+			Contents: types.FileContents{
+				Inline: systemdResolvedConfd,
+			},
+		},
+		{
+			Path: "/etc/resolv.conf",
+			Contents: types.FileContents{
+				Inline: resolvConf,
+			},
+		},
+	}
+}
+
+func additionalNTPConfFiles(ntpServers []string) []types.File {
+	if len(ntpServers) == 0 {
+		return nil
+	}
+	ntps := strings.Join(ntpServers, " ")
+	renderedContent := fmt.Sprintf(`# Generated by os-extension-metal
+
+[Time]
+NTP=%s
+`, ntps)
+
+	return []types.File{
+		{
+			Path: "/etc/systemd/timesyncd.conf",
+			Contents: types.FileContents{
+				Inline: renderedContent,
+			},
+		},
+	}
+}

pkg/generator/ignition/generator_test.go

@@ -100,7 +100,7 @@ func TestIgnitionFromOperatingSystemConfig(t *testing.T) {
 							Filesystem: "root",
 							Path:       "/etc/containerd/config.toml",
 							Contents: types.FileContents{
-								Inline: containerdConfig,
+								Inline: containerdBaselineConfig,
 							},
 							Mode: pointer.Int(0644),
 						},