Fix scope issue inside loop

This commit is contained in:
Waqar Ahmed 2020-10-02 23:55:04 +05:00
parent 08b3e9e5c9
commit b4456f81f7
3 changed files with 6 additions and 9 deletions

View File

@ -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 }}

View File

@ -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:

View File

@ -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 }}