Просмотр исходного кода

Merge branch 'beach-team' of github.com:external-secrets/external-secrets into beach-team

Dominic Meddick 4 лет назад
Родитель
Сommit
8383e7e182
2 измененных файлов с 6 добавлено и 3 удалено
  1. 2 2
      deploy/charts/external-secrets/Chart.yaml
  2. 4 1
      pkg/provider/vault/vault.go

+ 2 - 2
deploy/charts/external-secrets/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: external-secrets
 description: External secret management for Kubernetes
 type: application
-version: "0.5.4"
-appVersion: "v0.5.4"
+version: "0.5.5"
+appVersion: "v0.5.5"
 kubeVersion: ">= 1.19.0-0"
 keywords:
   - kubernetes-external-secrets

+ 4 - 1
pkg/provider/vault/vault.go

@@ -614,7 +614,10 @@ func (v *client) Validate() (esv1beta1.ValidationResult, error) {
 		if v.store.Auth.Ldap != nil && v.store.Auth.Ldap.SecretRef.Namespace == nil {
 			return esv1beta1.ValidationResultUnknown, nil
 		}
-		if v.store.Auth.Jwt != nil && v.store.Auth.Jwt.SecretRef.Namespace == nil {
+		if v.store.Auth.Jwt != nil && v.store.Auth.Jwt.SecretRef != nil && v.store.Auth.Jwt.SecretRef.Namespace == nil {
+			return esv1beta1.ValidationResultUnknown, nil
+		}
+		if v.store.Auth.Jwt != nil && v.store.Auth.Jwt.KubernetesServiceAccountToken != nil && v.store.Auth.Jwt.KubernetesServiceAccountToken.ServiceAccountRef.Namespace == nil {
 			return esv1beta1.ValidationResultUnknown, nil
 		}
 		if v.store.Auth.Cert != nil && v.store.Auth.Cert.SecretRef.Namespace == nil {