Mercurial > code > home > repos > infra
changeset 67:2f2e88849415
cleanups and docker source update
| author | drewp@bigasterisk.com |
|---|---|
| date | Wed, 04 May 2022 23:40:14 -0700 |
| parents | 5ad4b4c712d9 |
| children | 4a28a6b26af4 |
| files | k8s_lookup/Dockerfile kube.py net.py templates/dnsmasq/hosts.j2 |
| diffstat | 4 files changed, 5 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/k8s_lookup/Dockerfile Wed May 04 23:38:22 2022 -0700 +++ b/k8s_lookup/Dockerfile Wed May 04 23:40:14 2022 -0700 @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20220315 -RUN echo 2022-04-19 && apt-get update +FROM ubuntu:jammy-20220428 +RUN echo 2022-05-04 && apt-get update RUN DEBIAN_FRONTEND=noninteractive apt-get install -y udns-utils CMD ["sleep", "1d"] \ No newline at end of file
--- a/kube.py Wed May 04 23:38:22 2022 -0700 +++ b/kube.py Wed May 04 23:40:14 2022 -0700 @@ -34,7 +34,6 @@ if is_pi: old_cmdline = host.get_fact(FindInFile, path='/boot/cmdline.txt', pattern=r'.*')[0] - print(repr(old_cmdline)) if 'cgroup' not in old_cmdline: cmdline = old_cmdline + ' cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory' files.line(path='/boot/cmdline.txt', line='.*', replace=cmdline)
--- a/net.py Wed May 04 23:38:22 2022 -0700 +++ b/net.py Wed May 04 23:40:14 2022 -0700 @@ -47,10 +47,11 @@ cleanup() files.directory('/etc/systemd/network') - files.template(src="templates/net/bang_10.1.network.j2", dest="/etc/systemd/network/99-10.1.network") + files.template(src="templates/net/bang_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network") files.template(src="templates/net/bang_isp.network.j2", dest="/etc/systemd/network/99-isp.network") systemd.service(service='systemd-networkd.service', running=True, restarted=True) + elif host.name == 'plus': pass
--- a/templates/dnsmasq/hosts.j2 Wed May 04 23:38:22 2022 -0700 +++ b/templates/dnsmasq/hosts.j2 Wed May 04 23:40:14 2022 -0700 @@ -16,13 +16,7 @@ 10.5.0.17 frontbed5.bigasterisk.com 10.5.0.30 dot5.bigasterisk.com 10.5.0.110 plus5.bigasterisk.com -10.5.0.112 drew-note5.bigasterisk.com - -{% if net != '10.5' %} -# so bang can see these names -10.2.0.77 dash.bigasterisk.com -10.2.0.138 slash.bigasterisk.com -{% endif %} +10.5.0.113 drew-note5.bigasterisk.com {% if net == '10.5' %} 10.5.0.1 bang.bigasterisk.com