From e2796adf9bbd3aa6a0a965cc9483c42ea93681c5 Mon Sep 17 00:00:00 2001
From: Moritz Graf <github@moritzgraf.de>
Date: Fri, 23 Dec 2022 18:54:30 +0100
Subject: [PATCH] Migrating to containerd

---
 bootstrap/README.md                                         | 2 ++
 bootstrap/init.sh                                           | 2 +-
 bootstrap/inventory/prod/group_vars/all/all.yml             | 4 +++-
 bootstrap/inventory/prod/group_vars/etcd.yml                | 4 +++-
 .../inventory/prod/group_vars/k8s-cluster/k8s-cluster.yml   | 6 ++++--
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/bootstrap/README.md b/bootstrap/README.md
index 4ec88be..9530512 100644
--- a/bootstrap/README.md
+++ b/bootstrap/README.md
@@ -71,6 +71,8 @@ Foreward in k8s-directory.
 
 Check the current default value of `kube_version` in cloned repository.
 
+**FOR K8S VERSION - Edit /Users/moritz/src/infrapuzzle/bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-cluster.yml**
+
 ```sh
 cd kubespray
 ansible-playbook -i inventory/prod/inventory.ini -e kube_version=v1.22.10 -e upgrade_cluster_setup=true cluster.yml
diff --git a/bootstrap/init.sh b/bootstrap/init.sh
index b85c0cc..2d177c7 100755
--- a/bootstrap/init.sh
+++ b/bootstrap/init.sh
@@ -6,7 +6,7 @@
 echo "######################################################################################"
 echo "##  Reinit repository"
 rm -rf kubespray
-VERSION="release-2.19"
+VERSION="release-2.20"
 git clone --branch $VERSION https://github.com/kubernetes-sigs/kubespray.git
 
 echo "######################################################################################"
diff --git a/bootstrap/inventory/prod/group_vars/all/all.yml b/bootstrap/inventory/prod/group_vars/all/all.yml
index aa67d5d..1c59c4a 100644
--- a/bootstrap/inventory/prod/group_vars/all/all.yml
+++ b/bootstrap/inventory/prod/group_vars/all/all.yml
@@ -8,7 +8,9 @@ etcd_data_dir: /var/lib/etcd
 
 ## Experimental kubeadm etcd deployment mode. Available only for new deployment
 #etcd_kubeadm_enabled: false
-etcd_deployment_type: docker
+etcd_deployment_type: host
+# moritz 20221223 migrating to containerd
+#etcd_deployment_type: docker
 
 ## Directory where the binaries will be installed
 bin_dir: /usr/local/bin
diff --git a/bootstrap/inventory/prod/group_vars/etcd.yml b/bootstrap/inventory/prod/group_vars/etcd.yml
index cbc388e..466f6d5 100644
--- a/bootstrap/inventory/prod/group_vars/etcd.yml
+++ b/bootstrap/inventory/prod/group_vars/etcd.yml
@@ -19,4 +19,6 @@
 # etcd_peer_client_auth: true
 
 ## Settings for etcd deployment type
-etcd_deployment_type: docker
+etcd_deployment_type: host
+# moritz 20221223 migrating to containerd
+#etcd_deployment_type: docker
diff --git a/bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-cluster.yml b/bootstrap/inventory/prod/group_vars/k8s-cluster/k8s-cluster.yml
index f07b636..89410b5 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_users_dir: "{{ kube_config_dir }}/users"
 kube_api_anonymous_auth: true
 
 ## Change this to use another Kubernetes version, e.g. a current beta release
-kube_version: v1.21.13
+kube_version: v1.22.10
 
 # kubernetes image repo define
 kube_image_repo: "k8s.gcr.io"
@@ -192,7 +192,9 @@ dns_domain: "{{ cluster_name }}"
 
 ## Container runtime
 ## docker for docker, crio for cri-o and containerd for containerd.
-container_manager: docker
+container_manager: containerd
+# moritz 20221223 migrating to containerd
+#container_manager: docker
 
 # Additional container runtimes
 kata_containers_enabled: false