Skip to content

Commit 830e386

Browse files
authored
fix(cloudinit): wrap gateway6 in quotation marks (#79)
1 parent 0ea3ac1 commit 830e386

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

pkg/cloudinit/network.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const (
3838
- {{ $element.IPAddress }}
3939
{{- end }}
4040
{{- if and $element.IPV6Address (not $element.DHCP6)}}
41-
- {{ $element.IPV6Address }}
41+
- '{{ $element.IPV6Address }}'
4242
{{- end }}
4343
routes:
4444
{{- if and $element.Gateway (not $element.DHCP4) }}
@@ -47,14 +47,14 @@ const (
4747
{{- end }}
4848
{{- if and $element.Gateway6 (not $element.DHCP6) }}
4949
- to: '::/0'
50-
via: {{ $element.Gateway6 }}
50+
via: '{{ $element.Gateway6 }}'
5151
{{- end }}
5252
{{- end }}
5353
{{- if $element.DNSServers }}
5454
nameservers:
5555
addresses:
5656
{{- range $element.DNSServers }}
57-
- {{ . }}
57+
- '{{ . }}'
5858
{{- end -}}
5959
{{- end -}}
6060
{{- end -}}`

pkg/cloudinit/network_test.go

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ const (
4040
via: 10.10.10.1
4141
nameservers:
4242
addresses:
43-
- 8.8.8.8
44-
- 8.8.4.4`
43+
- '8.8.8.8'
44+
- '8.8.4.4'`
4545

4646
expectedValidNetworkConfigWithoutDNS = `network:
4747
version: 2
@@ -74,8 +74,8 @@ const (
7474
via: 10.10.10.1
7575
nameservers:
7676
addresses:
77-
- 8.8.8.8
78-
- 8.8.4.4
77+
- '8.8.8.8'
78+
- '8.8.4.4'
7979
eth1:
8080
match:
8181
macaddress: b4:87:18:bf:a3:60
@@ -88,8 +88,8 @@ const (
8888
via: 196.168.100.254
8989
nameservers:
9090
addresses:
91-
- 8.8.8.8
92-
- 8.8.4.4`
91+
- '8.8.8.8'
92+
- '8.8.4.4'`
9393

9494
expectedValidNetworkConfigDualStack = `network:
9595
version: 2
@@ -102,16 +102,16 @@ const (
102102
dhcp6: false
103103
addresses:
104104
- 10.10.10.12/24
105-
- 2001:db8::1/64
105+
- '2001:db8::1/64'
106106
routes:
107107
- to: 0.0.0.0/0
108108
via: 10.10.10.1
109109
- to: '::/0'
110-
via: 2001:db8::1
110+
via: '2001:db8::1'
111111
nameservers:
112112
addresses:
113-
- 8.8.8.8
114-
- 8.8.4.4`
113+
- '8.8.8.8'
114+
- '8.8.4.4'`
115115

116116
expectedValidNetworkConfigIPV6 = `network:
117117
version: 2
@@ -123,14 +123,14 @@ const (
123123
dhcp4: false
124124
dhcp6: false
125125
addresses:
126-
- 2001:db8::1/64
126+
- '2001:db8::1/64'
127127
routes:
128128
- to: '::/0'
129-
via: 2001:db8::1
129+
via: '2001:db8::1'
130130
nameservers:
131131
addresses:
132-
- 8.8.8.8
133-
- 8.8.4.4`
132+
- '8.8.8.8'
133+
- '8.8.4.4'`
134134

135135
expectedValidNetworkConfigDHCP = `network:
136136
version: 2
@@ -143,8 +143,8 @@ const (
143143
dhcp6: true
144144
nameservers:
145145
addresses:
146-
- 8.8.8.8
147-
- 8.8.4.4`
146+
- '8.8.8.8'
147+
- '8.8.4.4'`
148148

149149
expectedValidNetworkConfigDHCP4 = `network:
150150
version: 2
@@ -157,8 +157,8 @@ const (
157157
dhcp6: false
158158
nameservers:
159159
addresses:
160-
- 8.8.8.8
161-
- 8.8.4.4`
160+
- '8.8.8.8'
161+
- '8.8.4.4'`
162162

163163
expectedValidNetworkConfigDHCP6 = `network:
164164
version: 2
@@ -171,8 +171,8 @@ const (
171171
dhcp6: true
172172
nameservers:
173173
addresses:
174-
- 8.8.8.8
175-
- 8.8.4.4`
174+
- '8.8.8.8'
175+
- '8.8.4.4'`
176176

177177
expectedValidNetworkConfigWithDHCP = `network:
178178
version: 2
@@ -190,8 +190,8 @@ const (
190190
via: 10.10.10.1
191191
nameservers:
192192
addresses:
193-
- 8.8.8.8
194-
- 8.8.4.4`
193+
- '8.8.8.8'
194+
- '8.8.4.4'`
195195
)
196196

197197
func TestNetworkConfig_Render(t *testing.T) {

0 commit comments

Comments
 (0)