fix annotation bug. Use active service on ingress when ha

templates/server-ingress.yaml

@@ -2,6 +2,9 @@
 {{- if ne .mode "external" }}
 {{- if .Values.server.ingress.enabled -}}
 {{- $serviceName := include "vault.fullname" . -}}
+{{- if and (eq .mode "ha" ) (and (eq (.Values.server.service.enabled | toString) "true" ) (eq (.Values.global.enabled | toString) "true")) }}
+{{- $serviceName = printf "%s-%s" $serviceName "active" -}}
+{{- end }}
 {{- $servicePort := .Values.server.service.port -}}
 apiVersion: extensions/v1beta1
 kind: Ingress

values.yaml

@@ -133,7 +133,7 @@ server:
     enabled: false
     labels: {}
       # traffic: external
-    annotations: {}
+    annotations: []
       # |
       # kubernetes.io/ingress.class: nginx
       # kubernetes.io/tls-acme: "true"
@@ -232,7 +232,7 @@ server:
   # Extra annotations to attach to the server pods
   # This should be a multi-line string mapping directly to the a map of
   # the annotations to apply to the server pods
-  annotations: {}
+  annotations: []
 
   # Enables a headless service to be used by the Vault Statefulset
   service:
@@ -259,7 +259,7 @@ server:
     targetPort: 8200
     # Extra annotations for the service definition. This should be a multi-line
     # string formatted as a map of the annotations to apply to the service.
-    annotations: {}
+    annotations: []
 
   # This configures the Vault Statefulset to create a PVC for data
   # storage when using the file or raft backend storage engines.
@@ -403,7 +403,7 @@ server:
     # Extra annotations for the serviceAccount definition. This should be a
     # multi-line string formatted as a map of the annotations to apply to the
     # serviceAccount.
-    annotations: {}
+    annotations: []
 
 # Vault UI
 ui:
@@ -426,4 +426,4 @@ ui:
   # Extra annotations to attach to the ui service
   # This should be a multi-line string mapping directly to the a map of
   # the annotations to apply to the ui service
-  annotations: {}
+  annotations: []