From 37db332b46045c8dc8681779edd1a9b74c74407b Mon Sep 17 00:00:00 2001 From: Vincent Desjardins Date: Mon, 28 May 2018 16:53:44 +0000 Subject: [PATCH] vault: fix panic when vault is sealed or uninitialized --- pkg/issuer/vault/setup.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/issuer/vault/setup.go b/pkg/issuer/vault/setup.go index 3c65f1193..4dbb14eb0 100644 --- a/pkg/issuer/vault/setup.go +++ b/pkg/issuer/vault/setup.go @@ -16,7 +16,7 @@ const ( messageVaultClientInitFailed = "Failed to initialize Vault client: " messageVaultHealthCheckFailed = "Failed to call Vault health check: " - messageVaultStatusVerificationFailed = "Vault is not initialized or is sealed: " + messageVaultStatusVerificationFailed = "Vault is not initialized or is sealed" messageVaultConfigRequired = "Vault config cannot be empty" messageServerAndPathRequired = "Vault server and path are required fields" messsageAuthFieldsRequired = "Vault tokenSecretRef or appRole is required" @@ -70,10 +70,9 @@ func (v *Vault) Setup(ctx context.Context) error { } if !health.Initialized || health.Sealed { - s := messageVaultStatusVerificationFailed + err.Error() - glog.V(4).Infof("%s: %s", v.issuer.GetObjectMeta().Name, s) - v.issuer.UpdateStatusCondition(v1alpha1.IssuerConditionReady, v1alpha1.ConditionFalse, errorVault, s) - return err + glog.V(4).Infof("%s: %s: health: %v", v.issuer.GetObjectMeta().Name, messageVaultStatusVerificationFailed, health) + v.issuer.UpdateStatusCondition(v1alpha1.IssuerConditionReady, v1alpha1.ConditionFalse, errorVault, messageVaultStatusVerificationFailed) + return fmt.Errorf(messageVaultStatusVerificationFailed) } glog.Info(messageVaultVerified)