Upped Kubespray, Kubernetes and libvirt-provider versions

MusicDin · May 11, 2021 · 72a0c87 · 72a0c87
1 parent 62d1f9a
commit 72a0c87
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ Set up HA Kubernetes cluster using KVM, Terraform and Kubespray.
 + [Git](https://git-scm.com/)
 + [Cloud-init](https://cloudinit.readthedocs.io/)
 + [Ansible](https://www.ansible.com/) >= v2.6
-+ [Terraform](https://www.terraform.io/) **>= v0.13.x**
++ [Terraform](https://www.terraform.io/) **>= v0.13**
 + [KVM - Kernel Virtual Machine](https://www.linux-kvm.org/)
 + [Libvirt provider](https://github.com/dmacvicar/terraform-provider-libvirt) - Setup guide is provided in [docs](./docs/libvirt-provider-setup.md).
 + Internet connection on machine that will run VMs and on VMs

diff --git a/docs/libvirt-provider-setup.md b/docs/libvirt-provider-setup.md
@@ -4,24 +4,30 @@ For up to date installation guide and other informations check [libvirt provider
 
 Create the following directory:
 <pre>
-mkdir -p ~/.local/share/terraform/plugins/registry.terraform.io/dmacvicar/libvirt/<b>0.6.2</b>/linux_amd64
+mkdir -p ~/.local/share/terraform/plugins/registry.terraform.io/dmacvicar/libvirt/<b>0.6.3</b>/linux_amd64
 </pre>
 
 Move to created directory:
 <pre>
-cd ~/.local/share/terraform/plugins/registry.terraform.io/dmacvicar/libvirt/<b>0.6.2</b>/linux_amd64
+cd ~/.local/share/terraform/plugins/registry.terraform.io/dmacvicar/libvirt/<b>0.6.3</b>/linux_amd64
 </pre>
 
-Download libvirt provider `.tar.gz` archive file
-(all possible assets can be found under their [releases](https://github.com/dmacvicar/terraform-provider-libvirt/releases)):
+Download libvirt provider `tar.gz` archive file. 
+All possible assets can be found under their [releases](https://github.com/dmacvicar/terraform-provider-libvirt/releases).
+Example for *Ubuntu 20.04*:
 <pre>
-wget https://github.com/dmacvicar/terraform-provider-libvirt/releases/download/v<b>0.6.2</b>/terraform-provider-libvirt-<b>0.6.2</b>+git.1585292411.8cbe9ad0.Ubuntu_18.04.amd64.tar.gz
+wget -O terraform-provider-libvirt.tar.gz https://github.com/dmacvicar/terraform-provider-libvirt/releases/download/v<b>0.6.3</b>/terraform-provider-libvirt-<b>0.6.3</b>+git.1604843676.67f4f2aa.Ubuntu_20.04.amd64.tar.gz
 </pre>
 
-Unarchive file:
-<pre>
-tar -xzf terraform-provider-libvirt-<b>0.6.2</b>+git.1585292411.8cbe9ad0.Ubuntu_18.04.amd64.tar.gz
-</pre>
+Unarchive downloaded file:
+```
+tar -xzf terraform-libvirt-provider.tar.gz
+```
+
+(Optionally) Remove `tar.gz` archive file:
+```
+rm terraform-libvirt-provider.tar.gz
+```
 
 That's it.
 
diff --git a/modules/vm/versions.tf b/modules/vm/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     libvirt = {
       source  = "dmacvicar/libvirt"
-      version = "0.6.2"
+      version = "0.6.3"
     }
   }
 }
diff --git a/terraform.tfvars b/terraform.tfvars
@@ -152,10 +152,10 @@ vm_worker_node_label = "node"
 k8s_kubespray_url = "https://github.com/kubernetes-sigs/kubespray.git"
 
 # The version of Kubespray that will be used to deploy Kubernetes #
-k8s_kubespray_version = "v2.15.0"
+k8s_kubespray_version = "v2.15.1"
 
 # The Kubernetes version that will be deployed #
-k8s_version = "v1.19.7"
+k8s_version = "v1.19.9"
 
 # The overlay network plugin used by the Kubernetes cluster (flannel/weave/calico/cilium/canal/kube-router) #
 k8s_network_plugin = "calico"

diff --git a/versions.tf b/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     libvirt = {
       source  = "dmacvicar/libvirt"
-      version = "0.6.2"
+      version = "0.6.3"
     }
   }
 }