Mercurial > code > home > repos > infra
changeset 220:416aa647efd9
registry hostname, add garage pi back to k8s
| author | drewp@bigasterisk.com |
|---|---|
| date | Thu, 24 Aug 2023 12:43:14 -0700 |
| parents | 4eff573ecf46 |
| children | 6b71321a7326 |
| files | files/docker_daemon.json kube.py templates/dnsmasq/hosts.j2 |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/files/docker_daemon.json Thu Aug 24 12:42:02 2023 -0700 +++ b/files/docker_daemon.json Thu Aug 24 12:43:14 2023 -0700 @@ -1,1 +1,1 @@ -{ "experimental":true, "insecure-registries":["bang5:5000"] } +{ "experimental":true, "insecure-registries":["bang5:5000", "reg:5000"] }
--- a/kube.py Thu Aug 24 12:42:02 2023 -0700 +++ b/kube.py Thu Aug 24 12:43:14 2023 -0700 @@ -32,7 +32,7 @@ mode='755', cache_time=1000) # one time; writes to $HOME - #skaffold config set --global insecure-registries bang5:5000 + server.shell("skaffold config set --global insecure-registries reg:5000") def pi_cgroup_setup(): @@ -100,7 +100,7 @@ k3s_version = 'v1.24.3+k3s1', ): if not is_pi: - podman_insecure_registry(reg='bang5:5000') + podman_insecure_registry(reg='reg:5000') if host.name in nodes + [server_node]: host_prep() @@ -108,7 +108,7 @@ # docs: https://rancher.com/docs/k3s/latest/en/installation/private-registry/ # user confusions: https://github.com/rancher/k3s/issues/1802 - files.template(src='templates/kube/registries.yaml.j2', dest='/etc/rancher/k3s/registries.yaml', reg='bang5:5000') + files.template(src='templates/kube/registries.yaml.j2', dest='/etc/rancher/k3s/registries.yaml', reg='reg:5000') # also note that podman dropped the default `docker.io/` prefix on image names (see https://unix.stackexchange.com/a/701785/419418) config_and_run_service(k3s_version, server_node, server_ip) @@ -128,5 +128,5 @@ server.shell(f"kubectl config set-cluster default --server=https://{server_ip}:6443 --kubeconfig=/etc/rancher/k3s/k3s.yaml") -make_cluster( server_ip = "10.5.0.1", server_node = 'bang', nodes = ['slash', 'dash', 'ditto'], admin_from = ['bang', 'slash', 'dash', 'ditto'], k3s_version = 'v1.24.3+k3s1') +make_cluster( server_ip = "10.5.0.1", server_node = 'bang', nodes = ['slash', 'dash', 'ditto', 'garage'], admin_from = ['bang', 'slash', 'dash', 'ditto'], k3s_version = 'v1.24.3+k3s1') #make_cluster( server_ip = "10.5.0.7", server_node = 'ditto', nodes = ['slash', 'dash', 'bang'], admin_from = ['bang', 'slash', 'dash', 'ditto'], k3s_version = 'v1.25.11+k3s1')
--- a/templates/dnsmasq/hosts.j2 Thu Aug 24 12:42:02 2023 -0700 +++ b/templates/dnsmasq/hosts.j2 Thu Aug 24 12:43:14 2023 -0700 @@ -10,7 +10,7 @@ # sync with /my/proj/infra/inventory.py # and with templates/wireguard/wg0.conf.j2 # Hosts with fixed wg0 addresses: -10.5.0.1 bang5.bigasterisk.com local.bigasterisk.com +10.5.0.1 bang5.bigasterisk.com local.bigasterisk.com reg 10.5.0.2 prime5.bigasterisk.com prime.bigasterisk.com 10.5.0.5 dash5.bigasterisk.com 10.5.0.6 slash5.bigasterisk.com