Upgrade to terraform-redhat/rhcs 1.6.0 (#759)

* Upgrade to terraform-redhat/rhcs 1.6.0 Add exception to .gitignore for .terraform.lock.hcl files so that provider versions are locked * Increase EFS wait period to 450 seconds --------- Signed-off-by: Ryan Emerson <remerson@redhat.com>
keycloak · Apr 3, 2024 · e227810 · e227810
1 parent c7ca4a1
commit e227810
Show file tree

Hide file tree

Showing 9 changed files with 307 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -100,3 +100,4 @@ provision/environment_data.json
 # OpenTofu / Terraform
 **/*.tfstate*
 **/*.terraform*
+!**/*.terraform.lock.hcl
diff --git a/provision/aws/rosa_efs_create.sh b/provision/aws/rosa_efs_create.sh
@@ -90,8 +90,8 @@ EOF
 
 oc apply -f efs-csi-aws-com-cluster-csi-driver.yaml
 
-kubectl wait --for=condition=AWSEFSDriverNodeServiceControllerAvailable --timeout=300s clustercsidriver.operator.openshift.io/efs.csi.aws.com
-kubectl wait --for=condition=AWSEFSDriverControllerServiceControllerAvailable --timeout=300s clustercsidriver.operator.openshift.io/efs.csi.aws.com
+kubectl wait --for=condition=AWSEFSDriverNodeServiceControllerAvailable --timeout=450s clustercsidriver.operator.openshift.io/efs.csi.aws.com
+kubectl wait --for=condition=AWSEFSDriverControllerServiceControllerAvailable --timeout=450s clustercsidriver.operator.openshift.io/efs.csi.aws.com
 
 NODE=$(oc get nodes --selector=node-role.kubernetes.io/worker \
   -o jsonpath='{.items[0].metadata.name}')

diff --git a/provision/opentofu/modules/rosa/account-roles/.terraform.lock.hcl b/provision/opentofu/modules/rosa/account-roles/.terraform.lock.hcl
diff --git a/provision/opentofu/modules/rosa/account-roles/provider.tf b/provision/opentofu/modules/rosa/account-roles/provider.tf
@@ -6,7 +6,7 @@ terraform {
     }
     rhcs = {
       source = "terraform-redhat/rhcs"
-      version = "1.6.0-prerelease.1"
+      version = "1.6.0"
     }
   }
 }

diff --git a/provision/opentofu/modules/rosa/hcp/.terraform.lock.hcl b/provision/opentofu/modules/rosa/hcp/.terraform.lock.hcl
diff --git a/provision/opentofu/modules/rosa/hcp/provider.tf b/provision/opentofu/modules/rosa/hcp/provider.tf
@@ -18,7 +18,7 @@ terraform {
     }
     rhcs = {
       source = "terraform-redhat/rhcs"
-      version = "1.6.0-prerelease.2"
+      version = "1.6.0"
     }
   }
 

diff --git a/provision/opentofu/modules/rosa/oidc-provider-operator-roles/.terraform.lock.hcl b/provision/opentofu/modules/rosa/oidc-provider-operator-roles/.terraform.lock.hcl
diff --git a/provision/opentofu/modules/rosa/oidc-provider-operator-roles/provider.tf b/provision/opentofu/modules/rosa/oidc-provider-operator-roles/provider.tf
@@ -8,7 +8,7 @@ terraform {
     }
     rhcs = {
       source = "terraform-redhat/rhcs"
-      version = "1.6.0-prerelease.1"
+      version = "1.6.0"
     }
     time = {
       source  = "hashicorp/time"

diff --git a/provision/opentofu/modules/rosa/vpc/.terraform.lock.hcl b/provision/opentofu/modules/rosa/vpc/.terraform.lock.hcl