Remove empty ca_certs from cloud-config.yaml

Since it is a pointer, it is always true (non-nil). And structs are always true, so they can't be tested. Signed-off-by: Anders F Björklund <[email protected]>
lima-vm · Jun 29, 2024 · 8ee410c · 8ee410c
1 parent 353d4fb
commit 8ee410c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/pkg/cidata/cloud-config.yaml b/pkg/cidata/cloud-config.yaml
@@ -37,6 +37,7 @@ users:
 # resolv_conf is not included here
 {{- end }}
 
+{{- if .CACerts.RemoveDefaults }}
 {{ with .CACerts }}
 ca_certs:
   remove_defaults: {{ .RemoveDefaults }}
@@ -50,6 +51,7 @@ ca_certs:
   {{- end }}
   {{- end }}
 {{- end }}
+{{- end }}
 
 {{- if .BootCmds }}
 bootcmd:

diff --git a/pkg/cidata/template.go b/pkg/cidata/template.go
@@ -125,6 +125,13 @@ func ExecuteTemplateCloudConfig(args *TemplateArgs) ([]byte, error) {
 	if err := ValidateTemplateArgs(args); err != nil {
 		return nil, err
 	}
+	// Remove empty CACerts struct from cloud-config output
+	if !*args.CACerts.RemoveDefaults && len(args.CACerts.Trusted) == 0 {
+		temp := *args
+		temp.CACerts.RemoveDefaults = nil
+		temp.CACerts.Trusted = nil
+		args = &temp
+	}
 	return textutil.ExecuteTemplate(cloudConfigYaml, args)
 }