From 0fd429582c4a02684c6c170b8e1bb775be870efc Mon Sep 17 00:00:00 2001
From: Grant Duncklee <grant.duncklee@braingu.com>
Date: Thu, 29 Apr 2021 16:56:12 -0400
Subject: [PATCH] add imagePullSecrets to saml. add monitoring

---
 chart/templates/bigbang/saml.yaml           |  5 ++++
 chart/templates/bigbang/secret.yaml         |  1 +
 chart/templates/bigbang/servicemonitor.yaml | 28 +++++++++++++++++++++
 chart/values.yaml                           |  2 +-
 4 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 chart/templates/bigbang/servicemonitor.yaml

diff --git a/chart/templates/bigbang/saml.yaml b/chart/templates/bigbang/saml.yaml
index 185716d..a03b1ab 100644
--- a/chart/templates/bigbang/saml.yaml
+++ b/chart/templates/bigbang/saml.yaml
@@ -11,6 +11,11 @@ spec:
     metadata:
       creationTimestamp: null
     spec:
+      activeDeadlineSeconds: 90
+      {{- with .Values.nexus.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8}}
+      {{- end }}
       containers:
       - image: registry1.dso.mil/ironbank/redhat/ubi/ubi8-minimal:latest
         name: saml
diff --git a/chart/templates/bigbang/secret.yaml b/chart/templates/bigbang/secret.yaml
index 37f4377..ec1e8be 100644
--- a/chart/templates/bigbang/secret.yaml
+++ b/chart/templates/bigbang/secret.yaml
@@ -12,4 +12,5 @@ metadata:
     {{- end }}
 data:
   admin.password: {{ randAlphaNum 12 | b64enc | quote }}
+  admin.username: YWRtaW4K
 {{- end}}
diff --git a/chart/templates/bigbang/servicemonitor.yaml b/chart/templates/bigbang/servicemonitor.yaml
new file mode 100644
index 0000000..a451ff1
--- /dev/null
+++ b/chart/templates/bigbang/servicemonitor.yaml
@@ -0,0 +1,28 @@
+{{- if .Values.monitoring.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "nexus.fullname" . }}
+  labels:
+    release: monitoring
+spec:
+  selector:
+    matchLabels:
+      name: {{ include "nexus.fullname" . }}
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  endpoints:
+    - interval: 30s
+      path: /service/metrics/data
+      port: nexus-ui
+      scheme: http
+      basicAuth:
+        password:
+          name: {{ template "nexus.name" . }}-secret
+          key: admin.password
+        username:
+          name: {{ template "nexus.name" . }}-secret
+          key: admin.user
+  jobLabel: {{ template "nexus.fullname" . }}-metrics
+{{- end }}
diff --git a/chart/values.yaml b/chart/values.yaml
index a69817a..aadeaa3 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -6,7 +6,7 @@ istio:
   nexus:
     gateways:
     - "istio-system/main"
-monioring:
+monitoring:
   enabled: false
 license_key: ""
 license:
-- 
GitLab