UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit ca47f903 authored by Branden Cobb's avatar Branden Cobb
Browse files

Merge branch 'misc-bug-fixes' into 'master'

Misc Bug Fixes

See merge request platform-one/big-bang/bigbang!1283
parents 204d7eec 390ebde4
No related branches found
No related tags found
2 merge requests!1386Master,!1283Misc Bug Fixes
Pipeline #661417 passed
......@@ -37,13 +37,12 @@ spec:
kind: Secret
valuesKey: "overlays"
values:
elasticsearch:
imagePullSecrets:
- name: private-registry
{{- if .Values.monitoring.enabled }}
# CA always depends on Gatekeeper so we can assume it exists here
dependsOn:
- name: gatekeeper
namespace: {{ .Release.Namespace }}
{{- if .Values.monitoring.enabled }}
- name: monitoring
namespace: {{ .Release.Namespace}}
namespace: {{ .Release.Namespace }}
{{- end }}
{{- end }}
\ No newline at end of file
{{- end }}
......@@ -22,6 +22,10 @@ spec:
{{- toYaml $fluxSettingsJaeger | nindent 2 }}
{{- if .Values.jaeger.postRenderers }}
postRenderers:
{{ toYaml .Values.jaeger.postRenderers | nindent 4 }}
{{- end }}
valuesFrom:
- name: {{ .Release.Name }}-jaeger-values
kind: Secret
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment