diff --git a/chart/templates/vault/gitrepository.yaml b/chart/templates/vault/gitrepository.yaml index bc0ae65c84b8f69f8958bed0434752a1d5d58fd6..5080999e5d77aec217a71f4c7ebabb90b6e3ae54 100644 --- a/chart/templates/vault/gitrepository.yaml +++ b/chart/templates/vault/gitrepository.yaml @@ -15,4 +15,4 @@ spec: {{- include "validRef" .Values.addons.vault.git | nindent 4 }} {{ include "gitIgnore" . }} {{- include "gitCreds" . | nindent 2 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/chart/templates/vault/twistlock-helmrelease.yaml b/chart/templates/vault/twistlock-helmrelease.yaml new file mode 100644 index 0000000000000000000000000000000000000000..14e476fc10595935352c30b82d1207dc0397f1ff --- /dev/null +++ b/chart/templates/vault/twistlock-helmrelease.yaml @@ -0,0 +1,56 @@ +{{- $fluxSettingsVault := merge .Values.vault.flux .Values.flux -}} +{{- if .Values.vault.enabled }} +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: vault + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: vault + app.kubernetes.io/component: "sandbox" + {{- include "commonLabels" . | nindent 4}} +spec: + targetNamespace: vault + chart: + spec: + chart: {{ .Values.vault.git.path }} + interval: 5m + sourceRef: + kind: GitRepository + name: vault + namespace: {{ .Release.Namespace }} + + {{- toYaml $fluxSettingsVault | nindent 2 }} + + {{- if .Values.vault.postRenderers }} + postRenderers: + {{ toYaml .Values.vault.postRenderers | nindent 4 }} + {{- end }} + valuesFrom: + - name: {{ .Release.Name }}-vault-values + kind: Secret + valuesKey: "common" + - name: {{ .Release.Name }}-vault-values + kind: Secret + valuesKey: "defaults" + - name: {{ .Release.Name }}-vault-values + kind: Secret + valuesKey: "overlays" + + # TODO: DRY this up + {{- if or .Values.gatekeeper.enabled .Values.istio.enabled }} + dependsOn: + {{- if .Values.gatekeeper.enabled }} + - name: gatekeeper + namespace: {{ .Release.Namespace }} + {{- end }} + {{- if .Values.istio.enabled }} + - name: istio + namespace: {{ .Release.Namespace }} + {{- end }} + {{- if .Values.monitoring.enabled }} + - name: monitoring + namespace: {{ .Release.Namespace }} + {{- end }} + {{- end }} +{{- end }} diff --git a/chart/values.yaml b/chart/values.yaml index 255c16a6844e007a83016a8613bb444a6df1741b..61c0425de20055218ab57a9187ae54406002ef2a 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -549,6 +549,18 @@ addons: # -- Additional authservice chain configurations. chains: {} + # ---------------------------------------------------------------------------------------------------------------------- + # Vault + # + vault: + # -- Toggle deployment of vault. + enabled: true + git: + repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/vault.git + path: "./chart" + branch: "deploy-vault" + # ---------------------------------------------------------------------------------------------------------------------- + # ---------------------------------------------------------------------------------------------------------------------- # Minio Operator and Instance #