From 263953ea6a4f71420009e6715eac4571a08f11ac 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
---
chart/templates/vault/gitrepository.yaml | 10 ----
chart/templates/vault/imagepullsecret.yaml | 6 +-
chart/templates/vault/namespace.yaml | 6 +-
.../vault/twistlock-helmrelease.yaml | 56 -------------------
chart/templates/vault/values.yaml | 26 ---------
chart/values.yaml | 13 -----
6 files changed, 2 insertions(+), 115 deletions(-)
delete mode 100644 chart/templates/vault/twistlock-helmrelease.yaml
diff --git a/chart/templates/vault/gitrepository.yaml b/chart/templates/vault/gitrepository.yaml
index 8b2a911c9a..5080999e5d 100644
--- a/chart/templates/vault/gitrepository.yaml
+++ b/chart/templates/vault/gitrepository.yaml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
{{- if and (not .Values.offline) .Values.addons.vault.enabled }}
-=======
-{{- if and (not .Values.offline) .Values.vault.enabled }}
->>>>>>> eb61ff0b (add vault deployment)
apiVersion: source.toolkit.fluxcd.io/v1beta1
kind: GitRepository
metadata:
@@ -14,15 +10,9 @@ metadata:
{{- include "commonLabels" . | nindent 4}}
spec:
interval: {{ .Values.flux.interval }}
-<<<<<<< HEAD
url: {{ .Values.addons.vault.git.repo }}
ref:
{{- include "validRef" .Values.addons.vault.git | nindent 4 }}
-=======
- url: {{ .Values.vault.git.repo }}
- ref:
- {{- include "validRef" .Values.vault.git | nindent 4 }}
->>>>>>> eb61ff0b (add vault deployment)
{{ include "gitIgnore" . }}
{{- include "gitCreds" . | nindent 2 }}
{{- end }}
diff --git a/chart/templates/vault/imagepullsecret.yaml b/chart/templates/vault/imagepullsecret.yaml
index 55c8ad652b..cf24c17a26 100644
--- a/chart/templates/vault/imagepullsecret.yaml
+++ b/chart/templates/vault/imagepullsecret.yaml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
{{- if .Values.addons.vault.enabled }}
-=======
-{{- if .Values.vault.enabled }}
->>>>>>> eb61ff0b (add vault deployment)
{{- if ( include "imagePullSecret" . ) }}
apiVersion: v1
kind: Secret
@@ -17,4 +13,4 @@ type: kubernetes.io/dockerconfigjson
data:
.dockerconfigjson: {{ template "imagePullSecret" . }}
{{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/chart/templates/vault/namespace.yaml b/chart/templates/vault/namespace.yaml
index 51840825e1..6fdde08f2f 100644
--- a/chart/templates/vault/namespace.yaml
+++ b/chart/templates/vault/namespace.yaml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
{{- if .Values.addons.vault.enabled }}
-=======
-{{- if .Values.twistlock.enabled }}
->>>>>>> eb61ff0b (add vault deployment)
apiVersion: v1
kind: Namespace
metadata:
@@ -12,4 +8,4 @@ metadata:
app.kubernetes.io/component: "sandbox"
{{- include "commonLabels" . | nindent 4}}
istio-injection: enabled
-{{- end }}
\ No newline at end of file
+{{- end }}
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/templates/vault/values.yaml b/chart/templates/vault/values.yaml
index 26b7c609d5..4009e020bb 100644
--- a/chart/templates/vault/values.yaml
+++ b/chart/templates/vault/values.yaml
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
{{- if .Values.addons.vault.enabled }}
{{- include "values-secret" (dict "root" $ "package" .Values.addons.vault "name" "vault" "defaults" (include "bigbang.defaults.vault" .)) }}
-=======
-{{- if .Values.vault.enabled }}
-{{- include "values-secret" (dict "root" $ "package" .Values.vault "name" "vault" "defaults" (include "bigbang.defaults.vault" .)) }}
->>>>>>> eb61ff0b (add vault deployment)
{{- end }}
{{- define "bigbang.defaults.vault" -}}
@@ -19,7 +14,6 @@ prometheus:
servicemonitor:
enabled: {{ .Values.monitoring.enabled }}
-<<<<<<< HEAD
networkPolicies:
enabled: {{ .Values.networkPolicies.enabled }}
ingressLabels:
@@ -37,23 +31,3 @@ istio:
gateways:
- istio-system/{{ default "public" .Values.monitoring.ingress.gateway }}
{{- end -}}
-=======
-imagePullSecrets:
-- name: private-registry
-
-networkPolicies:
- enabled: {{ .Values.networkPolicies.enabled }}
- ingressLabels:
- {{- $gateway := default "public" .Values.twistlock.ingress.gateway }}
- {{- $default := dict "app" (dig "gateways" $gateway "ingressGateway" nil .Values.istio) "istio" nil }}
- {{- toYaml (dig "values" "gateways" $gateway "selector" $default .Values.istio) | nindent 4 }}
- nodeCidr: {{ .Values.networkPolicies.nodeCidr }}
-
-istio:
- enabled: {{ .Values.istio.enabled }}
- console:
- gateways:
- - istio-system/{{ default "public" .Values.vault.ingress.gateway }}
-
-{{- end -}}
->>>>>>> eb61ff0b (add vault deployment)
diff --git a/chart/values.yaml b/chart/values.yaml
index 1fa39ccdd9..e0ab516422 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -499,7 +499,6 @@ addons:
values: {}
postRenderers: []
-# ----------------------------------------------------------------------------------------------------------------------
argocd:
# -- Toggle deployment of ArgoCD.
enabled: false
@@ -564,18 +563,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
#
--
GitLab