From d7c9ae7fa661692fd1bfbf8042676554f088c808 Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sat, 29 May 2021 13:15:53 +0200 Subject: [PATCH] fix wrong references for externalInterfaces --- charts/library/common/Chart.yaml | 2 +- charts/library/common/templates/_all.tpl | 2 ++ .../library/common/templates/classes/_externalInterfaces.tpl | 2 +- charts/library/common/templates/lib/chart/_annotations.tpl | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml index 56f65e5b89a..41820289750 100644 --- a/charts/library/common/Chart.yaml +++ b/charts/library/common/Chart.yaml @@ -19,4 +19,4 @@ name: common sources: - https://github.com/truecharts/apps/tree/master/library/common type: library -version: 5.1.1 +version: 5.1.2 diff --git a/charts/library/common/templates/_all.tpl b/charts/library/common/templates/_all.tpl index 89d9c92cb99..5a022d2496f 100644 --- a/charts/library/common/templates/_all.tpl +++ b/charts/library/common/templates/_all.tpl @@ -34,4 +34,6 @@ Main entrypoint for the common library chart. It will render all underlying temp {{ include "common.class.portal" . | nindent 0 }} {{ include "common.class.mountPermissions" . | nindent 0 }} + {{ include "common.classes.externalInterfaces" . | nindent 0 }} + {{- end -}} diff --git a/charts/library/common/templates/classes/_externalInterfaces.tpl b/charts/library/common/templates/classes/_externalInterfaces.tpl index 375e3612a0a..524b4f263b2 100644 --- a/charts/library/common/templates/classes/_externalInterfaces.tpl +++ b/charts/library/common/templates/classes/_externalInterfaces.tpl @@ -3,7 +3,7 @@ This template serves as a blueprint for External Interface objects that are crea using the SCALE GUI. */}} {{- define "common.classes.externalInterfaces" -}} -{{- range $index, $iface := .Values.externalInterfaces }} +{{- range $index, $iface := .Values.ixExternalInterfacesConfiguration }} --- apiVersion: "k8s.cni.cncf.io/v1" kind: NetworkAttachmentDefinition diff --git a/charts/library/common/templates/lib/chart/_annotations.tpl b/charts/library/common/templates/lib/chart/_annotations.tpl index 739b6bccd9d..12a0a543364 100644 --- a/charts/library/common/templates/lib/chart/_annotations.tpl +++ b/charts/library/common/templates/lib/chart/_annotations.tpl @@ -1,8 +1,8 @@ {{/* Common annotations shared across objects */}} {{- define "common.annotations.workload.spec" -}} rollme: {{ randAlphaNum 5 | quote }} -{{- if .Values.externalInterfaces }} -k8s.v1.cni.cncf.io/networks: {{ join ", " .Values.externalInterfaces }} +{{- if .Values.ixExternalInterfacesConfigurationNames }} +k8s.v1.cni.cncf.io/networks: {{ join ", " .Values.ixExternalInterfacesConfigurationNames }} {{- end }} {{- end -}}