mirror of
https://github.com/rubenhensen/k8scd.git
synced 2026-09-17 02:12:55 +02:00
Change tls vault
This commit is contained in:
@@ -36,9 +36,7 @@ spec:
|
|||||||
image: hashicorp/vault:1.15
|
image: hashicorp/vault:1.15
|
||||||
env:
|
env:
|
||||||
- name: VAULT_ADDR
|
- name: VAULT_ADDR
|
||||||
value: "https://vault-active.vault.svc:8200"
|
value: "http://vault-active.vault.svc:8200"
|
||||||
- name: VAULT_CACERT
|
|
||||||
value: "/vault-tls/vault.ca"
|
|
||||||
- name: VAULT_TOKEN
|
- name: VAULT_TOKEN
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
@@ -49,10 +47,6 @@ spec:
|
|||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: vault-oidc-config
|
name: vault-oidc-config
|
||||||
key: client_secret
|
key: client_secret
|
||||||
volumeMounts:
|
|
||||||
- name: vault-tls
|
|
||||||
mountPath: /vault-tls
|
|
||||||
readOnly: true
|
|
||||||
command: ["/bin/sh", "-c"]
|
command: ["/bin/sh", "-c"]
|
||||||
args:
|
args:
|
||||||
- |
|
- |
|
||||||
@@ -68,8 +62,4 @@ spec:
|
|||||||
user_claim="preferred_username" \
|
user_claim="preferred_username" \
|
||||||
groups_claim="groups" \
|
groups_claim="groups" \
|
||||||
policies="default"
|
policies="default"
|
||||||
volumes:
|
|
||||||
- name: vault-tls
|
|
||||||
secret:
|
|
||||||
secretName: vault-ha-tls
|
|
||||||
restartPolicy: OnFailure
|
restartPolicy: OnFailure
|
||||||
|
|||||||
+4
-22
@@ -1,24 +1,11 @@
|
|||||||
global:
|
global:
|
||||||
enabled: true
|
enabled: true
|
||||||
tlsDisable: false
|
tlsDisable: true
|
||||||
injector:
|
injector:
|
||||||
enabled: true
|
enabled: true
|
||||||
server:
|
server:
|
||||||
dataStorage:
|
dataStorage:
|
||||||
storageClass: longhorn
|
storageClass: longhorn
|
||||||
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:
|
standalone:
|
||||||
enabled: false
|
enabled: false
|
||||||
affinity: ""
|
affinity: ""
|
||||||
@@ -32,12 +19,9 @@ server:
|
|||||||
cluster_name = "vault-integrated-storage"
|
cluster_name = "vault-integrated-storage"
|
||||||
ui = true
|
ui = true
|
||||||
listener "tcp" {
|
listener "tcp" {
|
||||||
tls_disable = 0
|
tls_disable = 1
|
||||||
address = "[::]:8200"
|
address = "[::]:8200"
|
||||||
cluster_address = "[::]:8201"
|
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" {
|
storage "raft" {
|
||||||
path = "/vault/data"
|
path = "/vault/data"
|
||||||
@@ -48,12 +32,10 @@ server:
|
|||||||
enabled: true
|
enabled: true
|
||||||
annotations:
|
annotations:
|
||||||
cert-manager.io/cluster-issuer: prod-cluster-issuer
|
cert-manager.io/cluster-issuer: prod-cluster-issuer
|
||||||
nginx.ingress.kubernetes.io/ssl-passthrough: "true"
|
|
||||||
nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
|
|
||||||
ingressClassName: nginx
|
ingressClassName: nginx
|
||||||
tls:
|
tls:
|
||||||
- secretName: letsencrypt-prod
|
- secretName: letsencrypt-prod
|
||||||
hosts:
|
hosts:
|
||||||
- vault.hensen.io
|
- vault.hensen.io
|
||||||
hosts:
|
hosts:
|
||||||
- host: "vault.hensen.io"
|
- host: "vault.hensen.io"
|
||||||
|
|||||||
Reference in New Issue
Block a user