From da2b217fcae394c00950c31354119746b5ce8350 Mon Sep 17 00:00:00 2001 From: greysoh Date: Fri, 2 Aug 2024 15:53:11 -0400 Subject: [PATCH] fix: Fixes hostnames not being recognized correctly in K3s. --- serverinfra/base-scripts/role.agent.sh | 2 +- serverinfra/base-scripts/role.server-init.sh | 2 +- serverinfra/base-scripts/role.server.sh | 2 +- serverinfra/config/infrastructure.ini | 1 + serverinfra/k3s.yaml | 19 ------------------- serverinfra/merge.py | 7 ++++++- serverinfra/ubuntu-install.yml | 2 +- 7 files changed, 11 insertions(+), 24 deletions(-) delete mode 100644 serverinfra/k3s.yaml diff --git a/serverinfra/base-scripts/role.agent.sh b/serverinfra/base-scripts/role.agent.sh index 5d90403..9069e99 100755 --- a/serverinfra/base-scripts/role.agent.sh +++ b/serverinfra/base-scripts/role.agent.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash sudo apt update -sudo apt install -y avahi-daemon curl +sudo apt install -y curl ufw allow 6443/tcp ufw allow from 10.42.0.0/16 to any diff --git a/serverinfra/base-scripts/role.server-init.sh b/serverinfra/base-scripts/role.server-init.sh index 0a5c6e5..ea1eda4 100755 --- a/serverinfra/base-scripts/role.server-init.sh +++ b/serverinfra/base-scripts/role.server-init.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash sudo apt update -sudo apt install -y avahi-daemon curl +sudo apt install -y curl ufw allow 6443/tcp ufw allow from 10.42.0.0/16 to any diff --git a/serverinfra/base-scripts/role.server.sh b/serverinfra/base-scripts/role.server.sh index 05b735c..ce8a600 100755 --- a/serverinfra/base-scripts/role.server.sh +++ b/serverinfra/base-scripts/role.server.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash sudo apt update -sudo apt install -y avahi-daemon curl +sudo apt install -y curl ufw allow 6443/tcp ufw allow from 10.42.0.0/16 to any diff --git a/serverinfra/config/infrastructure.ini b/serverinfra/config/infrastructure.ini index 4268c16..37f0c96 100644 --- a/serverinfra/config/infrastructure.ini +++ b/serverinfra/config/infrastructure.ini @@ -1,4 +1,5 @@ [kitteh-node-1/server] +alt_hostname_definition = 192.168.2.2 hostname = kitteh-node-1-k3s-server role = server-init diff --git a/serverinfra/k3s.yaml b/serverinfra/k3s.yaml deleted file mode 100644 index 10858b3..0000000 --- a/serverinfra/k3s.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -clusters: -- cluster: - certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkakNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUzTWpJMk1USXpOelV3SGhjTk1qUXdPREF5TVRVeU5qRTFXaGNOTXpRd056TXhNVFV5TmpFMQpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUzTWpJMk1USXpOelV3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFTcGhGejc1VUVxdHFlb3RKSUhWN0U4TkRuMVJXTHlrUXQ5UHdKTkdNT2kKS2h3WHRkbkM3aHRpRHFXcDJneEI5OStJSHlvdlc4VlJDcFkxdnpPcEtKdERvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVXdlNzhWbk5hRkpVeENVQlZKa0xOCkhRLzd3Tm93Q2dZSUtvWkl6ajBFQXdJRFJ3QXdSQUlnWndmbjBYSWFoQ3VIa1JuVTMwMmVkd3ZxU1BiL2ZKR24KM0t4QXdVb0p4cG9DSUExZlRjMU1VbkFHdHVxd0RDR3FGdndndmVqOXNBUnJZekVtcitZelRzelMKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= - server: https://127.0.0.1:6443 - name: default -contexts: -- context: - cluster: default - user: default - name: default -current-context: default -kind: Config -preferences: {} -users: -- name: default - user: - client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJQlpxNlZMVm91R0l3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOekl5TmpFeU16YzFNQjRYRFRJME1EZ3dNakUxTWpZeE5Wb1hEVEkxTURndwpNakUxTWpZeE5Wb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJFS25jd2Jmc3NYdGxXVFMKb05LYTcyOHpFSDRZTkVoVUIzU0hRNXhzb2lMYzdEVmVpRjNpd0hER1FxNlpuWnFyRXI4U1c3Q1ZzZ2N1di83TwpLSUcrRWVhalNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCUTMrRmM5TVFXTnA5TXN2czNIUDdoa1phVXJLVEFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlBWGtiYVVLQnBNdkM2S1ZTVDJsYlFjcTJ2WmRSMU44SWIyL05SMWZHdUFRZ0loQUtsNkczci9pbDU1dW00UQphcjEvNThWd0Nac3lVUDBBVlZZZFlBSjhxbmRxCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTWpJMk1USXpOelV3SGhjTk1qUXdPREF5TVRVeU5qRTFXaGNOTXpRd056TXhNVFV5TmpFMQpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTWpJMk1USXpOelV3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFUOE45RFRodkZmazl2QU83WlMxWW1MVVUxYWhGVzJHcTUwZFZIOXlFNHcKc3hrbGZxemdmWXprc2dES2dmZVlLOFZIak5jaHA2VTh6cERFNm9wczRNaTdvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVU4vaFhQVEVGamFmVExMN054eis0ClpHV2xLeWt3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUlnUWQ1bVI3QzFZazdpaUpIYS9vUlQ4Q0R4MGpQZ2NITEkKaVBCZU9GL1RKTDBDSVFDdW5ic1B5dS9KWUNJQlhVMy9mdXhRcjg5MDJoeXBUT0NocDJvVENqU291Zz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K - client-key-data: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUxIcnA5Rmh2a2ZJM2VJQTJiOVIxbTk4THh0RTBhaXRRcSt4REVVODhWRWJvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFUXFkekJ0K3l4ZTJWWk5LZzBwcnZiek1RZmhnMFNGUUhkSWREbkd5aUl0enNOVjZJWGVMQQpjTVpDcnBtZG1xc1N2eEpic0pXeUJ5Ni8vczRvZ2I0UjVnPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo= diff --git a/serverinfra/merge.py b/serverinfra/merge.py index 61192fa..516de53 100755 --- a/serverinfra/merge.py +++ b/serverinfra/merge.py @@ -61,8 +61,13 @@ if "upstream" in infra_server: print(f"ERROR: Missing hostname in upstream '{upstream_name}'") exit(1) + upstream_hostname = upstream_server["hostname"] + + if "alt_hostname_definition" in upstream_server: + upstream_hostname = upstream_server["alt_hostname_definition"] + custom_shell_script += f"export UPSTREAM_NAME=\"{upstream_name}\"\n" - custom_shell_script += f"export UPSTREAM_HOSTNAME=\"{upstream_server["hostname"]}\"\n" + custom_shell_script += f"export UPSTREAM_HOSTNAME=\"{upstream_hostname}\"\n" custom_shell_script += "\n" diff --git a/serverinfra/ubuntu-install.yml b/serverinfra/ubuntu-install.yml index 62aa257..cfa74fd 100644 --- a/serverinfra/ubuntu-install.yml +++ b/serverinfra/ubuntu-install.yml @@ -44,7 +44,7 @@ autoinstall: oem: install: auto source: - id: ubuntu-server-minimal + id: ubuntu-server search_drivers: false identity: realname: Cluster Administrator