fix(k3s): avoid jinja values attr collisions

This commit is contained in:
Haitao Pan 2026-04-04 12:59:02 +08:00
parent 16b5c90ee4
commit 3f21540ec6
2 changed files with 18 additions and 18 deletions

View File

@ -1,22 +1,22 @@
etcd:
enabled: {{ k3s_platform_values.components.apisix.values.etcd.enabled | bool | lower }}
enabled: {{ k3s_platform_values.components.apisix['values'].etcd.enabled | bool | lower }}
externalEtcd:
user: {{ k3s_platform_values.components.apisix.values.externalEtcd.user | to_json }}
user: {{ k3s_platform_values.components.apisix['values'].externalEtcd.user | to_json }}
ingress-controller:
enabled: {{ k3s_platform_values.components.apisix.values.ingress-controller.enabled | bool | lower }}
enabled: {{ k3s_platform_values.components.apisix['values']['ingress-controller'].enabled | bool | lower }}
dashboard:
enabled: {{ k3s_platform_values.components.apisix.values.dashboard.enabled | bool | lower }}
enabled: {{ k3s_platform_values.components.apisix['values'].dashboard.enabled | bool | lower }}
gateway:
enabled: {{ k3s_platform_values.components.apisix.values.gateway.enabled | bool | lower }}
type: {{ k3s_platform_values.components.apisix.values.gateway.type | to_json }}
enabled: {{ k3s_platform_values.components.apisix['values'].gateway.enabled | bool | lower }}
type: {{ k3s_platform_values.components.apisix['values'].gateway.type | to_json }}
control:
enabled: {{ k3s_platform_values.components.apisix.values.control.enabled | bool | lower }}
enabled: {{ k3s_platform_values.components.apisix['values'].control.enabled | bool | lower }}
apisix:
admin:
enabled: {{ k3s_platform_values.components.apisix.values.apisix.admin.enabled | bool | lower }}
enabled: {{ k3s_platform_values.components.apisix['values'].apisix.admin.enabled | bool | lower }}
deployment:
mode: {{ k3s_platform_values.components.apisix.values.apisix.deployment.mode | to_json }}
role: {{ k3s_platform_values.components.apisix.values.apisix.deployment.role | to_json }}
mode: {{ k3s_platform_values.components.apisix['values'].apisix.deployment.mode | to_json }}
role: {{ k3s_platform_values.components.apisix['values'].apisix.deployment.role | to_json }}
standalone:
config: |
{{ k3s_platform_values.components.apisix.values.apisix.deployment.standalone.config | indent(8, true) }}
{{ k3s_platform_values.components.apisix['values'].apisix.deployment.standalone.config | indent(8, true) }}

View File

@ -1,10 +1,10 @@
provider: {{ k3s_platform_values.components.externalDns.values.provider | to_json }}
policy: {{ k3s_platform_values.components.externalDns.values.policy | to_json }}
registry: {{ k3s_platform_values.components.externalDns.values.registry | to_json }}
txtOwnerId: {{ k3s_platform_values.components.externalDns.values.txtOwnerId | to_json }}
provider: {{ k3s_platform_values.components.externalDns['values'].provider | to_json }}
policy: {{ k3s_platform_values.components.externalDns['values'].policy | to_json }}
registry: {{ k3s_platform_values.components.externalDns['values'].registry | to_json }}
txtOwnerId: {{ k3s_platform_values.components.externalDns['values'].txtOwnerId | to_json }}
sources:
{{ k3s_platform_values.components.externalDns.values.sources | to_nice_yaml(indent=2) | indent(2, true) }}
{{ k3s_platform_values.components.externalDns['values'].sources | to_nice_yaml(indent=2) | indent(2, true) }}
domainFilters:
{{ k3s_platform_values.components.externalDns.values.domainFilters | to_nice_yaml(indent=2) | indent(2, true) }}
{{ k3s_platform_values.components.externalDns['values'].domainFilters | to_nice_yaml(indent=2) | indent(2, true) }}
env:
{{ k3s_platform_values.components.externalDns.values.env | to_nice_yaml(indent=2) | indent(2, true) }}
{{ k3s_platform_values.components.externalDns['values'].env | to_nice_yaml(indent=2) | indent(2, true) }}