Skip to content

Commit fe84339

Browse files
committed
Migrate cluster modules from map(map(string)) to map(object)
* refactor code to not rely on _modules anymore removing one level of module nesting for easier maintainability * provide move blocks for all affected modules and resources * introduce mandatory cluster output on cluster modules and corresponding input on node pool modulesto reduce dependence on data sources causing issues when using the node pool module for the clsuter provisioned default node pool * unify node pool module inputs between providers using new cluster module output * reduce use of locals to improve DX for contributions and maintenance work * added support for merging of nested maps and objects to inheritance module and updated previous string vars to more specific types
1 parent 409189c commit fe84339

114 files changed

Lines changed: 1761 additions & 2860 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jobs:
173173
sed -i 's/region = ""/region = "eu-west-1"/g' eks_zero_providers.tf || true
174174
175175
# EKS: set cluster_availability_zones
176-
sed -i 's/cluster_availability_zones = ""/cluster_availability_zones = "eu-west-1a,eu-west-1b"/g' eks_zero_cluster.tf || true
176+
sed -i 's/cluster_availability_zones = \[\]/cluster_availability_zones = ["eu-west-1a", "eu-west-1b"]/g' eks_zero_cluster.tf || true
177177
178178
# GKE: set project_id
179179
sed -i 's/project_id = ""/project_id = "terraform-kubestack-testing"/g' gke_zero_cluster.tf || true
@@ -182,7 +182,7 @@ jobs:
182182
sed -i 's/region = ""/region = "europe-west1"/g' gke_zero_cluster.tf || true
183183
184184
# GKE: set cluster_node_locations
185-
sed -i 's/cluster_node_locations = ""/cluster_node_locations = "europe-west1-b,europe-west1-c,europe-west1-d"/g' gke_zero_cluster.tf || true
185+
sed -i 's/cluster_node_locations = \[\]/cluster_node_locations = ["europe-west1-b", "europe-west1-c", "europe-west1-d"]/g' gke_zero_cluster.tf || true
186186
187187
- name: "Terraform init"
188188
working-directory: ./kubestack-starter-${{ matrix.starter }}

aws/_modules/eks/ingress.tf

Lines changed: 0 additions & 5 deletions
This file was deleted.

aws/_modules/eks/main.tf

Lines changed: 0 additions & 17 deletions
This file was deleted.

aws/_modules/eks/master.tf

Lines changed: 0 additions & 39 deletions
This file was deleted.

aws/_modules/eks/node_pool.tf

Lines changed: 0 additions & 37 deletions
This file was deleted.

aws/_modules/eks/node_pool/launch_template.tf

Lines changed: 0 additions & 63 deletions
This file was deleted.

aws/_modules/eks/node_pool/main.tf

Lines changed: 0 additions & 60 deletions
This file was deleted.

aws/_modules/eks/node_pool/variables.tf

Lines changed: 0 additions & 108 deletions
This file was deleted.

aws/_modules/eks/node_pool/versions.tf

Lines changed: 0 additions & 4 deletions
This file was deleted.

aws/_modules/eks/outputs.tf

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)