Addressing #152

cloudbees · Jun 24, 2024 · 5f1b45e · 5f1b45e
1 parent ce85675
commit 5f1b45e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 20 deletions.
diff --git a/.cloudbees/workflows/bp-tf-ci.yaml b/.cloudbees/workflows/bp-tf-ci.yaml
@@ -28,6 +28,7 @@ env:
       company = "CloudBees Inc."
     }
     suffix = "ci-v4"
+    ci = true
 
 jobs:
   init:

diff --git a/blueprints/01-getting-started/main.tf b/blueprints/01-getting-started/main.tf
@@ -226,13 +226,11 @@ resource "kubernetes_storage_class_v1" "gp3" {
 
 }
 
-resource "null_resource" "create_kubeconfig" {
-
+# Kubeconfig
+resource "terraform_data" "create_kubeconfig" {
   depends_on = [module.eks]
 
-  triggers = {
-    always_run = timestamp()
-  }
+  triggers_replace = var.ci ? [timestamp()] : []
 
   provisioner "local-exec" {
     command = "aws eks update-kubeconfig --name ${module.eks.cluster_name} --region ${local.region} --kubeconfig ${local.kubeconfig_file_path}"

diff --git a/blueprints/01-getting-started/providers.tf b/blueprints/01-getting-started/providers.tf
@@ -14,10 +14,6 @@ terraform {
       source  = "hashicorp/helm"
       version = ">= 2.5.1"
     }
-    null = {
-      source  = "hashicorp/null"
-      version = ">= 3.1.0"
-    }
   }
 
 }

diff --git a/blueprints/01-getting-started/variables.tf b/blueprints/01-getting-started/variables.tf
@@ -24,3 +24,9 @@ variable "suffix" {
     error_message = "The suffix cannot contain more than 10 characters."
   }
 }
+
+variable "ci" {
+  description = "Running in a CI Service vs locally. False when running locally, true when running in a CI service"
+  default     = false
+  type        = bool
+}
diff --git a/blueprints/02-at-scale/main.tf b/blueprints/02-at-scale/main.tf
@@ -643,14 +643,11 @@ resource "kubernetes_storage_class_v1" "efs" {
 }
 
 # Kubeconfig
-
-resource "null_resource" "create_kubeconfig" {
-
+resource "terraform_data" "create_kubeconfig" {
   depends_on = [module.eks]
 
-  triggers = {
-    always_run = timestamp()
-  }
+  triggers_replace = var.ci ? [timestamp()] : []
+
   provisioner "local-exec" {
     command = "aws eks update-kubeconfig --name ${module.eks.cluster_name} --region ${local.region} --kubeconfig ${local.kubeconfig_file_path}"
   }

diff --git a/blueprints/02-at-scale/providers.tf b/blueprints/02-at-scale/providers.tf
@@ -24,11 +24,6 @@ terraform {
       version = ">= 0.7.1"
     }
 
-    null = {
-      source  = "hashicorp/null"
-      version = ">= 3.1.0"
-    }
-
     random = {
       source  = "hashicorp/random"
       version = ">= 3.6.1"

diff --git a/blueprints/02-at-scale/variables.tf b/blueprints/02-at-scale/variables.tf
@@ -36,3 +36,9 @@ variable "gh_token" {
   default     = "ExampleToken1234"
   type        = string
 }
+
+variable "ci" {
+  description = "Running in a CI Service vs locally. False when running locally, true when running in a CI service,"
+  default     = false
+  type        = bool
+}