Sfoglia il codice sorgente

Fix scope issue inside loop

Waqar Ahmed 4 anni fa
parent
commit
b4456f81f7

+ 1 - 1
charts/ix-chart/2009.0.1/templates/_helpers.tpl

@@ -66,5 +66,5 @@ Create the name of the service account to use
 Name for external interfaces to be added to chart
 */}}
 {{- define "externalInterfaceName" -}}
-{{- printf "%s" .Release.Name }}
+{{- printf "ix-%s" $.Release.Name }}
 {{- end }}

+ 2 - 5
charts/ix-chart/2009.0.1/templates/deployment.yaml

@@ -14,11 +14,8 @@ spec:
         {{- include "ix-chart.selectorLabels" . | nindent 8 }}
       annotations:
         rollme: {{ randAlphaNum 5 | quote }}
-        {{- if .Values.externalInterfaces }}
-        k8s.v1.cni.cncf.io/networks:
-          {{- range $index, $iface := .Values.externalInterfaces }}
-          - {{ include "externalInterfaceName" . }}-{{ $index }}
-          {{- end }}
+        {{- if .Values.externalInterfacesConfigurationNames }}
+        k8s.v1.cni.cncf.io/networks: {{ join ", " .Values.externalInterfacesConfigurationNames }}
         {{- end }}
     spec:
       containers:

+ 3 - 3
charts/ix-chart/2009.0.1/templates/external-interfaces.yaml.py

@@ -1,9 +1,9 @@
-{{- range $index, $iface := .Values.externalInterfaces }}
+{{- range $index, $iface := .Values.externalInterfacesConfiguration }}
+---
 apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
-  name: {{ include "externalInterfaceName" . }}-{{ $index }}
+  name: ix-{{ $.Release.Name }}-{{ $index }}
 spec:
   config: '{{ $iface }}'
-----------------------------------------------------------
 {{- end }}