From 1cddf1288651fc5ebaaa30b876f403af5f680ade Mon Sep 17 00:00:00 2001 From: Marco Nenciarini Date: Fri, 4 Mar 2022 13:53:45 +0100 Subject: [PATCH 1/2] Return to default kured reboot method --- .gitignore | 1 - kustomize/kured.yaml | 1 - modules/host/templates/userdata.yaml.tpl | 6 ++++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 458f192..16bc502 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,3 @@ kubeconfig.yaml-e terraform.tfvars plans.yaml traefik_config.yaml -kured.yaml diff --git a/kustomize/kured.yaml b/kustomize/kured.yaml index b4abdea..bf72a0c 100644 --- a/kustomize/kured.yaml +++ b/kustomize/kured.yaml @@ -18,4 +18,3 @@ spec: command: - /usr/bin/kured - --reboot-command=/usr/bin/systemctl reboot - - --reboot-sentinel=/var/run/reboot-needed diff --git a/modules/host/templates/userdata.yaml.tpl b/modules/host/templates/userdata.yaml.tpl index 6720ca5..4b20b5a 100644 --- a/modules/host/templates/userdata.yaml.tpl +++ b/modules/host/templates/userdata.yaml.tpl @@ -18,6 +18,12 @@ write_files: AuthorizedKeysFile .ssh/authorized_keys path: /etc/ssh/sshd_config.d/kube-hetzner.conf +# Setting the right reboot mode +- content: | + REBOOT_METHOD=kured + path: /etc/transactional-update.conf + append: true + # Add ssh authorized keys ssh_authorized_keys: %{ for key in sshAuthorizedKeys ~} From 32d43b50f40b30cba207fb5946dee422825d93ef Mon Sep 17 00:00:00 2001 From: Marco Nenciarini Date: Fri, 4 Mar 2022 15:11:07 +0100 Subject: [PATCH 2/2] Use Cloudflare DNS --- modules/host/templates/userdata.yaml.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/host/templates/userdata.yaml.tpl b/modules/host/templates/userdata.yaml.tpl index 4b20b5a..a4b06ea 100644 --- a/modules/host/templates/userdata.yaml.tpl +++ b/modules/host/templates/userdata.yaml.tpl @@ -47,7 +47,7 @@ runcmd: - [ sed, -i, 's#DHCLIENT_SET_HOSTNAME="yes"#DHCLIENT_SET_HOSTNAME="no"#g', /etc/sysconfig/network/dhcp] # We set Google DNS servers -- [ sed, -i, 's#NETCONFIG_DNS_STATIC_SERVERS=""#NETCONFIG_DNS_STATIC_SERVERS="8.8.8.8 8.8.4.4"#g', /etc/sysconfig/network/config] +- [ sed, -i, 's#NETCONFIG_DNS_STATIC_SERVERS=""#NETCONFIG_DNS_STATIC_SERVERS="1.1.1.1 1.0.0.1"#g', /etc/sysconfig/network/config] # Bound the amount of logs that can survive on the system - [ sed, -i, 's/#SystemMaxUse=/SystemMaxUse=3G/g', /etc/systemd/journald.conf]