Skip to content

Commit 9746a22

Browse files
robo-caphyder
robo-cap
authored and
hyder
committed
Refactor helm datasources
1 parent 1d24463 commit 9746a22

File tree

16 files changed

+86
-103
lines changed

16 files changed

+86
-103
lines changed

‎modules/bastion/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ terraform {
1717

1818
oci = {
1919
source = "oracle/oci"
20-
version = ">= 4.119.0"
20+
version = ">= 7.6.0"
2121
}
2222
}
2323
}

‎modules/cluster-addons/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ terraform {
77
required_providers {
88
oci = {
99
source = "oracle/oci"
10-
version = ">= 6.37.0"
10+
version = ">= 7.6.0"
1111
}
1212
}
1313
}

‎modules/cluster/cluster.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ resource "oci_containerengine_cluster" "k8s_cluster" {
102102
}
103103

104104
lifecycle {
105-
ignore_changes = [defined_tags, freeform_tags, cluster_pod_network_options, options["kubernetes_network_config"]]
105+
ignore_changes = [defined_tags, freeform_tags, cluster_pod_network_options, options[0].kubernetes_network_config]
106106

107107
precondition {
108108
condition = var.service_lb_subnet_id != null

‎modules/cluster/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ terraform {
77
required_providers {
88
oci = {
99
source = "oracle/oci"
10-
version = ">= 6.37.0"
10+
version = ">= 7.6.0"
1111
}
1212
}
1313
}

‎modules/extensions/autoscaler.tf‎

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -57,46 +57,38 @@ data "helm_template" "cluster_autoscaler" {
5757
for path in var.cluster_autoscaler_helm_values_files : file(path)
5858
] : null
5959

60-
set {
61-
name = "nodeSelector.oke\\.oraclecloud\\.com/cluster_autoscaler"
62-
value = "allowed"
63-
}
64-
65-
dynamic "set" {
66-
for_each = merge(local.cluster_autoscaler_defaults, var.cluster_autoscaler_helm_values)
67-
iterator = helm_value
68-
content {
69-
name = helm_value.key
70-
value = helm_value.value
71-
}
72-
}
73-
74-
dynamic "set" {
75-
for_each = local.worker_pools_autoscaling
76-
iterator = pool
77-
content {
78-
name = "autoscalingGroups[${index(keys(local.worker_pools_autoscaling), pool.key)}].name"
79-
value = lookup(pool.value, "id")
80-
}
81-
}
82-
83-
dynamic "set" {
84-
for_each = local.worker_pools_autoscaling
85-
iterator = pool
86-
content {
87-
name = "autoscalingGroups[${index(keys(local.worker_pools_autoscaling), pool.key)}].minSize"
88-
value = lookup(pool.value, "min_size", lookup(pool.value, "size"))
89-
}
90-
}
91-
92-
dynamic "set" {
93-
for_each = local.worker_pools_autoscaling
94-
iterator = pool
95-
content {
96-
name = "autoscalingGroups[${index(keys(local.worker_pools_autoscaling), pool.key)}].maxSize"
97-
value = lookup(pool.value, "max_size", lookup(pool.value, "size"))
98-
}
99-
}
60+
set = concat(
61+
[
62+
{
63+
name = "nodeSelector.oke\\.oraclecloud\\.com/cluster_autoscaler"
64+
value = "allowed"
65+
}
66+
],
67+
[ for k, v in merge(local.cluster_autoscaler_defaults, var.cluster_autoscaler_helm_values) :
68+
{
69+
name = k,
70+
value = v
71+
}
72+
],
73+
[ for k, v in local.worker_pools_autoscaling :
74+
{
75+
name = "autoscalingGroups[${index(keys(local.worker_pools_autoscaling), k)}].name",
76+
value = lookup(v, "id")
77+
}
78+
],
79+
[ for k, v in local.worker_pools_autoscaling :
80+
{
81+
name = "autoscalingGroups[${index(keys(local.worker_pools_autoscaling), k)}].minSize",
82+
value = lookup(v, "min_size", lookup(v, "size"))
83+
}
84+
],
85+
[ for k, v in local.worker_pools_autoscaling :
86+
{
87+
name = "autoscalingGroups[${index(keys(local.worker_pools_autoscaling), k)}].maxSize",
88+
value = lookup(v, "max_size", lookup(v, "size"))
89+
}
90+
],
91+
)
10092

10193
lifecycle {
10294
precondition {
@@ -136,6 +128,8 @@ resource "null_resource" "cluster_autoscaler" {
136128
}
137129

138130
provisioner "remote-exec" {
139-
inline = ["kubectl apply -f ${local.cluster_autoscaler_manifest_path}"]
131+
inline = [
132+
"kubectl apply -f ${local.cluster_autoscaler_manifest_path}"
133+
]
140134
}
141135
}

‎modules/extensions/dcgm_exporter.tf‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ data "helm_template" "dcgm_exporter" {
4747
for path in var.dcgm_exporter_helm_values_files : file(path)
4848
] : null
4949

50-
dynamic "set" {
51-
for_each = var.dcgm_exporter_helm_values
52-
iterator = helm_value
53-
content {
54-
name = helm_value.key
55-
value = helm_value.value
56-
}
57-
}
50+
set = concat(
51+
[ for k, v in var.dcgm_exporter_helm_values:
52+
{
53+
name = k,
54+
value = v
55+
}
56+
]
57+
)
5858

5959
lifecycle {
6060
precondition {

‎modules/extensions/gatekeeper.tf‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,14 @@ data "helm_template" "gatekeeper" {
2323
for path in var.gatekeeper_helm_values_files : file(path)
2424
] : null
2525

26-
# TODO Remove after merge: https://github.com/open-policy-agent/gatekeeper/pull/2593
27-
set {
28-
name = "postInstall.labelNamespace.enabled"
29-
value = "false"
30-
}
31-
32-
# TODO Remove after merge: https://github.com/open-policy-agent/gatekeeper/pull/2593
33-
set {
34-
name = "postInstall.probeWebhook.enabled"
35-
value = "false"
36-
}
37-
38-
dynamic "set" {
39-
for_each = var.gatekeeper_helm_values
40-
iterator = helm_value
41-
content {
42-
name = helm_value.key
43-
value = helm_value.value
44-
}
45-
}
26+
set = concat(
27+
[ for k, v in var.gatekeeper_helm_values:
28+
{
29+
name = k,
30+
value = v
31+
}
32+
]
33+
)
4634

4735
lifecycle {
4836
precondition {

‎modules/extensions/metricserver.tf‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ data "helm_template" "metrics_server" {
2323
for path in var.metrics_server_helm_values_files : file(path)
2424
] : null
2525

26-
dynamic "set" {
27-
for_each = var.metrics_server_helm_values
28-
iterator = helm_value
29-
content {
30-
name = helm_value.key
31-
value = helm_value.value
32-
}
33-
}
26+
set = concat(
27+
[ for k, v in var.metrics_server_helm_values:
28+
{
29+
name = k,
30+
value = v
31+
}
32+
]
33+
)
3434

3535
lifecycle {
3636
precondition {

‎modules/extensions/prometheus.tf‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,21 @@ data "helm_template" "prometheus" {
3131
[local.prometheus_helm_values_yaml],
3232
[for path in var.prometheus_helm_values_files : file(path)],
3333
)
34-
35-
set {
36-
name = "podSecurityPolicy.enabled"
37-
value = "false"
38-
}
39-
40-
dynamic "set" {
41-
for_each = var.prometheus_helm_values
42-
iterator = helm_value
43-
content {
44-
name = helm_value.key
45-
value = helm_value.value
46-
}
47-
}
34+
35+
set = concat(
36+
[
37+
{
38+
name = "podSecurityPolicy.enabled"
39+
value = "false"
40+
},
41+
],
42+
[ for k, v in var.prometheus_helm_values:
43+
{
44+
name = k,
45+
value = v
46+
}
47+
]
48+
)
4849

4950
lifecycle {
5051
precondition {

‎modules/extensions/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ terraform {
77
required_providers {
88
helm = {
99
source = "hashicorp/helm"
10-
version = ">= 2.9.0"
10+
version = ">= 3.0.1"
1111
}
1212

1313
http = {

0 commit comments

Comments
 (0)