diff --git a/inventory.yaml b/inventory.yaml index 62c5e5e..bdd6707 100644 --- a/inventory.yaml +++ b/inventory.yaml @@ -49,8 +49,12 @@ all: bgp: children: proxmox: - # Kubernetes cluster setup documented at - # https://git.k-space.ee/k-space/kube + # Kubernetes cluster setup documented at https://git.k-space.ee/k-space/kube + # + # kubelets are also defined in: + # - router BGP + # - ansible/proxmox/group_vars/bgp/main.yaml + # - ns1 DNS kubelets: children: masters: @@ -75,7 +79,7 @@ all: coralworkers: hosts: worker91.kube.k-space.ee: - snaible_host: 172.21.8.91 + ansible_host: 172.21.3.91 # For more information regarding door management refer to # https://wiki.k-space.ee/en/hosting/doors diff --git a/known_hosts b/known_hosts index 1bdfe19..c6a031f 100644 --- a/known_hosts +++ b/known_hosts @@ -21,3 +21,4 @@ 172.20.5.99 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCoepYYnNMXkZ9dn4RSSMhFFsppPVkzmjkG3z9vK84454XkI4wizmhUlZ0p+Ovx2YbrjbKibfrrtk8RgWUMi0rY= # worker99.codemowers.cloud 100.102.3.4 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMpkSqEOyYrKXChxl6PAV+q0KypOPnKsXoXWO1JSZSIOwAs5YTzt8Q1Ryb+nQnAOlGj1AY1H7sRllTzdv0cA/EM= # workshopdoor 172.21.3.101 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFFn+IqErHlGCtU3fYO7YooZ5WFiX/PbVFYoyzTTlR+P # external.kube.k-space.ee +172.21.3.91 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINoIhl3zdpR67zfmWiPX3xyBbMcV6FrKvBJuq4MiA/aj # worker91.kube.k-space.ee diff --git a/kubernetes-nodes.yaml b/kubernetes-nodes.yaml index a9de79d..3402159 100644 --- a/kubernetes-nodes.yaml +++ b/kubernetes-nodes.yaml @@ -23,7 +23,7 @@ repo: "deb [signed-by=/usr/share/keyrings/coral.asc] https://packages.cloud.google.com/apt coral-edgetpu-stable main" state: present filename: coral - - name: install generic kernel + - name: install coral driver apt: state: latest pkg: libedgetpu1-std diff --git a/proxmox/group_vars/bgp/main.yaml b/proxmox/group_vars/bgp/main.yaml index 613696c..8cf2b33 100644 --- a/proxmox/group_vars/bgp/main.yaml +++ b/proxmox/group_vars/bgp/main.yaml @@ -11,6 +11,7 @@ bgp: - 172.21.3.82 - 172.21.3.83 - 172.21.3.84 + - 172.21.3.91 peers_ipv6: - 2001:bb8:4008:21:ffff:ffff:ffff:fffe - 2001:bb8:4008:21::3:51 @@ -20,3 +21,4 @@ bgp: - 2001:bb8:4008:21::3:82 - 2001:bb8:4008:21::3:83 - 2001:bb8:4008:21::3:84 + - 2001:bb8:4008:21::3:91 diff --git a/ssh_config b/ssh_config index 33c7db2..3850411 100644 --- a/ssh_config +++ b/ssh_config @@ -9,6 +9,14 @@ Host backdoor 100.102.3.3 UserKnownHostsFile /dev/null ControlMaster auto ControlPersist 8h +Host external.kube.k-space.ee 172.21.3.101 + User root + Hostname 172.21.3.101 + Port 22 + GlobalKnownHostsFile known_hosts + UserKnownHostsFile /dev/null + ControlMaster auto + ControlPersist 8h Host frontdoor 100.102.3.2 User root Hostname 100.102.3.2 @@ -49,14 +57,6 @@ Host master3.kube.k-space.ee 172.21.3.53 UserKnownHostsFile /dev/null ControlMaster auto ControlPersist 8h -Host nas.k-space.ee 172.23.0.7 - User root - Hostname 172.23.0.7 - Port 22 - GlobalKnownHostsFile known_hosts - UserKnownHostsFile /dev/null - ControlMaster auto - ControlPersist 8h Host ns1.k-space.ee 172.20.0.2 User root Hostname 172.20.0.2 @@ -65,49 +65,41 @@ Host ns1.k-space.ee 172.20.0.2 UserKnownHostsFile /dev/null ControlMaster auto ControlPersist 8h -Host nvr.kube.k-space.ee 172.21.3.100 +Host offsite 192.168.30.40 User root - Hostname 172.21.3.100 + Hostname 192.168.30.40 Port 22 GlobalKnownHostsFile known_hosts UserKnownHostsFile /dev/null ControlMaster auto ControlPersist 8h -Host offsite 78.28.64.17 +Host pve90.proxmox.infra.k-space.ee 172.21.20.90 User root - Hostname 78.28.64.17 - Port 10648 - GlobalKnownHostsFile known_hosts - UserKnownHostsFile /dev/null - ControlMaster auto - ControlPersist 8h -Host pve1 172.21.20.1 - User root - Hostname 172.21.20.1 + Hostname 172.21.20.90 Port 22 GlobalKnownHostsFile known_hosts UserKnownHostsFile /dev/null ControlMaster auto ControlPersist 8h -Host pve2 172.21.20.2 +Host pve91.proxmox.infra.k-space.ee 172.21.20.91 User root - Hostname 172.21.20.2 + Hostname 172.21.20.91 Port 22 GlobalKnownHostsFile known_hosts UserKnownHostsFile /dev/null ControlMaster auto ControlPersist 8h -Host pve8 172.21.20.8 +Host pve92.proxmox.infra.k-space.ee 172.21.20.92 User root - Hostname 172.21.20.8 + Hostname 172.21.20.92 Port 22 GlobalKnownHostsFile known_hosts UserKnownHostsFile /dev/null ControlMaster auto ControlPersist 8h -Host pve9 172.21.20.9 +Host pve93.proxmox.infra.k-space.ee 172.21.20.93 User root - Hostname 172.21.20.9 + Hostname 172.21.20.93 Port 22 GlobalKnownHostsFile known_hosts UserKnownHostsFile /dev/null @@ -145,6 +137,14 @@ Host worker4.kube.k-space.ee 172.21.3.84 UserKnownHostsFile /dev/null ControlMaster auto ControlPersist 8h +Host worker91.kube.k-space.ee 172.21.3.91 + User root + Hostname 172.21.3.91 + Port 22 + GlobalKnownHostsFile known_hosts + UserKnownHostsFile /dev/null + ControlMaster auto + ControlPersist 8h Host worker99.codemowers.cloud 172.20.5.99 User root Hostname 172.20.5.99 diff --git a/update-ssh-config.yaml b/update-ssh-config.yaml index b5aa738..cb88438 100644 --- a/update-ssh-config.yaml +++ b/update-ssh-config.yaml @@ -54,7 +54,7 @@ - name: Push authorized keys to targets hosts: - misc - - kubernetes + - kubelets - doors # do NOT put proxmox here! PVE manages its keys and admin keys are manual tasks: @@ -68,6 +68,6 @@ # Use `ansible-playbook update-ssh-config.yml` from https://git.k-space.ee/k-space/ansible/ to update this file {% for user in admins | unique | sort %} {% for line in lookup("ansible.builtin.file", user + ".keys").split("\n") %} - {{ line }} # {{ user }} + {{ line }} {{ user }}@ansible {% endfor %} {% endfor %}