Skip to content

Commit 0ec3173

Browse files
committed
Always remove empty ca_certs struct
Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
1 parent 6c18ed8 commit 0ec3173

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

pkg/cidata/cidata.TEMPLATE.d/user-data

+2
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ resolv_conf:
6666
{{- end }}
6767
{{- end }}
6868

69+
{{- if .CACerts.RemoveDefaults }}
6970
{{ with .CACerts }}
7071
ca_certs:
7172
remove_defaults: {{ .RemoveDefaults }}
@@ -76,6 +77,7 @@ ca_certs:
7677
{{- range $line := $cert.Lines }}
7778
{{ $line }}
7879
{{- end }}
80+
{{- end }}
7981
{{- end }}
8082
{{- end }}
8183
{{- end }}

pkg/cidata/cidata.go

+5
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,11 @@ func templateArgs(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort, t
310310
args.CACerts.Trusted = append(args.CACerts.Trusted, cert)
311311
}
312312

313+
if !*args.CACerts.RemoveDefaults && len(args.CACerts.Trusted) == 0 {
314+
args.CACerts.RemoveDefaults = nil
315+
args.CACerts.Trusted = nil
316+
}
317+
313318
args.BootCmds = getBootCmds(y.Provision)
314319

315320
for _, f := range y.Provision {

pkg/cidata/template.go

-9
Original file line numberDiff line numberDiff line change
@@ -115,22 +115,13 @@ func ValidateTemplateArgs(args *TemplateArgs) error {
115115
return fmt.Errorf("field mounts[%d] must be absolute, got %q", i, f)
116116
}
117117
}
118-
if args.CACerts.RemoveDefaults == nil {
119-
return errors.New("field CACerts.RemoveDefaults must be set")
120-
}
121118
return nil
122119
}
123120

124121
func ExecuteTemplateCloudConfig(args *TemplateArgs) ([]byte, error) {
125122
if err := ValidateTemplateArgs(args); err != nil {
126123
return nil, err
127124
}
128-
// Remove empty CACerts struct from cloud-config output
129-
if !*args.CACerts.RemoveDefaults && len(args.CACerts.Trusted) == 0 {
130-
temp := *args
131-
temp.CACerts.RemoveDefaults = nil
132-
temp.CACerts.Trusted = nil
133-
args = &temp
134125
}
135126
return textutil.ExecuteTemplate(cloudConfigYaml, args)
136127
}

0 commit comments

Comments
 (0)