Skip to content

Commit

Permalink
Upgrade deps (probably broke something)
Browse files Browse the repository at this point in the history
  • Loading branch information
dcramer committed Dec 21, 2023
1 parent efba25d commit e88723f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 104 deletions.
2 changes: 1 addition & 1 deletion terraform/dns.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "dns-private-zone" {
source = "terraform-google-modules/cloud-dns/google"
version = "~> 5.1.0"
version = "~> 5.2.0"
project_id = var.project_id
type = "public"
name = "peated-app"
Expand Down
104 changes: 4 additions & 100 deletions terraform/gke.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ data "google_client_config" "default" {}

module "gke" {
source = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-public-cluster"
version = "~> 28.0.0"
version = "~> 29.0.0"
project_id = var.project_id
name = var.cluster_name
region = var.region
Expand Down Expand Up @@ -36,9 +36,10 @@ module "gke" {

module "gke_workload_identity" {
source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
version = "~> 28.0.0"
version = "~> 29.0.0"
use_existing_gcp_sa = true
use_existing_k8s_sa = true
annotate_k8s_sa = false
k8s_sa_name = var.cluster_name
cluster_name = var.cluster_name
location = var.region
Expand All @@ -53,7 +54,7 @@ module "gke_workload_identity" {

module "gke_auth" {
source = "terraform-google-modules/kubernetes-engine/google//modules/auth"
version = "~> 28.0.0"
version = "~> 29.0.0"
project_id = var.project_id
location = module.gke.location
cluster_name = module.gke.name
Expand All @@ -69,100 +70,3 @@ resource "local_file" "kubeconfig" {
output "service_account" {
value = module.gke.service_account
}

# output "cluster_id" {
# description = "Cluster ID"
# value = module.gke.cluster_id
# }

# output "Cluster_name" {
# description = "Cluster name"
# value = module.gke.name
# }

# output "Cluster_type" {
# description = "Cluster type (regional / zonal)"
# value = module.gke.type
# }

# output "Cluster_location" {
# description = "Cluster location (region if regional cluster, zone if zonal cluster)"
# value = module.gke.location
# }

# output "Cluster_region" {
# description = "Cluster region"
# value = module.gke.region
# }

# output "Cluster_zones" {
# description = "List of zones in which the cluster resides"
# value = module.gke.zones
# }

# output "Cluster_endpoint" {
# sensitive = true
# description = "Cluster endpoint"
# value = module.gke.endpoint
# }

# output "min_master_version" {
# description = "Minimum master kubernetes version"
# value = module.gke.min_master_version
# }

# output "logging_service" {
# description = "Logging service used"
# value = module.gke.logging_service
# }

# output "monitoring_service" {
# description = "Monitoring service used"
# value = module.gke.monitoring_service
# }

# output "master_authorized_networks_config" {
# description = "Networks from which access to master is permitted"
# value = module.gke.master_authorized_networks_config
# }

# output "master_version" {
# description = "Current master kubernetes version"
# value = module.gke.master_version
# }

# output "ca_certificate" {
# sensitive = true
# description = "Cluster ca certificate (base64 encoded)"
# value = module.gke.ca_certificate
# }

# output "network_policy_enabled" {
# description = "Whether network policy enabled"
# value = module.gke.network_policy_enabled
# }

# output "http_load_balancing_enabled" {
# description = "Whether http load balancing enabled"
# value = module.gke.http_load_balancing_enabled
# }

# output "horizontal_pod_autoscaling_enabled" {
# description = "Whether horizontal pod autoscaling enabled"
# value = module.gke.horizontal_pod_autoscaling_enabled
# }

# output "node_pools_names" {
# description = "List of node pools names"
# value = module.gke.node_pools_names
# }

# output "node_pools_versions" {
# description = "Node pool versions by node pool name"
# value = module.gke.node_pools_versions
# }

# output "service_account" {
# description = "The service account to default running nodes as if not overridden in `node_pools`."
# value = module.gke.service_account
# }
4 changes: 2 additions & 2 deletions terraform/provider.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ terraform {
}
google = {
source = "hashicorp/google"
version = "~> 4.84.0"
version = "~> 5.10.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.84.0"
version = "~> 5.10.0"
}
kubernetes = {
source = "hashicorp/kubernetes"
Expand Down
2 changes: 1 addition & 1 deletion terraform/vpc-network.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "gcp-network" {
source = "terraform-google-modules/network/google"
version = "~> 7.4.0"
version = "~> 8.1.0"
project_id = var.project_id
network_name = var.network

Expand Down

0 comments on commit e88723f

Please sign in to comment.