From e198078cc918fe8f3bc9d525a5e04a9d86be5d2c Mon Sep 17 00:00:00 2001
From: Rob Kooper <kooper@illinois.edu>
Date: Tue, 30 Aug 2022 09:11:04 -0500
Subject: [PATCH] fix raw chart
---
charts/apps/templates/raw.yaml | 32 ++++++++++++++++++--------------
charts/apps/values.yaml | 2 ++
2 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/charts/apps/templates/raw.yaml b/charts/apps/templates/raw.yaml
index bd71858..64e6102 100644
--- a/charts/apps/templates/raw.yaml
+++ b/charts/apps/templates/raw.yaml
@@ -31,24 +31,28 @@ spec:
version: v3
releaseName: raw
values:
-{{ if .Values.metallb.enabled }}
- - |
- apiVersion: metallb.io/v1beta1
- kind: IPAddressPool
- metadata:
+ values:
+ {{ .Values.raw.values | nindent 10 }}
+ {{ if .Values.metallb.enabled }}
+ - |
+ apiVersion: metallb.io/v1beta1
+ kind: IPAddressPool
+ metadata:
name: terraform
namespace: metallb-system
- spec:
+ spec:
addresses:
- {{- toYaml .Values.metallb.addresses | nindent 16 }}
- - |
- apiVersion: metallb.io/v1beta1
- kind: L2Advertisement
- metadata:
+ {{- toYaml .Values.metallb.addresses | nindent 16 }}
+ - |
+ apiVersion: metallb.io/v1beta1
+ kind: L2Advertisement
+ metadata:
name: l2advertisement1
namespace: metallb-system
- spec:
+ spec:
ipAddressPools:
- - terraform
-{{- end }}
+ - terraform
+ {{- end }}
+ templates:
+ {{ .Values.raw.templates | nindent 10 }}
{{- end }}
diff --git a/charts/apps/values.yaml b/charts/apps/values.yaml
index 3d61a74..6d5a5d8 100644
--- a/charts/apps/values.yaml
+++ b/charts/apps/values.yaml
@@ -77,3 +77,5 @@ cinder:
raw:
enabled: false
version: "1.*"
+ values: []
+ templates: []
--
GitLab