diff --git a/vault/helm-vault.yaml b/vault/helm-vault.yaml index a28032e..f465add 100644 --- a/vault/helm-vault.yaml +++ b/vault/helm-vault.yaml @@ -39,27 +39,27 @@ spec: enabled: false affinity: "" ha: + enabled: true + replicas: 3 + raft: enabled: true - replicas: 3 - raft: - enabled: true - setNodeId: true - config: | - cluster_name = "vault-integrated-storage" - ui = true - listener "tcp" { - tls_disable = 0 - address = "[::]:8200" - cluster_address = "[::]:8201" - tls_cert_file = "/vault/userconfig/vault-ha-tls/vault.crt" - tls_key_file = "/vault/userconfig/vault-ha-tls/vault.key" - tls_client_ca_file = "/vault/userconfig/vault-ha-tls/vault.ca" - } - storage "raft" { - path = "/vault/data" - } - disable_mlock = true - service_registration "kubernetes" {} + setNodeId: true + config: | + cluster_name = "vault-integrated-storage" + ui = true + listener "tcp" { + tls_disable = 0 + address = "[::]:8200" + cluster_address = "[::]:8201" + tls_cert_file = "/vault/userconfig/vault-ha-tls/vault.crt" + tls_key_file = "/vault/userconfig/vault-ha-tls/vault.key" + tls_client_ca_file = "/vault/userconfig/vault-ha-tls/vault.ca" + } + storage "raft" { + path = "/vault/data" + } + disable_mlock = true + service_registration "kubernetes" {} destination: diff --git a/vault/overrides.yaml b/vault/overrides.yaml deleted file mode 100644 index 7ff621d..0000000 --- a/vault/overrides.yaml +++ /dev/null @@ -1,44 +0,0 @@ -global: - enabled: true - tlsDisable: false -injector: - enabled: true -server: - extraEnvironmentVars: - VAULT_CACERT: /vault/userconfig/vault-ha-tls/vault.ca - VAULT_TLSCERT: /vault/userconfig/vault-ha-tls/vault.crt - VAULT_TLSKEY: /vault/userconfig/vault-ha-tls/vault.key - volumes: - - name: userconfig-vault-ha-tls - secret: - defaultMode: 420 - secretName: vault-ha-tls - volumeMounts: - - mountPath: /vault/userconfig/vault-ha-tls - name: userconfig-vault-ha-tls - readOnly: true - standalone: - enabled: false - affinity: "" - ha: - enabled: true - replicas: 3 - raft: - enabled: true - setNodeId: true - config: | - cluster_name = "vault-integrated-storage" - ui = true - listener "tcp" { - tls_disable = 0 - address = "[::]:8200" - cluster_address = "[::]:8201" - tls_cert_file = "/vault/userconfig/vault-ha-tls/vault.crt" - tls_key_file = "/vault/userconfig/vault-ha-tls/vault.key" - tls_client_ca_file = "/vault/userconfig/vault-ha-tls/vault.ca" - } - storage "raft" { - path = "/vault/data" - } - disable_mlock = true - service_registration "kubernetes" {}