REF: Move terraform config into terraform-octue-twined module

octue · Jan 27, 2025 · 7809b25 · 7809b25
1 parent 3a2a1f2
commit 7809b25
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 177 deletions.
diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl
diff --git a/terraform/google_apis.tf b/terraform/google_apis.tf
diff --git a/terraform/kubernetes_cluster.tf b/terraform/kubernetes_cluster.tf
diff --git a/terraform/kubernetes_iam.tf b/terraform/kubernetes_iam.tf
diff --git a/terraform/kubernetes_kueue.tf b/terraform/kubernetes_kueue.tf
diff --git a/terraform/kueue_manifests/cluster_queue.yaml b/terraform/kueue_manifests/cluster_queue.yaml
diff --git a/terraform/kueue_manifests/local_queue.yaml b/terraform/kueue_manifests/local_queue.yaml
diff --git a/terraform/kueue_manifests/resource_flavors.yaml b/terraform/kueue_manifests/resource_flavors.yaml
diff --git a/terraform/main.tf b/terraform/main.tf
@@ -8,11 +8,11 @@ terraform {
     }
     kubernetes = {
       source = "hashicorp/kubernetes"
-      version = "~>2.35.1"
+      version = "~>2.35"
     }
     kubectl = {
       source  = "gavinbunney/kubectl"
-      version = "~>1.19.0"
+      version = "~>1.19"
     }
   }
 
@@ -37,17 +37,18 @@ data "google_client_config" "default" {}
 
 
 provider "kubernetes" {
-  host                   = "https://${google_container_cluster.primary.endpoint}"
-  token                  = data.google_client_config.default.access_token
-  cluster_ca_certificate = base64decode(google_container_cluster.primary.master_auth[0].cluster_ca_certificate)
+  config_path = "~/.kube/config"
+  # host                   = "https://${module.octue_twined.kubernetes_cluster.endpoint}"
+  # token                  = data.google_client_config.default.access_token
+  # cluster_ca_certificate = base64decode(module.octue_twined.kubernetes_cluster.master_auth[0].cluster_ca_certificate)
 }
 
 
 provider "kubectl" {
   load_config_file       = false
-  host                   = "https://${google_container_cluster.primary.endpoint}"
+  host                   = "https://${module.octue_twined.kubernetes_cluster.endpoint}"
   token                  = data.google_client_config.default.access_token
-  cluster_ca_certificate = base64decode(google_container_cluster.primary.master_auth[0].cluster_ca_certificate)
+  cluster_ca_certificate = base64decode(module.octue_twined.kubernetes_cluster.master_auth[0].cluster_ca_certificate)
 }
 
 

diff --git a/terraform/variables.tf b/terraform/variables.tf
@@ -27,18 +27,3 @@ variable "deletion_protection" {
   type    = bool
   default = false
 }
-
-variable "kueue_version" {
-  type = string
-  default = "v0.10.1"
-}
-
-variable "cpus" {
-  type = number
-  default = 2
-}
-
-variable "memory" {
-  type = string
-  default = "2Gi"
-}