Skip to content

Commit db9ac22

Browse files
fix(ci): render infra config (#2223)
Description Fixes the infrastructure configuration rendering for nested e2e clusters by correcting the YAML structure and the Helm template lookup logic. Changes: - Fixed YAML indentation in e2e-reusable-pipeline.yml - moved networkConfig to the correct nesting level - Fixed _helpers.tpl to properly extract networkConfig from the instances values using get function instead of incorrect dig call --------------- Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
1 parent 0ff84cb commit db9ac22

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/e2e-reusable-pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ jobs:
240240
size: ${{ inputs.cluster_config_workers_memory }}
241241
additionalDisks:
242242
- size: 50Gi
243-
networkConfig:
244-
clusterNetworkName: ${{ inputs.nested_cluster_network_name }}
243+
networkConfig:
244+
clusterNetworkName: ${{ inputs.nested_cluster_network_name }}
245245
EOF
246246
247247
mkdir -p tmp

test/dvp-static-cluster/charts/infra/templates/_helpers.tpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ group: {{ $prefix }}
1616
{{- $ctx := index . 0 -}}
1717
{{- $name := index . 1 -}}
1818
{{- $cfg := index . 2 -}}
19-
{{- $clusterNetworkName := dig $ctx.Values "networkConfig" "clusterNetworkName" "" -}}
19+
{{- $networkConfig := get $ctx.Values.instances "networkConfig" | default dict -}}
20+
{{- $clusterNetworkName := get $networkConfig "clusterNetworkName" | default "" -}}
21+
2022
---
2123
apiVersion: virtualization.deckhouse.io/v1alpha2
2224
kind: VirtualMachine

0 commit comments

Comments
 (0)