home

commit 04dcabda5bbceff2243972572d63269c85afd212
parent b236291b50dee9927d7d39883daf2986b9fb99e0
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri, 15 Apr 2022 12:27:56 +0200

k8s setup: fix hostname…

suffix with .home to no run into resolver problems

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
docs/kubernetes/microk8s.org
 | 
4
++--
M
ops/k8s/microk8s/ubnt1/preseed.cfg
 | 
2
+-
M
ops/k8s/microk8s/ubnt2/preseed.cfg
 | 
2
+-
M
secrets/db.192.168.1
 | 
3
+++
M
secrets/db.home
 | 
2
++
M
systems/hosts/k8sn1.nix
 | 
2
+-
M
systems/hosts/k8sn2.nix
 | 
2
+-
M
systems/hosts/k8sn3.nix
 | 
2
+-

8 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/docs/kubernetes/microk8s.org b/docs/kubernetes/microk8s.org
@@ -24,7 +24,7 @@
 # Any hostname and domain names assigned from dhcp take precedence over
 # values set here. However, setting the values still prevents the questions
 # from being shown, even if values come from dhcp.
-d-i netcfg/get_hostname string ubnt1
+d-i netcfg/get_hostname string ubnt1.home
 d-i netcfg/get_domain string home
 # Disable that annoying WEP key dialog.
 d-i netcfg/wireless_wep string
@@ -115,7 +115,7 @@
 # Any hostname and domain names assigned from dhcp take precedence over
 # values set here. However, setting the values still prevents the questions
 # from being shown, even if values come from dhcp.
-d-i netcfg/get_hostname string ubnt2
+d-i netcfg/get_hostname string ubnt2.home
 d-i netcfg/get_domain string home
 # Disable that annoying WEP key dialog.
 d-i netcfg/wireless_wep string
diff --git a/ops/k8s/microk8s/ubnt1/preseed.cfg b/ops/k8s/microk8s/ubnt1/preseed.cfg
@@ -13,7 +13,7 @@ d-i netcfg/choose_interface select auto
 # Any hostname and domain names assigned from dhcp take precedence over
 # values set here. However, setting the values still prevents the questions
 # from being shown, even if values come from dhcp.
-d-i netcfg/get_hostname string ubnt1
+d-i netcfg/get_hostname string ubnt1.home
 d-i netcfg/get_domain string home
 # Disable that annoying WEP key dialog.
 d-i netcfg/wireless_wep string
diff --git a/ops/k8s/microk8s/ubnt2/preseed.cfg b/ops/k8s/microk8s/ubnt2/preseed.cfg
@@ -13,7 +13,7 @@ d-i netcfg/choose_interface select auto
 # Any hostname and domain names assigned from dhcp take precedence over
 # values set here. However, setting the values still prevents the questions
 # from being shown, even if values come from dhcp.
-d-i netcfg/get_hostname string ubnt2
+d-i netcfg/get_hostname string ubnt2.home
 d-i netcfg/get_domain string home
 # Disable that annoying WEP key dialog.
 d-i netcfg/wireless_wep string
diff --git a/secrets/db.192.168.1 b/secrets/db.192.168.1
@@ -53,6 +53,9 @@ $TTL    604800
 129 IN PTR bootstrap.ocp.home.
 
 ;; k8s nodes
+130 IN PTR ubnt1.home.
+131 IN PTR ubnt2.home.
+132 IN PTR k8sn3.home.
 130 IN PTR k8sn1.home.
 131 IN PTR k8sn2.home.
 132 IN PTR k8sn3.home.
diff --git a/secrets/db.home b/secrets/db.home
@@ -67,6 +67,8 @@ _etcd-server-ssl._tcp.ocp.home. IN SRV 0 10 2380 etcd-1.ocp.home.
 _etcd-server-ssl._tcp.ocp.home. IN SRV 0 10 2380 etcd-2.ocp.home.
 
 ;; k8s nodes
+ubnt1.home. IN A 192.168.1.130
+ubnt2.home. IN A 192.168.1.131
 k8sn1.home. IN A 192.168.1.130
 k8sn2.home. IN A 192.168.1.131
 k8sn3.home. IN A 192.168.1.132 
\ No newline at end of file
diff --git a/systems/hosts/k8sn1.nix b/systems/hosts/k8sn1.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  hostname = "k8sn1";
+  hostname = "k8sn1.home";
   kubeMasterIP = "192.168.1.130";
 in
 {
diff --git a/systems/hosts/k8sn2.nix b/systems/hosts/k8sn2.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  hostname = "k8sn2";
+  hostname = "k8sn2.home";
   kubeMasterIP = "192.168.1.130";
 in
 {
diff --git a/systems/hosts/k8sn3.nix b/systems/hosts/k8sn3.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  hostname = "k8sn3";
+  hostname = "k8sn3.home";
   kubeMasterIP = "192.168.1.130";
 in
 {