Skip to content

Commit 954a6eb

Browse files
more fixes
1 parent 79506f7 commit 954a6eb

File tree

1 file changed

+19
-13
lines changed

1 file changed

+19
-13
lines changed

main.tf

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ resource "helm_release" "zxporter" {
2929
name = "zxporter.kubeContextName"
3030
value = var.cluster_name
3131
},
32-
{
33-
name = "zxporter.clusterToken"
34-
value = devzero_cluster.cluster.token
35-
},
3632
{
3733
name = "zxporter.k8sProvider"
3834
value = var.cloud_provider
@@ -47,6 +43,13 @@ resource "helm_release" "zxporter" {
4743
}
4844
], var.zxporter_extra_values)
4945

46+
set_sensitive = [
47+
{
48+
name = "zxporter.clusterToken"
49+
value = devzero_cluster.cluster.token
50+
}
51+
]
52+
5053
depends_on = [devzero_cluster.cluster]
5154
}
5255

@@ -64,17 +67,13 @@ resource "helm_release" "devzero_operator" {
6467
name = "cloud"
6568
value = var.cloud_provider
6669
},
67-
{
68-
name = "operator.clusterToken"
69-
value = devzero_cluster.cluster.token
70-
},
7170
{
7271
name = "operator.clusterName"
7372
value = var.cluster_name
7473
},
7574
{
7675
name = "operator.noCloudCreds"
77-
value = var.cloud_provider == ""
76+
value = tostring(var.cloud_provider == "")
7877
},
7978
{
8079
name = "operator.endpoint"
@@ -84,10 +83,6 @@ resource "helm_release" "devzero_operator" {
8483
name = "scheduler.enabled"
8584
value = var.enable_scheduler
8685
},
87-
{
88-
name = "scheduler.controlPlaneToken"
89-
value = devzero_cluster.cluster.token
90-
},
9186
{
9287
name = "scheduler.controlPlaneAddress"
9388
value = var.endpoint
@@ -110,5 +105,16 @@ resource "helm_release" "devzero_operator" {
110105
},
111106
], var.operator_extra_values)
112107

108+
set_sensitive = [
109+
{
110+
name = "operator.clusterToken"
111+
value = devzero_cluster.cluster.token
112+
},
113+
{
114+
name = "scheduler.controlPlaneToken"
115+
value = devzero_cluster.cluster.token
116+
}
117+
]
118+
113119
depends_on = [devzero_cluster.cluster]
114120
}

0 commit comments

Comments
 (0)