From 1e0d22c772a6ff31c67d9a609b63547484eb0302 Mon Sep 17 00:00:00 2001
From: Bob Callaway <bobcallaway@users.noreply.github.com>
Date: Sun, 5 Nov 2023 06:56:07 -0500
Subject: [PATCH] clean up terraform for post-install modules (#814)

* clean up terraform for post-install modules

Signed-off-by: Bob Callaway <bcallaway@google.com>

* pin releases instead of ranges

Signed-off-by: Bob Callaway <bcallaway@google.com>

---------

Signed-off-by: Bob Callaway <bcallaway@google.com>
---
 terraform/gcp/modules/argocd/versions.tf         | 16 ++--------------
 .../modules/external_secrets/external_secrets.tf |  2 --
 .../gcp/modules/external_secrets/versions.tf     | 14 +++-----------
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/terraform/gcp/modules/argocd/versions.tf b/terraform/gcp/modules/argocd/versions.tf
index d3543ca30..a57f15579 100644
--- a/terraform/gcp/modules/argocd/versions.tf
+++ b/terraform/gcp/modules/argocd/versions.tf
@@ -15,28 +15,16 @@
  */
 
 terraform {
-  required_version = ">= 1.1.3, < 1.4.0"
+  required_version = "1.6.3"
 
   required_providers {
-    google = {
-      version = ">= 4.11.0, < 4.38.0"
-      source  = "hashicorp/google"
-    }
-    google-beta = {
-      version = ">= 4.11.0, < 4.38.0"
-      source  = "hashicorp/google-beta"
-    }
-    random = {
-      version = ">= 3.1.0, < 3.2.0"
-      source  = "hashicorp/random"
-    }
     kubectl = {
       source  = "gavinbunney/kubectl"
       version = "1.14.0"
     }
     helm = {
       source  = "hashicorp/helm"
-      version = "2.6.0"
+      version = "2.11.0"
     }
   }
 }
diff --git a/terraform/gcp/modules/external_secrets/external_secrets.tf b/terraform/gcp/modules/external_secrets/external_secrets.tf
index 011c2f1e3..f84d18119 100644
--- a/terraform/gcp/modules/external_secrets/external_secrets.tf
+++ b/terraform/gcp/modules/external_secrets/external_secrets.tf
@@ -80,8 +80,6 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: trillian-system
-  labels:
-    name: trillian-system
 YAML
 }
 
diff --git a/terraform/gcp/modules/external_secrets/versions.tf b/terraform/gcp/modules/external_secrets/versions.tf
index d3543ca30..3dd9d1832 100644
--- a/terraform/gcp/modules/external_secrets/versions.tf
+++ b/terraform/gcp/modules/external_secrets/versions.tf
@@ -15,28 +15,20 @@
  */
 
 terraform {
-  required_version = ">= 1.1.3, < 1.4.0"
+  required_version = "1.6.3"
 
   required_providers {
     google = {
-      version = ">= 4.11.0, < 4.38.0"
+      version = "5.4.0"
       source  = "hashicorp/google"
     }
-    google-beta = {
-      version = ">= 4.11.0, < 4.38.0"
-      source  = "hashicorp/google-beta"
-    }
-    random = {
-      version = ">= 3.1.0, < 3.2.0"
-      source  = "hashicorp/random"
-    }
     kubectl = {
       source  = "gavinbunney/kubectl"
       version = "1.14.0"
     }
     helm = {
       source  = "hashicorp/helm"
-      version = "2.6.0"
+      version = "2.11.0"
     }
   }
 }