diff --git a/chart/templates/bigbang/saml.yaml b/chart/templates/bigbang/saml.yaml index 185716dafa6a1f9365cbbad615f42293d4caf4b6..a03b1aba200742dfa71fec1a2df4cda1b3c91855 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 37f4377258e9a2c07144509bc2886a83b41a995a..ec1e8be7124ce377c46256d32f41e13dced47bbb 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 0000000000000000000000000000000000000000..a451ff112c37765bf09b55d71292f7561e258493 --- /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 a69817a68b855a61f8b8c245a406a0e4e61385cc..aadeaa3b6f4d9a4246d1a301048fcea9e33590ce 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: