From 696d87d89d3f964151433a9cec13dd0a4f1c8f3f Mon Sep 17 00:00:00 2001
From: Jorge Morales Pou <jorgemoralespou@gmail.com>
Date: Thu, 7 Aug 2025 13:37:30 +0200
Subject: [PATCH] fix: Remove module configuration inline

---
 infrastructure/gke-for-educates/versions.tf   |  8 +++---
 .../10-kubernetes-resources.tf                |  6 ----
 .../token-sa-kubeconfig/variables.tf          |  1 -
 .../token-sa-kubeconfig/versions.tf           |  6 +---
 root-modules/educates-on-gke/main.tf          |  9 ++++++
 root-modules/educates-on-gke/versions.tf      | 28 ++++++++++++++++++-
 6 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/infrastructure/gke-for-educates/versions.tf b/infrastructure/gke-for-educates/versions.tf
index 4755fa7..abf98f5 100644
--- a/infrastructure/gke-for-educates/versions.tf
+++ b/infrastructure/gke-for-educates/versions.tf
@@ -2,22 +2,22 @@ terraform {
   required_providers {
     google = {
       source = "hashicorp/google"
-      version = "6.28.0"
+      version = "6.47.0"
     }
 
     tls = {
       source  = "hashicorp/tls"
-      version = "4.0.6"
+      version = "4.1.0"
     }
 
     cloudinit = {
       source  = "hashicorp/cloudinit"
-      version = "2.3.6"
+      version = "2.3.7"
     }
 
     kubernetes = {
       source = "hashicorp/kubernetes"
-      version = "2.36.0"
+      version = "2.38.0"
     }    
   }
 }
\ No newline at end of file
diff --git a/infrastructure/token-sa-kubeconfig/10-kubernetes-resources.tf b/infrastructure/token-sa-kubeconfig/10-kubernetes-resources.tf
index c853ca8..c3e4912 100644
--- a/infrastructure/token-sa-kubeconfig/10-kubernetes-resources.tf
+++ b/infrastructure/token-sa-kubeconfig/10-kubernetes-resources.tf
@@ -1,9 +1,3 @@
-provider "kubernetes" {
-  host                   = var.cluster.host
-  token                  = var.cluster.token
-  cluster_ca_certificate = var.cluster.cluster_ca_certificate
-}
-
 resource "kubernetes_namespace" "automation" {
   count = var.create_namespace ? 1 : 0
   metadata {
diff --git a/infrastructure/token-sa-kubeconfig/variables.tf b/infrastructure/token-sa-kubeconfig/variables.tf
index ea10082..0df4c4a 100644
--- a/infrastructure/token-sa-kubeconfig/variables.tf
+++ b/infrastructure/token-sa-kubeconfig/variables.tf
@@ -4,7 +4,6 @@ variable "cluster" {
     name                   = string
     host                   = string
     cluster_ca_certificate = string
-    token                  = string
   })
 }
 
diff --git a/infrastructure/token-sa-kubeconfig/versions.tf b/infrastructure/token-sa-kubeconfig/versions.tf
index 82fa8e2..e9f688d 100644
--- a/infrastructure/token-sa-kubeconfig/versions.tf
+++ b/infrastructure/token-sa-kubeconfig/versions.tf
@@ -2,15 +2,11 @@ terraform {
   required_providers {
     kubernetes = {
       source = "hashicorp/kubernetes"
-      version = "~> 2.31"
+      version = "~> 2.38"
     }
     local = {
       source = "hashicorp/local"
       version = "~> 2.5"
     }
-    time = {
-      source = "hashicorp/time"
-      version = "~> 0.11"
-    }
   }
 }
\ No newline at end of file
diff --git a/root-modules/educates-on-gke/main.tf b/root-modules/educates-on-gke/main.tf
index 9f82a64..8672908 100644
--- a/root-modules/educates-on-gke/main.tf
+++ b/root-modules/educates-on-gke/main.tf
@@ -48,6 +48,15 @@ module "educates" {
   }
 }
 
+# Configure kubernetes provider for the 
+# token-sa-kubeconfig module
+provider "kubernetes" {
+  host                   = module.gke_for_educates.kubernetes.host
+  token                  = module.gke_for_educates.kubernetes.token
+  cluster_ca_certificate = module.gke_for_educates.kubernetes.cluster_ca_certificate
+}
+
+
 module "token-sa-kubeconfig" {
   source = "../../infrastructure/token-sa-kubeconfig"
   # source = "github.com/educates/educates-terraform-modules.git//infrastructure/token-sa-kubeconfig"
diff --git a/root-modules/educates-on-gke/versions.tf b/root-modules/educates-on-gke/versions.tf
index bd7a32e..50e66c7 100644
--- a/root-modules/educates-on-gke/versions.tf
+++ b/root-modules/educates-on-gke/versions.tf
@@ -1,9 +1,35 @@
 terraform {
   required_providers {
+    google = {
+      source = "hashicorp/google"
+      version = "6.47.0"
+    }
+
+    tls = {
+      source  = "hashicorp/tls"
+      version = "4.1.0"
+    }
+
+    cloudinit = {
+      source  = "hashicorp/cloudinit"
+      version = "2.3.7"
+    }
+
+    kubernetes = {
+      source = "hashicorp/kubernetes"
+      version = "~> 2.38"
+    }    
+
+    local = {
+      source = "hashicorp/local"
+      version = "~> 2.5"
+    }
+
     kubectl = {
       source  = "alekc/kubectl"
-      version = "~> 2.1"
+      version = "~> 2.1.3"
     }
+
   }  
   required_version = ">= 1.5.0"
 }
\ No newline at end of file