fix(anthos-attached-clusters): add providers and lint (#692)

GoogleCloudPlatform · Aug 28, 2024 · 393d625 · 393d625
1 parent ef3baae
commit 393d625
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 13 deletions.
diff --git a/anthos-attached-clusters/aks/main.tf b/anthos-attached-clusters/aks/main.tf
@@ -20,9 +20,6 @@ locals {
   }
 }
 
-data "azurerm_subscription" "current" {
-}
-
 resource "azurerm_resource_group" "aks" {
   name     = "${var.name_prefix}-rg"
   location = var.azure_region
@@ -59,12 +56,12 @@ data "google_project" "project" {
 provider "helm" {
   alias = "bootstrap_installer"
   kubernetes {
-    host                   = azurerm_kubernetes_cluster.aks.kube_config.0.host
-    username               = azurerm_kubernetes_cluster.aks.kube_config.0.username
-    password               = azurerm_kubernetes_cluster.aks.kube_config.0.password
-    client_certificate     = base64decode(azurerm_kubernetes_cluster.aks.kube_config.0.client_certificate)
-    client_key             = base64decode(azurerm_kubernetes_cluster.aks.kube_config.0.client_key)
-    cluster_ca_certificate = base64decode(azurerm_kubernetes_cluster.aks.kube_config.0.cluster_ca_certificate)
+    host                   = azurerm_kubernetes_cluster.aks.kube_config[0].host
+    username               = azurerm_kubernetes_cluster.aks.kube_config[0].username
+    password               = azurerm_kubernetes_cluster.aks.kube_config[0].password
+    client_certificate     = base64decode(azurerm_kubernetes_cluster.aks.kube_config[0].client_certificate)
+    client_key             = base64decode(azurerm_kubernetes_cluster.aks.kube_config[0].client_key)
+    cluster_ca_certificate = base64decode(azurerm_kubernetes_cluster.aks.kube_config[0].cluster_ca_certificate)
   }
 }
 

diff --git a/anthos-attached-clusters/aks/provider.tf b/anthos-attached-clusters/aks/provider.tf
@@ -25,7 +25,8 @@ terraform {
       version = ">=5.0.0"
     }
     helm = {
-      source = "hashicorp/helm"
+      source  = "hashicorp/helm"
+      version = "~> 2.0"
     }
   }
   required_version = ">= 0.13"

diff --git a/anthos-attached-clusters/eks/provider.tf b/anthos-attached-clusters/eks/provider.tf
@@ -25,7 +25,8 @@ terraform {
       version = ">=5.0.0"
     }
     helm = {
-      source = "hashicorp/helm"
+      source  = "hashicorp/helm"
+      version = "~> 2.0"
     }
   }
   required_version = ">= 0.13"

diff --git a/anthos-attached-clusters/kind/oidc/providers.tf b/anthos-attached-clusters/kind/oidc/providers.tf
@@ -17,8 +17,10 @@
 terraform {
   required_providers {
     http-full = {
-      source = "salrashid123/http-full"
+      source  = "salrashid123/http-full"
+      version = "~> 1.3"
     }
   }
+  required_version = ">= 0.13"
 }
 
diff --git a/anthos-attached-clusters/kind/provider.tf b/anthos-attached-clusters/kind/provider.tf
@@ -17,8 +17,18 @@
 terraform {
   required_providers {
     kind = {
-      source = "tehcyx/kind"
+      source  = "tehcyx/kind"
+      version = "~> 0.6"
+    }
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 5.0"
+    }
+    helm = {
+      source  = "hashicorp/helm"
+      version = "~> 2.0"
     }
   }
+  required_version = ">= 0.13"
 }
 
diff --git a/anthos-attached-clusters/modules/attached-install-manifest/provider.tf b/anthos-attached-clusters/modules/attached-install-manifest/provider.tf
@@ -24,6 +24,10 @@ terraform {
       source  = "hashicorp/helm"
       version = ">=2.13.1"
     }
+    local = {
+      source  = "hashicorp/local"
+      version = "~> 2.2"
+    }
   }
   required_version = ">= 0.13"
 }