Skip to content

fix: Remove module configuration inline #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jorgemoralespou merged 1 commit into from
Aug 7, 2025
Merged

fix: Remove module configuration inline #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions infrastructure/gke-for-educates/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
6 changes: 0 additions & 6 deletions infrastructure/token-sa-kubeconfig/10-kubernetes-resources.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
1 change: 0 additions & 1 deletion infrastructure/token-sa-kubeconfig/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ variable "cluster" {
name = string
host = string
cluster_ca_certificate = string
token = string
})
}

Expand Down
6 changes: 1 addition & 5 deletions infrastructure/token-sa-kubeconfig/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
9 changes: 9 additions & 0 deletions root-modules/educates-on-gke/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
28 changes: 27 additions & 1 deletion root-modules/educates-on-gke/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}