From 9cb8831f015a97796ca95b5faa59700726f27e1a Mon Sep 17 00:00:00 2001 From: Moritz Graf Date: Sat, 26 Dec 2020 09:48:19 +0100 Subject: [PATCH] Adding current inventory --- bootstrap_hetzner/init.sh | 9 +++++---- .../prod/group_vars/k8s-cluster/k8s-net-calico.yml | 2 +- bootstrap_hetzner/inventory/prod/inventory.ini | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bootstrap_hetzner/init.sh b/bootstrap_hetzner/init.sh index ff9621d..658148e 100755 --- a/bootstrap_hetzner/init.sh +++ b/bootstrap_hetzner/init.sh @@ -43,10 +43,11 @@ echo "export KUBECONFIG=\"$( pwd )/kubespray/inventory/sample/artifacts/admin.co echo "######################################################################################" echo "## Preparing real prod environment" -cp -r kubespray/inventory/sample kubespray/inventory/prod -rm kubespray/inventory/prod/inventory.ini -cp ./prod.ini kubespray/inventory/prod/inventory.ini +rsync -a ./inventory/ ./kubespray/inventory/ +# cp -r kubespray/inventory/sample kubespray/inventory/prod +# rm kubespray/inventory/prod/inventory.ini +# cp ./prod.ini kubespray/inventory/prod/inventory.ini #gsed -i "s/kube_network_plugin: .*/kube_network_plugin: flannel/" ./kubespray/inventory/prod/group_vars/k8s-cluster/k8s-cluster.yml -gsed -i "s/# calico_iptables_backend: \"Legacy\"/calico_iptables_backend: \"NFT\"/" ./kubespray/inventory/prod/group_vars/k8s-cluster/k8s-net-calico.yml +# gsed -i "s/# calico_iptables_backend: \"Legacy\"/calico_iptables_backend: \"NFT\"/" ./kubespray/inventory/prod/group_vars/k8s-cluster/k8s-net-calico.yml #echo 'calico_iptables_backend: "NFT"' >> ./kubespray/inventory/prod/group_vars/k8s-cluster/k8s-net-cluster.yml #gsed -i "s/metrics_server_enabled: .*/metrics_server_enabled: true/" ./kubespray/inventory/prod/group_vars/k8s-cluster/addons.yml diff --git a/bootstrap_hetzner/inventory/prod/group_vars/k8s-cluster/k8s-net-calico.yml b/bootstrap_hetzner/inventory/prod/group_vars/k8s-cluster/k8s-net-calico.yml index 6d3baa0..5660900 100644 --- a/bootstrap_hetzner/inventory/prod/group_vars/k8s-cluster/k8s-net-calico.yml +++ b/bootstrap_hetzner/inventory/prod/group_vars/k8s-cluster/k8s-net-calico.yml @@ -39,7 +39,7 @@ # calico_datastore: "etcd" # Choose Calico iptables backend: "Legacy", "Auto" or "NFT" -calico_iptables_backend: "NFT" +#calico_iptables_backend: "NFT" # Use typha (only with kdd) # typha_enabled: false diff --git a/bootstrap_hetzner/inventory/prod/inventory.ini b/bootstrap_hetzner/inventory/prod/inventory.ini index f4d18e3..6a1f6cf 100644 --- a/bootstrap_hetzner/inventory/prod/inventory.ini +++ b/bootstrap_hetzner/inventory/prod/inventory.ini @@ -2,7 +2,7 @@ # ## different ip than the default iface # ## 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 ansible_host=136.243.23.215 etcd_member_name=etcd1 ansible_become=yes ansible_become_method=sudo ansible_python_interpreter=/usr/bin/python3 metrics_server_enabled=false deploy_netchecker=True +haumdaucher ansible_host=136.243.23.215 etcd_member_name=etcd1 ansible_become=yes ansible_become_method=sudo ansible_python_interpreter=/usr/bin/python3 metrics_server_enabled=false # 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