From 97a0955d6f594b709c4e8378ac0c30b371ca13a4 Mon Sep 17 00:00:00 2001
From: Kavitha Thulasiraman <kavithathulasiraman@Kavithas-MacBook-Pro-2.local>
Date: Wed, 22 Sep 2021 13:46:53 -0400
Subject: [PATCH] add vault deployment
---
.../vault/twistlock-helmrelease.yaml | 56 -------------------
chart/values.yaml | 27 +++++----
tests/test-values.yaml | 2 +
3 files changed, 17 insertions(+), 68 deletions(-)
delete mode 100644 chart/templates/vault/twistlock-helmrelease.yaml
diff --git a/chart/templates/vault/twistlock-helmrelease.yaml b/chart/templates/vault/twistlock-helmrelease.yaml
deleted file mode 100644
index 14e476fc10..0000000000
--- a/chart/templates/vault/twistlock-helmrelease.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-{{- $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 952c12b591..c36c53c452 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -485,6 +485,21 @@ twistlock:
# ----------------------------------------------------------------------------------------------------------------------
#
addons:
+ 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"
+ # -- Flux reconciliation overrides specifically for the Twistlock Package
+ flux: {}
+ ingress:
+ gateway: ""
+ values: {}
+ postRenderers: []
+
+
argocd:
# -- Toggle deployment of ArgoCD.
enabled: false
@@ -549,18 +564,6 @@ 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
#
diff --git a/tests/test-values.yaml b/tests/test-values.yaml
index af31ca5140..2cf474ba12 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -360,6 +360,8 @@ twistlock:
# Addons are toggled based on labels in CI
addons:
+ vault:
+ enabled: true
argocd:
enabled: false
sso:
--
GitLab