From 33c6d929e33826f20bd7183fc517f1f171374375 Mon Sep 17 00:00:00 2001
From: Micah Nagel <micah.nagel@parsons.com>
Date: Tue, 2 Mar 2021 18:10:25 +0000
Subject: [PATCH] Resolve "Add monitoring for Anchore"
---
chart/templates/anchore/anchore-helmrelease.yaml | 4 ++--
chart/values.yaml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/chart/templates/anchore/anchore-helmrelease.yaml b/chart/templates/anchore/anchore-helmrelease.yaml
index 46570b81e0..5f8adc50d6 100644
--- a/chart/templates/anchore/anchore-helmrelease.yaml
+++ b/chart/templates/anchore/anchore-helmrelease.yaml
@@ -42,6 +42,8 @@ spec:
hostname: {{ .Values.hostname }}
istio:
enabled: {{ .Values.istio.enabled }}
+ monitoring:
+ enabled: {{ .Values.monitoring.enabled }}
{{- if and .Values.addons.anchore.enterprise.enabled .Values.addons.anchore.enterprise.licenseYaml }}
enterpriseLicenseYaml: |
{{ .Values.addons.anchore.enterprise.licenseYaml | nindent 6 }}
@@ -71,8 +73,6 @@ spec:
defaultAdminPassword: {{ .Values.addons.anchore.adminPassword }}
{{- end }}
imagePullSecretName: private-registry
- enableMetrics: {{ .Values.monitoring.enabled }}
- metricsAuthDisabled: {{ .Values.monitoring.enabled }}
{{- if .Values.addons.anchore.enterprise.enabled }}
oauthEnabled: {{ .Values.addons.anchore.sso.enabled }}
hashedPasswords: {{ .Values.addons.anchore.sso.enabled }}
diff --git a/chart/values.yaml b/chart/values.yaml
index a324a70c91..09dd8c03b7 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -500,7 +500,7 @@ addons:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/anchore-enterprise.git
path: "./chart"
- tag: "1.11.0-bb.0"
+ tag: "1.11.0-bb.2"
# -- Initial admin password used to authenticate to Anchore.
adminPassword: ""
--
GitLab