Skip to content

Commit 8be18c8

Browse files
committed
use file content inline: !binary notation for base64 encoded content
based on discussion at coreos/container-linux-config-transpiler#158 (comment) ignition should support content translated from: inline: !binary | ${base64encoded}
1 parent d941c02 commit 8be18c8

File tree

6 files changed

+174
-209
lines changed

6 files changed

+174
-209
lines changed

master_templates-v1.10.0/master.yml

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -148,116 +148,101 @@ storage:
148148
- path: /etc/default/kube-apiserver
149149
filesystem: "root"
150150
contents:
151-
base64: true
152-
inline: |
151+
inline: !binary |
153152
${ kube_apiserver }
154153
155154
- path: /etc/default/kube-controller-manager
156155
filesystem: "root"
157156
contents:
158-
base64: true
159-
inline: |
157+
inline: !binary |
160158
${ kube_controller_manager }
161159
162160
- path: /etc/default/kube-scheduler
163161
filesystem: "root"
164162
contents:
165-
base64: true
166-
inline: |
163+
inline: !binary |
167164
${ kube_scheduler }
168165
169166
- path: /var/lib/kube-controller-manager/kubeconfig
170167
filesystem: "root"
171168
contents:
172-
base64: true
173-
inline: |
169+
inline: !binary |
174170
${ kube_controller_manager_kubeconfig }
175171
176172
- path: /var/lib/kube-scheduler/kubeconfig
177173
filesystem: "root"
178174
contents:
179-
base64: true
180-
inline: |
175+
inline: !binary |
181176
${ kube_scheduler_kubeconfig }
182177
183178
- path: /etc/srv/kubernetes/pki/ca-certificates.crt
184179
filesystem: "root"
185180
mode: 0644
186181
contents:
187-
base64: true
188-
inline: |
182+
inline: !binary |
189183
${ ca }
190184
191185
- path: /etc/srv/kubernetes/pki/ca-certificates.key
192186
filesystem: "root"
193187
mode: 0644
194188
contents:
195-
base64: true
196-
inline: |
189+
inline: !binary |
197190
${ ca_key }
198191
199192
- path: /etc/srv/kubernetes/pki/apiserver.crt
200193
filesystem: "root"
201194
mode: 0644
202195
contents:
203-
base64: true
204-
inline: |
196+
inline: !binary |
205197
${ apiserver }
206198
207199
- path: /etc/srv/kubernetes/pki/apiserver.key
208200
filesystem: "root"
209201
mode: 0644
210202
contents:
211-
base64: true
212-
inline: |
203+
inline: !binary |
213204
${ apiserver_key }
214205
215206
- path: /etc/srv/kubernetes/pki/controller.crt
216207
filesystem: "root"
217208
mode: 0644
218209
contents:
219-
base64: true
220-
inline: |
210+
inline: !binary |
221211
${ controller }
222212
223213
- path: /etc/srv/kubernetes/pki/controller.key
224214
filesystem: "root"
225215
mode: 0644
226216
contents:
227-
base64: true
228-
inline: |
217+
inline: !binary |
229218
${ controller_key }
230219
231220
- path: /etc/srv/kubernetes/pki/scheduler.crt
232221
filesystem: "root"
233222
mode: 0644
234223
contents:
235-
base64: true
236-
inline: |
224+
inline: !binary |
237225
${ scheduler }
238226
239227
- path: /etc/srv/kubernetes/pki/scheduler.key
240228
filesystem: "root"
241229
mode: 0644
242230
contents:
243-
base64: true
244-
inline: |
231+
inline: !binary |
245232
${ scheduler_key }
246233
247234
- path: /etc/srv/kubernetes/known_tokens.csv
248235
filesystem: "root"
249236
mode: 0644
250237
contents:
251-
base64: true
252-
inline: |
238+
inline: !binary |
253239
${ known_tokens_csv }
254240
255241
- path: /etc/srv/kubernetes/cloud-config
256242
filesystem: "root"
257243
mode: 0644
258244
contents:
259-
base64: true
260-
inline: |
245+
inline: !binary |
261246
${ cloud_config_file }
262247
263248
- path: /etc/systemd/resolved.conf.d/dns.conf
@@ -266,8 +251,7 @@ storage:
266251
user:
267252
name: "root"
268253
contents:
269-
base64: true
270-
inline: |
254+
inline: !binary |
271255
${ dns_conf }
272256
273257
- path: /etc/dhcp/dhclient.conf
@@ -276,8 +260,7 @@ storage:
276260
user:
277261
name: "root"
278262
contents:
279-
base64: true
280-
inline: |
263+
inline: !binary |
281264
${ dns_dhcp }
282265
283266

master_templates-v1.10.0/output.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
output "master_cloud_init" { value = "${ join("`", data.template_file.master.*.rendered) }" }
2+
output "debug_kube_apiserver" {value = "${ base64encode(var.dns_conf) }"}

0 commit comments

Comments
 (0)