Skip to content

Commit b55ab1d

Browse files
committed
fix: more comments
Signed-off-by: matttrach <matt.trachier@suse.com>
1 parent 5a58d44 commit b55ab1d

2 files changed

Lines changed: 18 additions & 8 deletions

File tree

.github/workflows/validate.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@ jobs:
232232
233233
lint-tests:
234234
runs-on: ubuntu-latest
235+
permissions:
236+
contents: read
235237
steps:
236238
# https://github.com/actions/checkout/releases
237239
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

modules/install_rancher/rancher/main.tf

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11

22
locals {
3-
rancher_domain = var.project_domain
4-
rancher_helm_repo = var.rancher_helm_repo
5-
rancher_helm_channel = var.rancher_helm_channel
6-
rancher_version = replace(var.rancher_version, "v", "") # don't include the v
7-
rke2_version = var.rke2_version
8-
rke2_minor = tonumber(split(".", local.rke2_version)[1])
9-
helm_chart_use_strategy = var.rancher_helm_chart_use_strategy
10-
rancher_helm_chart_values = var.rancher_helm_chart_values != null && var.rancher_helm_chart_values != "" ? jsondecode(base64decode(var.rancher_helm_chart_values)) : {}
3+
rancher_domain = var.project_domain
4+
rancher_helm_repo = var.rancher_helm_repo
5+
rancher_helm_channel = var.rancher_helm_channel
6+
rancher_version = replace(var.rancher_version, "v", "") # don't include the v
7+
rke2_version = var.rke2_version
8+
rke2_minor = tonumber(split(".", local.rke2_version)[1])
9+
helm_chart_use_strategy = var.rancher_helm_chart_use_strategy
10+
rancher_helm_chart_values = (
11+
var.rancher_helm_chart_values != null && var.rancher_helm_chart_values != "" ?
12+
try(
13+
jsondecode(base64decode(var.rancher_helm_chart_values)),
14+
jsondecode(var.rancher_helm_chart_values),
15+
{},
16+
) :
17+
{}
18+
)
1119
default_hc_values = {
1220
"hostname" = local.rancher_domain
1321
"replicas" = "3"

0 commit comments

Comments
 (0)