diff --git a/chart/templates/vault/twistlock-helmrelease.yaml b/chart/templates/vault/twistlock-helmrelease.yaml deleted file mode 100644 index 14e476fc10595935352c30b82d1207dc0397f1ff..0000000000000000000000000000000000000000 --- 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 2e2b4159278d948adf22223d499303f695bf94e6..4d04871cd793aa4b57f437836c4080e762097fac 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 71869e2278aed3cfb738a51b3afa3ad75396d425..dd44936e2d7866ba62e33d62dbf102933c5f8b88 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: