Skip to content

Commit 4386c59

Browse files
committed
Convert Helm set blocks to list format
1 parent b322505 commit 4386c59

File tree

4 files changed

+42
-36
lines changed

4 files changed

+42
-36
lines changed

aws_csi_secrets_store.tf

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ resource "helm_release" "csi_secrets_store" {
88
namespace = "kube-system"
99
create_namespace = false
1010

11-
set {
12-
name = "syncSecret.enabled"
13-
value = "true"
14-
}
15-
16-
set {
17-
name = "enableSecretRotation"
18-
value = "true"
19-
}
11+
set = [
12+
{
13+
name = "syncSecret.enabled"
14+
value = "true"
15+
},
16+
17+
{
18+
name = "enableSecretRotation"
19+
value = "true"
20+
}
21+
]
2022
}
2123

2224
data "http" "csi_secrets_store_aws_provider" {

cluster.tf

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -174,20 +174,22 @@ resource "helm_release" "calico" {
174174
version = var.calico_version
175175

176176
# Set Calico-specific configuration values
177-
set {
178-
name = "kubernetesProvider"
179-
value = "EKS"
180-
}
177+
set = [
178+
{
179+
name = "kubernetesProvider"
180+
value = "EKS"
181+
},
181182

182-
set {
183-
name = "cni.type"
184-
value = "Calico"
185-
}
183+
{
184+
name = "cni.type"
185+
value = "Calico"
186+
},
186187

187-
set {
188-
name = "calicoNetwork.bgp"
189-
value = "Disabled"
190-
}
188+
{
189+
name = "calicoNetwork.bgp"
190+
value = "Disabled"
191+
}
192+
]
191193
}
192194

193195
resource "null_resource" "delete_aws_node" {

helm.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
provider "helm" {
2-
kubernetes {
2+
kubernetes = {
33
host = aws_eks_cluster.cluster.endpoint
44
cluster_ca_certificate = base64decode(aws_eks_cluster.cluster.certificate_authority.0.data)
55
token = data.aws_eks_cluster_auth.cluster.token

karpenter.tf

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,22 @@ resource "helm_release" "karpenter" {
4040
chart = "karpenter"
4141
version = var.karpenter_version
4242

43-
set {
44-
name = "settings.clusterName"
45-
value = aws_eks_cluster.cluster.name
46-
}
47-
48-
set {
49-
name = "settings.clusterEndpoint"
50-
value = aws_eks_cluster.cluster.endpoint
51-
}
52-
53-
set {
54-
name = "serviceAccount.annotations.eks\\.amazonaws\\.com/role-arn"
55-
value = module.karpenter[0].iam_role_arn
56-
}
43+
set = [
44+
{
45+
name = "settings.clusterName"
46+
value = aws_eks_cluster.cluster.name
47+
},
48+
49+
{
50+
name = "settings.clusterEndpoint"
51+
value = aws_eks_cluster.cluster.endpoint
52+
},
53+
54+
{
55+
name = "serviceAccount.annotations.eks\\.amazonaws\\.com/role-arn"
56+
value = module.karpenter[0].iam_role_arn
57+
}
58+
]
5759

5860
depends_on = [
5961
helm_release.karpenter_crd

0 commit comments

Comments
 (0)