From 6faffd636436aaea1226d7bcd2b1d65dcba917c9 Mon Sep 17 00:00:00 2001
From: "garcia.ryan" <garcia.ryan@solute.us>
Date: Fri, 30 Apr 2021 08:20:21 -0600
Subject: [PATCH] fix: Syntax in sonarqube HR and adding haproxy flux defs
---
chart/templates/sonarqube/sonarqube-helmrelease.yaml | 2 +-
chart/values.yaml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/chart/templates/sonarqube/sonarqube-helmrelease.yaml b/chart/templates/sonarqube/sonarqube-helmrelease.yaml
index aad39ff958..fd0cc4e625 100644
--- a/chart/templates/sonarqube/sonarqube-helmrelease.yaml
+++ b/chart/templates/sonarqube/sonarqube-helmrelease.yaml
@@ -1,4 +1,4 @@
-{{- $fluxSettings := deepCopy .Values.sonarqube.flux | mergeOverwrite .Values.flux -}}
+{{- $fluxSettings := deepCopy .Values.addons.sonarqube.flux | mergeOverwrite .Values.flux -}}
{{- if .Values.addons.sonarqube.enabled }}
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
diff --git a/chart/values.yaml b/chart/values.yaml
index 63c29bd109..6bfb6b0c2b 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -635,6 +635,9 @@ addons:
path: "./chart"
tag: 1.1.2-bb.0
+ # -- Flux options specifically for the HAProxy Package
+ flux: {}
+
# -- Values to passthrough to the haproxy chart: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/haproxy.git
values: {}
--
GitLab