modules: unify ignition across platforms#1743
Conversation
|
ok to test |
|
ok to test |
98d62fd to
d785d36
Compare
modules/ignition/assets.tf
Outdated
|
|
||
| data "ignition_file" "max_user_watches" { | ||
| filesystem = "root" | ||
| path = "/etc/sysctl.d/max-user-watches.conf" |
There was a problem hiding this comment.
Suggestion while at it: use a nn-foo.conf name scheme.
|
@s-urbaniak Tests run properly again. |
|
@mxinden thanks a lot! |
|
ok to test |
2 similar comments
|
ok to test |
|
ok to test |
6decf17 to
441209f
Compare
platforms/aws/main.tf
Outdated
| kubeconfig_s3_location = "${aws_s3_bucket_object.kubeconfig.bucket}/${aws_s3_bucket_object.kubeconfig.key}" | ||
|
|
||
| kubelet_exec_start_pre = <<EOF | ||
| ExecStartPre=/usr/bin/bash -c "/opt/s3-puller.sh ${aws_s3_bucket_object.kubeconfig.bucket}/${aws_s3_bucket_object.kubeconfig.key} /etc/kubernetes/kubeconfig" |
There was a problem hiding this comment.
Nit (maybe for later): I think this bash -c is useless here and just a leftover from a similar line in another service which is doing a redirection.
There was a problem hiding this comment.
that is indeed a valid point, I factored bash -c out in this PR.
c23d0fe to
55ea75f
Compare
|
ok to test |
d4ddfd9 to
2c5aca3
Compare
Fixes partially INST-132
... it is not needed there, only masters are being used for bootstrapping.
This adds the same docker options dropin as all the other platforms. Fixes INST-38
|
PTAL @alexsomesan |
platforms/vmware/main.tf
Outdated
| private_key = "${var.tectonic_vmware_ssh_private_key_path}" | ||
| image_re = "${var.tectonic_image_re}" | ||
|
|
||
| ign_docker_dropin_id = "${module.ignition_masters.docker_dropin_id}" |
There was a problem hiding this comment.
s/ignition_masters/ignition_workers/ (here and lines below)
There was a problem hiding this comment.
good catch, fixed
|
ok to test |
alexsomesan
left a comment
There was a problem hiding this comment.
Looks good!
Glad to see this taking shape.
lucab
left a comment
There was a problem hiding this comment.
(Casual bystander) LGTM. Checked on my bare-metal playground.
|
@lucab your bystanding is highly appreciated :-D |
|
ok to test |
1 similar comment
|
ok to test |
|
ok to test |
|
all green now @s-urbaniak |
|
@cpanato thanks and kudos for helping with improving CI! |
* modules/ignition: unify max-user-watches Fixes partially INST-132 * modules/ignition: unify docker dropin Fixes partially INST-132 * modules/ignition: unify kubelet * modules/ignition: unify locksmithd service * modules/ignition: unify kubelet.env * modules/ignition: unify tx-off service * modules/ignition: unify 66-azure-storage-rules * moduls/azure: disable stale tectonic service on workers ... it is not needed there, only masters are being used for bootstrapping. * modules/azure: remove stale azure_udev_rules definition * platforms/metal: unify dockeropts with other platforms This adds the same docker options dropin as all the other platforms. Fixes INST-38 * platforms/*: s/ignition_masters/ignition_workers * modules/ignition: apply nn-foo.conf scheme for max-user-watches.conf Fixes coreos#1743 (comment) * modules/vmware: remove stale kubelet-env declaration
Fixes partially INST-132