diff --git a/rke/main.tf b/rke/main.tf index 4bd958d..69f82ed 100644 --- a/rke/main.tf +++ b/rke/main.tf @@ -5,7 +5,9 @@ resource "rke_cluster" "cluster" { role = ["controlplane", "worker", "etcd"] ssh_key = file("SSHKEYPATH") } - kubernetes_version = "v1.20.13-rancher1-1" + kubernetes_version = "v1.24.9-rancher1-1" + enable_cri_dockerd = "true" + ignore_docker_version = "true" network { mtu = 0 options = { diff --git a/rke/provider.tf b/rke/provider.tf index 572a206..fe90010 100644 --- a/rke/provider.tf +++ b/rke/provider.tf @@ -2,7 +2,7 @@ terraform { required_providers { rke = { source = "rancher/rke" - version = "1.3.0" + version = "1.4.0" } } } diff --git a/rke/rke.sh b/rke/rke.sh index 34eff91..6080230 100644 --- a/rke/rke.sh +++ b/rke/rke.sh @@ -44,10 +44,10 @@ fi rm -rf terraform terraform.d terraform.tfstate terraform.tfstate.backup .terraform.lock.hcl # extract terraform and provider modules -if [[ -e terraform_1.1.5_linux_amd64.zip ]];then - unzip terraform_1.1.5_linux_amd64.zip +if [[ -e terraform_1.4.0_linux_amd64.zip ]];then + unzip terraform_1.4.0_linux_amd64.zip if [[ "${?}" -ne 0 ]];then - echo "Something went wrong !! File terraform_1.1.5_linux_amd64.zip not unzipped." + echo "Something went wrong !! File terraform_1.4.0_linux_amd64.zip not unzipped." exit 1 fi fi @@ -105,8 +105,8 @@ sed -i -e "s/NODEUSER/$user/g" main.tf sed -i -e "s#SSHKEYPATH#$ssh_key_path#g" main.tf sed -i -e "s#POD_COUNT#$max_pods_per_node#g" main.tf if [ -z "$kubernetes_version" ]; then - echo "kubernetes version is not provided, using v1.16.15-rancher1-3" - sed -i -e "s/kubernetes_version =.*/kubernetes_version = \"v1.16.15-rancher1-3\"/g" main.tf + echo "kubernetes version is not provided, using v1.24.9-rancher1-3" + sed -i -e "s/kubernetes_version =.*/kubernetes_version = \"v1.24.9-rancher1-3\"/g" main.tf else sed -i -e "s/kubernetes_version =.*/kubernetes_version = \"$kubernetes_version\"/g" main.tf fi diff --git a/rke/terraform-rke.ini b/rke/terraform-rke.ini index aaf1856..786b43c 100644 --- a/rke/terraform-rke.ini +++ b/rke/terraform-rke.ini @@ -3,7 +3,7 @@ [RKE-CLUSTER] # Kubernetes version -kubernetes_version=v1.20.13-rancher1-1 +kubernetes_version=v1.24.9-rancher1-1 # network plugin plugin=canal diff --git a/rke/terraform_1.4.0_linux_amd64.zip b/rke/terraform_1.4.0_linux_amd64.zip new file mode 100644 index 0000000..1b1dc9f Binary files /dev/null and b/rke/terraform_1.4.0_linux_amd64.zip differ