diff --git a/defaults.yml b/defaults.yml index 9ace1237..9fd46cdc 100644 --- a/defaults.yml +++ b/defaults.yml @@ -37,9 +37,9 @@ azure_tenant_id: "" azure_subscription_id: "" aks_version: "1.30" -rancher_version: "2.9.3" -rancher_k3s_version: "1.30.6+k3s1" -rancher_k8s_version: "1.30.6+rke2r1" +rancher_version: "2.10.1" +rancher_k3s_version: "1.30.8+k3s1" +rancher_k8s_version: "1.30.8+rke2r1" vsphere_host: "" vsphere_compute_resource: "" diff --git a/scripts/clusterpair-dr b/scripts/clusterpair-dr index 40d82c8c..53f657ee 100644 --- a/scripts/clusterpair-dr +++ b/scripts/clusterpair-dr @@ -39,6 +39,8 @@ if [ "$platform" = eks ] || [ "$platform" = ocp4 ]; then [ "$host" ] && break sleep 1 done +elif [ "$platform" = rancher ]; then + host=$(kubectl get nodes -l node-role.kubernetes.io/worker=true -o json |jq -r '.items[0].status.addresses[] | select(.type=="InternalIP") | .address') else host=node-$cluster-1 fi diff --git a/terraform/aws/main.tf b/terraform/aws/main.tf index 2fa945d9..a42eecad 100644 --- a/terraform/aws/main.tf +++ b/terraform/aws/main.tf @@ -19,7 +19,7 @@ terraform { } rancher2 = { source = "rancher/rancher2" - version = "5.1.0" + version = "6.0.0" } random = { source ="hashicorp/random" @@ -28,6 +28,9 @@ terraform { source = "loafoe/ssh" version = "2.7.0" } + time = { + source = "hashicorp/time" + } } } diff --git a/terraform/aws/rancher/rancher-server.tf b/terraform/aws/rancher/rancher-server.tf index 0d1f058d..4d014b8c 100644 --- a/terraform/aws/rancher/rancher-server.tf +++ b/terraform/aws/rancher/rancher-server.tf @@ -257,14 +257,20 @@ resource "rancher2_cloud_credential" "aws" { } } +resource "time_sleep" "wait_30_seconds" { + depends_on = [rancher2_cloud_credential.aws] + create_duration = "30s" +} + resource "rancher2_machine_config_v2" "node" { for_each = var.rancherclusters depends_on = [ helm_release.rancher_server, - rancher2_cloud_credential.aws + rancher2_cloud_credential.aws, + time_sleep.wait_30_seconds ] provider = rancher2.admin - generate_name = format("node-templ-%s",each.key) + generate_name = format("templ-%s",each.key) amazonec2_config { ami = data.aws_ami.ubuntu.id root_size = "50"