From 295e1a2e684acc7bbf26c76fd3fb320c47e3631b Mon Sep 17 00:00:00 2001 From: Moritz Graf Date: Sat, 29 Nov 2025 12:00:36 +0100 Subject: [PATCH] Adding inventory and correcting also host vars --- .../{k8s-cluster => k8s_cluster}/addons.yml | 0 .../k8s-cluster.yml | 2 +- .../k8s-net-calico.yml | 0 .../k8s-net-canal.yml | 0 .../k8s-net-cilium.yml | 0 .../k8s-net-contiv.yml | 0 .../k8s-net-flannel.yml | 0 .../k8s-net-kube-router.yml | 0 .../k8s-net-macvlan.yml | 0 .../k8s-net-weave.yml | 0 bootstrap/inventory/prod/inventory.ini | 29 ++++--------------- 11 files changed, 6 insertions(+), 25 deletions(-) rename bootstrap/inventory/prod/group_vars/{k8s-cluster => k8s_cluster}/addons.yml (100%) rename bootstrap/inventory/prod/group_vars/{k8s-cluster => k8s_cluster}/k8s-cluster.yml (99%) rename bootstrap/inventory/prod/group_vars/{k8s-cluster => k8s_cluster}/k8s-net-calico.yml (100%) rename bootstrap/inventory/prod/group_vars/{k8s-cluster => k8s_cluster}/k8s-net-canal.yml (100%) rename bootstrap/inventory/prod/group_vars/{k8s-cluster => k8s_cluster}/k8s-net-cilium.yml (100%) rename bootstrap/inventory/prod/group_vars/{k8s-cluster => k8s_cluster}/k8s-net-contiv.yml (100%) rename bootstrap/inventory/prod/group_vars/{k8s-cluster => k8s_cluster}/k8s-net-flannel.yml (100%) rename bootstrap/inventory/prod/group_vars/{k8s-cluster => k8s_cluster}/k8s-net-kube-router.yml (100%) rename bootstrap/inventory/prod/group_vars/{k8s-cluster => k8s_cluster}/k8s-net-macvlan.yml (100%) rename bootstrap/inventory/prod/group_vars/{k8s-cluster => k8s_cluster}/k8s-net-weave.yml (100%) diff --git a/bootstrap/inventory/prod/group_vars/k8s-cluster/addons.yml b/bootstrap/inventory/prod/group_vars/k8s_cluster/addons.yml similarity index 100% rename from bootstrap/inventory/prod/group_vars/k8s-cluster/addons.yml rename to bootstrap/inventory/prod/group_vars/k8s_cluster/addons.yml diff --git a/bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-cluster.yml b/bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-cluster.yml similarity index 99% rename from bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-cluster.yml rename to bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-cluster.yml index 6e876cf..e116d17 100644 --- a/bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-cluster.yml +++ b/bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-cluster.yml @@ -27,7 +27,7 @@ kube_kubeadm_apiserver_extra_args: kube_api_anonymous_auth: true ## Change this to use another Kubernetes version, e.g. a current beta release -kube_version: v1.30.6 +kube_version: v1.31.9 # kubernetes image repo define #kube_image_repo: "k8s.gcr.io" diff --git a/bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-net-calico.yml b/bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-net-calico.yml similarity index 100% rename from bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-net-calico.yml rename to bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-net-calico.yml diff --git a/bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-net-canal.yml b/bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-net-canal.yml similarity index 100% rename from bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-net-canal.yml rename to bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-net-canal.yml diff --git a/bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-net-cilium.yml b/bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-net-cilium.yml similarity index 100% rename from bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-net-cilium.yml rename to bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-net-cilium.yml diff --git a/bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-net-contiv.yml b/bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-net-contiv.yml similarity index 100% rename from bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-net-contiv.yml rename to bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-net-contiv.yml diff --git a/bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-net-flannel.yml b/bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-net-flannel.yml similarity index 100% rename from bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-net-flannel.yml rename to bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-net-flannel.yml diff --git a/bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-net-kube-router.yml b/bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-net-kube-router.yml similarity index 100% rename from bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-net-kube-router.yml rename to bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-net-kube-router.yml diff --git a/bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-net-macvlan.yml b/bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-net-macvlan.yml similarity index 100% rename from bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-net-macvlan.yml rename to bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-net-macvlan.yml diff --git a/bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-net-weave.yml b/bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-net-weave.yml similarity index 100% rename from bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-net-weave.yml rename to bootstrap/inventory/prod/group_vars/k8s_cluster/k8s-net-weave.yml diff --git a/bootstrap/inventory/prod/inventory.ini b/bootstrap/inventory/prod/inventory.ini index 3236020..f3d5ae3 100644 --- a/bootstrap/inventory/prod/inventory.ini +++ b/bootstrap/inventory/prod/inventory.ini @@ -3,35 +3,16 @@ # ## We should set etcd_member_name for etcd cluster. The node that is not a etcd member do not need to set the value, or can set the empty string value. [all] haumdaucher -#jetson1.dyndns.moritzgraf.de -# container_manager=containerd resolvconf_mode=docker_dns -#ns3088070.ip-37-59-40.eu ansible_host=37.59.40.95 ansible_become=yes ansible_become_method=sudo ansible_python_interpreter=/usr/bin/python3 -#ns3100058.ip-37-59-61.eu ansible_host=37.59.61.198 ansible_become=yes ansible_become_method=sudo ansible_python_interpreter=/usr/bin/python3 -# node1 ansible_host=95.54.0.12 # ip=10.3.0.1 etcd_member_name=etcd1 -# node2 ansible_host=95.54.0.13 # ip=10.3.0.2 etcd_member_name=etcd2 -# node3 ansible_host=95.54.0.14 # ip=10.3.0.3 etcd_member_name=etcd3 -# node4 ansible_host=95.54.0.15 # ip=10.3.0.4 etcd_member_name=etcd4 -# node5 ansible_host=95.54.0.16 # ip=10.3.0.5 etcd_member_name=etcd5 -# node6 ansible_host=95.54.0.17 # ip=10.3.0.6 etcd_member_name=etcd6 - -# ## configure a bastion host if your nodes are not directly reachable -# bastion ansible_host=x.x.x.x ansible_user=some_user - -[kube-master] +[kube_control_plane] haumdaucher -#ns3088070.ip-37-59-40.eu [etcd] haumdaucher -[kube-node] +[kube_node] haumdaucher -#jetson1.dyndns.moritzgraf.de -[calico-rr] - -[k8s-cluster:children] -kube-master -kube-node -calico-rr +[k8s_cluster:children] +kube_control_plane +kube_node