Merge pull request #129 from kbst/bettervarname

Make clear base_key is configuration related
kbst · Aug 25, 2020 · 8c44d51 · 8c44d51
2 parents 5ba04b7 + bd35918
commit 8c44d51
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 28 deletions.
diff --git a/aws/cluster/configuration.tf b/aws/cluster/configuration.tf
@@ -2,7 +2,7 @@ module "configuration" {
   source = "../../common/configuration"
 
   configuration = var.configuration
-  base_key      = var.base_key
+  base_key      = var.configuration_base_key
 }
 
 locals {

diff --git a/aws/cluster/variables.tf b/aws/cluster/variables.tf
@@ -3,14 +3,14 @@ variable "configuration" {
   description = "Map with per workspace cluster configuration."
 }
 
-variable "manifest_path" {
+variable "configuration_base_key" {
   type        = string
-  description = "Path to Kustomize overlay to build."
-  default     = null
+  description = "The key in the configuration map all other keys inherit from."
+  default     = "apps"
 }
 
-variable "base_key" {
+variable "manifest_path" {
   type        = string
-  description = "The key in the configuration map all other keys inherit from."
-  default     = "apps"
+  description = "Path to Kustomize overlay to build."
+  default     = null
 }
diff --git a/azurerm/cluster/configuration.tf b/azurerm/cluster/configuration.tf
@@ -2,7 +2,7 @@ module "configuration" {
   source = "../../common/configuration"
 
   configuration = var.configuration
-  base_key      = var.base_key
+  base_key      = var.configuration_base_key
 }
 
 locals {

diff --git a/azurerm/cluster/variables.tf b/azurerm/cluster/variables.tf
@@ -3,14 +3,14 @@ variable "configuration" {
   description = "Map with per workspace cluster configuration."
 }
 
-variable "manifest_path" {
+variable "configuration_base_key" {
   type        = string
-  description = "Path to Kustomize overlay to build."
-  default     = null
+  description = "The key in the configuration map all other keys inherit from."
+  default     = "apps"
 }
 
-variable "base_key" {
+variable "manifest_path" {
   type        = string
-  description = "The key in the configuration map all other keys inherit from."
-  default     = "apps"
+  description = "Path to Kustomize overlay to build."
+  default     = null
 }
diff --git a/google/cluster/configuration.tf b/google/cluster/configuration.tf
@@ -2,7 +2,7 @@ module "configuration" {
   source = "../../common/configuration"
 
   configuration = var.configuration
-  base_key      = var.base_key
+  base_key      = var.configuration_base_key
 }
 
 locals {

diff --git a/google/cluster/variables.tf b/google/cluster/variables.tf
@@ -3,14 +3,14 @@ variable "configuration" {
   description = "Map with per workspace cluster configuration."
 }
 
-variable "manifest_path" {
+variable "configuration_base_key" {
   type        = string
-  description = "Path to Kustomize overlay to build."
-  default     = null
+  description = "The key in the configuration map all other keys inherit from."
+  default     = "apps"
 }
 
-variable "base_key" {
+variable "manifest_path" {
   type        = string
-  description = "The key in the configuration map all other keys inherit from."
-  default     = "apps"
+  description = "Path to Kustomize overlay to build."
+  default     = null
 }
diff --git a/kind/cluster/configuration.tf b/kind/cluster/configuration.tf
@@ -2,7 +2,7 @@ module "configuration" {
   source = "../../common/configuration"
 
   configuration = var.configuration
-  base_key      = var.base_key
+  base_key      = var.configuration_base_key
 }
 
 locals {

diff --git a/kind/cluster/variables.tf b/kind/cluster/variables.tf
@@ -3,14 +3,14 @@ variable "configuration" {
   description = "Map with per workspace cluster configuration."
 }
 
-variable "manifest_path" {
+variable "configuration_base_key" {
   type        = string
-  description = "Path to Kustomize overlay to build."
-  default     = null
+  description = "The key in the configuration map all other keys inherit from."
+  default     = "apps"
 }
 
-variable "base_key" {
+variable "manifest_path" {
   type        = string
-  description = "The key in the configuration map all other keys inherit from."
-  default     = "apps"
+  description = "Path to Kustomize overlay to build."
+  default     = null
 }