Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ops 4221 change node names #19

Merged
merged 11 commits into from
Dec 19, 2023
Merged

Ops 4221 change node names #19

Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4caef9d
change name of nodes
aimee-889 Dec 11, 2023
9f55f9b
fix replace function
aimee-889 Dec 11, 2023
2ec5b5d
delete unused local var
aimee-889 Dec 11, 2023
8a9aa74
fix replace function
aimee-889 Dec 11, 2023
1d2c78d
try to clean name
aimee-889 Dec 11, 2023
d5c4152
try to clean name
aimee-889 Dec 11, 2023
1dedf11
only change scaling nodepool for no breaking changes
aimee-889 Dec 15, 2023
efdb351
separate name and terraform index key naming
aimee-889 Dec 18, 2023
ee53f8e
fix name to not have --
aimee-889 Dec 18, 2023
d27aa87
delete unneeded comment
aimee-889 Dec 18, 2023
cc70cf7
delete unneeded comment
aimee-889 Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions modules/ionos-k8s-cluster/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ resource "ionoscloud_k8s_cluster" "cluster" {
#----

resource "ionoscloud_k8s_node_pool" "nodepool_scaling" {
for_each = {for np in local.nodepool_per_zone_creator : "${np.availability_zone}-${np.purpose}-${np.nodepool_index}" => np if np.auto_scaling == true}
for_each = {for np in local.nodepool_per_zone_creator : lower("${local.cluster_name}-${replace(np.availability_zone, "_", "")}-${length(np.purpose) > 0 ? "${np.purpose}-" : ""}nodepool-${np.nodepool_index}") => np if np.auto_scaling == true}
aimee-889 marked this conversation as resolved.
Show resolved Hide resolved
availability_zone = each.value.availability_zone
name = each.key
k8s_version = ionoscloud_k8s_cluster.cluster.k8s_version
Expand Down Expand Up @@ -73,10 +73,10 @@ resource "ionoscloud_k8s_node_pool" "nodepool_scaling" {
#----

resource "ionoscloud_k8s_node_pool" "nodepool_legacy" {
for_each = {for np in local.nodepool_per_zone_creator : "${np.availability_zone}-${np.purpose}-${np.nodepool_index}" => np if np.auto_scaling == false}
for_each = {for np in local.nodepool_per_zone_creator : lower("${local.cluster_name}-${replace(np.availability_zone, "_", "")}-${length(np.purpose) > 0 ? "${np.purpose}-" : ""}nodepool-${np.nodepool_index}") => np if np.auto_scaling == false}
aimee-889 marked this conversation as resolved.
Show resolved Hide resolved
availability_zone = each.value.availability_zone
#The name needs to be changed, not only legacy pools have auto_scaling= false and thus we need an additional check
name = each.value.purpose != "legacy" ? each.key : each.value.availability_zone == "ZONE_1" ? "${local.cluster_name}-zone1-nodepool-${each.value.nodepool_index}":"${local.cluster_name}-zone2-nodepool-${each.value.nodepool_index}"
name = each.value.purpose != "legacy" ? each.key : lower("${local.cluster_name}-${replace(each.value.availability_zone, "_", "")}-nodepool-${each.value.nodepool_index}")
k8s_version = ionoscloud_k8s_cluster.cluster.k8s_version
allow_replace = each.value.allow_node_pool_replacement
# the lans are created as a dynamic block - they help to dynamically construct repeatable nested blocks
Expand Down Expand Up @@ -117,7 +117,7 @@ resource "ionoscloud_k8s_node_pool" "nodepool_legacy" {
}

resource "ionoscloud_ipblock" "ippools" {
for_each = {for np in local.nodepool_per_zone_creator : "${np.availability_zone}-${np.purpose}-${np.nodepool_index}" => np if np.create_public_ip_pools == true}
for_each = {for np in local.nodepool_per_zone_creator : lower("${local.cluster_name}-${replace(np.availability_zone, "_", "")}-${length(np.purpose) > 0 ? "${np.purpose}-" : ""}nodepool-${np.nodepool_index}") => np if np.create_public_ip_pools == true}
name = each.key
location = var.datacenter_location
size = each.value.auto_scaling ? each.value.max_node_count + 1 : each.value.node_count + 1
Expand Down
Loading