Use the same template for cloud-config

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
lima-vm · Sep 22, 2024 · 2b64f45 · 2b64f45
1 parent de9cce4
commit 2b64f45
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 70 deletions.
diff --git a/pkg/cidata/cidata.TEMPLATE.d/user-data b/pkg/cidata/cidata.TEMPLATE.d/user-data
@@ -39,6 +39,7 @@ users:
       - {{ printf "%q" $val }}
     {{- end }}
 
+{{- if .BootScripts }}
 write_files:
  - content: |
       #!/bin/sh
@@ -52,6 +53,7 @@ write_files:
    owner: root:root
    path: /var/lib/cloud/scripts/per-boot/00-lima.boot.sh
    permissions: '0755'
+{{- end }}
 
 {{- if .DNSAddresses }}
 # This has no effect on systems using systemd-resolved, but is used

diff --git a/pkg/cidata/cidata.go b/pkg/cidata/cidata.go
@@ -111,7 +111,7 @@ func setupEnv(y *limayaml.LimaYAML, args TemplateArgs) (map[string]string, error
 	return env, nil
 }
 
-func templateArgs(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort, tcpDNSLocalPort, vsockPort int, virtioPort string) (*TemplateArgs, error) {
+func templateArgs(bootScripts bool, instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort, tcpDNSLocalPort, vsockPort int, virtioPort string) (*TemplateArgs, error) {
 	if err := limayaml.Validate(y, false); err != nil {
 		return nil, err
 	}
@@ -124,6 +124,7 @@ func templateArgs(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort, t
 		return nil, err
 	}
 	args := TemplateArgs{
+		BootScripts:        bootScripts,
 		Name:               name,
 		User:               u.Username,
 		UID:                uid,
@@ -328,10 +329,14 @@ func templateArgs(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort, t
 }
 
 func GenerateCloudConfig(instDir, name string, y *limayaml.LimaYAML) error {
-	args, err := templateArgs(instDir, name, y, 0, 0, 0, "")
+	args, err := templateArgs(false, instDir, name, y, 0, 0, 0, "")
 	if err != nil {
 		return err
 	}
+	// mounts are not included here
+	args.Mounts = nil
+	// resolv_conf is not included here
+	args.DNSAddresses = nil
 
 	if err := ValidateTemplateArgs(args); err != nil {
 		return err
@@ -346,7 +351,7 @@ func GenerateCloudConfig(instDir, name string, y *limayaml.LimaYAML) error {
 }
 
 func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort, tcpDNSLocalPort int, nerdctlArchive string, vsockPort int, virtioPort string) error {
-	args, err := templateArgs(instDir, name, y, udpDNSLocalPort, tcpDNSLocalPort, vsockPort, virtioPort)
+	args, err := templateArgs(true, instDir, name, y, udpDNSLocalPort, tcpDNSLocalPort, vsockPort, virtioPort)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/cidata/cloud-config.yaml b/pkg/cidata/cloud-config.yaml
diff --git a/pkg/cidata/cloud-config.yaml b/pkg/cidata/cloud-config.yaml
@@ -0,0 +1 @@
+cidata.TEMPLATE.d/user-data
diff --git a/pkg/cidata/template.go b/pkg/cidata/template.go
@@ -19,9 +19,6 @@ var templateFS embed.FS
 
 const templateFSRoot = "cidata.TEMPLATE.d"
 
-//go:embed cloud-config.yaml
-var cloudConfigYaml string
-
 type CACerts struct {
 	RemoveDefaults *bool
 	Trusted        []Cert
@@ -77,6 +74,7 @@ type TemplateArgs struct {
 	TCPDNSLocalPort                 int
 	Env                             map[string]string
 	Param                           map[string]string
+	BootScripts                     bool
 	DNSAddresses                    []string
 	CACerts                         CACerts
 	HostHomeMountPoint              string
@@ -123,7 +121,13 @@ func ExecuteTemplateCloudConfig(args *TemplateArgs) ([]byte, error) {
 	if err := ValidateTemplateArgs(args); err != nil {
 		return nil, err
 	}
+
+	userData, err := templateFS.ReadFile(path.Join(templateFSRoot, "user-data"))
+	if err != nil {
+		return nil, err
 	}
+
+	cloudConfigYaml := string(userData)
 	return textutil.ExecuteTemplate(cloudConfigYaml, args)
 }