From 0df6fe98f540371455e177fcdf69119ffc804c26 Mon Sep 17 00:00:00 2001 From: Janusz Bialy <6475833+jbialy@users.noreply.github.com> Date: Sun, 24 Mar 2019 10:17:06 -0400 Subject: [PATCH] [incubator/vault] Fix liveness check when vault is sealed or uninitialized (#12043) * expect successful response if uninitialized or sealed for liveness check Signed-off-by: Janusz Bialy * bump chart version Signed-off-by: Janusz Bialy * bump chart ver Signed-off-by: Janusz Bialy * liveness check should pass if vault is sealed Signed-off-by: Janusz Bialy * vault should be considered alive if sealed and uninitilized Signed-off-by: Janusz Bialy --- incubator/vault/Chart.yaml | 2 +- incubator/vault/templates/deployment.yaml | 3 ++- incubator/vault/values.yaml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/incubator/vault/Chart.yaml b/incubator/vault/Chart.yaml index d8de63abec..2ba3574c3e 100644 --- a/incubator/vault/Chart.yaml +++ b/incubator/vault/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for Vault, a tool for managing secrets name: vault -version: 0.16.0 +version: 0.16.1 appVersion: 1.0.1 home: https://www.vaultproject.io/ icon: https://www.vaultproject.io/assets/images/mega-nav/logo-vault-0f83e3d2.svg diff --git a/incubator/vault/templates/deployment.yaml b/incubator/vault/templates/deployment.yaml index 34e28d0bd4..7e9b023767 100644 --- a/incubator/vault/templates/deployment.yaml +++ b/incubator/vault/templates/deployment.yaml @@ -52,10 +52,11 @@ spec: - containerPort: {{ .Values.service.clusterPort }} name: cluster-address livenessProbe: - # Alive if in standby or active mode + # Alive if Vault is successfully responding to requests httpGet: path: /v1/sys/health?standbyok=true& {{- if .Values.vault.liveness.aliveIfUninitialized -}}uninitcode=204&{{- end }} + {{- if .Values.vault.liveness.aliveIfSealed -}}sealedcode=204&{{- end }} port: {{ .Values.service.port }} scheme: {{ if .Values.vault.config.listener.tcp.tls_disable -}}HTTP{{- else -}}HTTPS{{- end }} initialDelaySeconds: {{ .Values.vault.liveness.initialDelaySeconds }} diff --git a/incubator/vault/values.yaml b/incubator/vault/values.yaml index 06b9cb37ef..057aeb5174 100644 --- a/incubator/vault/values.yaml +++ b/incubator/vault/values.yaml @@ -152,7 +152,8 @@ vault: # secret: # secretName: some-secret liveness: - aliveIfUninitialized: false + aliveIfUninitialized: true + aliveIfSealed: true initialDelaySeconds: 30 periodSeconds: 10 readiness: