Remove unncessary template calls (#712)

- As part of VAULT-571 / #703 in 7109159, a new vault.serverEnabled
   template was added (and included in vault.mode)

   Various templates were updated accordingly, but those that were
   already calling vault.mode had an additonal call to
   vault.serverEnabled made which was unnecessary

   Remove those
This commit is contained in:
Ethan J. Brown 2022-04-12 22:54:54 -07:00 committed by GitHub
parent 12444bffb6
commit 4ae52c8bd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 9 additions and 20 deletions

View file

@ -1,5 +1,4 @@
{{ template "vault.mode" . }}
{{- template "vault.serverEnabled" . -}}
{{- if .serverEnabled -}}
{{- if and (ne .mode "") (eq (.Values.server.authDelegator.enabled | toString) "true") }}
{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" -}}

View file

@ -1,6 +1,5 @@
{{ template "vault.mode" . }}
{{- if ne .mode "external" }}
{{- template "vault.serverEnabled" . -}}
{{- if .serverEnabled -}}
{{- if ne .mode "dev" -}}
{{ if or (.Values.server.standalone.config) (.Values.server.ha.config) -}}
@ -38,4 +37,4 @@ data:
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}

View file

@ -1,6 +1,5 @@
{{ template "vault.mode" . }}
{{- if ne .mode "external" }}
{{- template "vault.serverEnabled" . -}}
{{- if .serverEnabled -}}
{{- if eq .mode "ha" }}
apiVersion: rbac.authorization.k8s.io/v1
@ -19,4 +18,4 @@ rules:
verbs: ["get", "watch", "list", "update", "patch"]
{{ end }}
{{ end }}
{{ end }}
{{ end }}

View file

@ -1,6 +1,5 @@
{{ template "vault.mode" . }}
{{- if ne .mode "external" }}
{{- template "vault.serverEnabled" . -}}
{{- if .serverEnabled -}}
{{- if eq .mode "ha" }}
{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" -}}
@ -27,4 +26,4 @@ subjects:
namespace: {{ .Release.Namespace }}
{{ end }}
{{ end }}
{{ end }}
{{ end }}

View file

@ -1,6 +1,5 @@
{{ template "vault.mode" . }}
{{- if ne .mode "external" -}}
{{- template "vault.serverEnabled" . -}}
{{- if .serverEnabled -}}
{{- if and (eq .mode "ha") (eq (.Values.server.ha.disruptionBudget.enabled | toString) "true") -}}
# PodDisruptionBudget to prevent degrading the server cluster through
@ -24,4 +23,4 @@ spec:
component: server
{{- end -}}
{{- end -}}
{{- end -}}
{{- end -}}

View file

@ -42,4 +42,4 @@ spec:
vault-active: "true"
{{- end }}
{{- end }}
{{- end }}
{{- end }}

View file

@ -1,5 +1,4 @@
{{ template "vault.mode" . }}
{{- template "vault.serverEnabled" . -}}
{{- if .serverEnabled -}}
{{- if and (ne .mode "") (eq (.Values.global.psp.enable | toString) "true") }}
apiVersion: rbac.authorization.k8s.io/v1
@ -18,4 +17,4 @@ rules:
resourceNames:
- {{ template "vault.fullname" . }}
{{- end }}
{{- end }}
{{- end }}

View file

@ -1,5 +1,4 @@
{{ template "vault.mode" . }}
{{- template "vault.serverEnabled" . -}}
{{- if .serverEnabled -}}
{{- if and (ne .mode "") (eq (.Values.global.psp.enable | toString) "true") }}
apiVersion: rbac.authorization.k8s.io/v1
@ -19,4 +18,4 @@ subjects:
- kind: ServiceAccount
name: {{ template "vault.fullname" . }}
{{- end }}
{{- end }}
{{- end }}

View file

@ -1,5 +1,4 @@
{{ template "vault.mode" . }}
{{- template "vault.serverEnabled" . -}}
{{- if .serverEnabled -}}
{{- if and (ne .mode "") (eq (.Values.global.psp.enable | toString) "true") }}
apiVersion: policy/v1beta1
@ -47,4 +46,4 @@ spec:
max: 65535
readOnlyRootFilesystem: false
{{- end }}
{{- end }}
{{- end }}

View file

@ -1,5 +1,4 @@
{{ template "vault.mode" . }}
{{- template "vault.serverEnabled" . -}}
{{- if .serverEnabled -}}
{{- if (eq (.Values.server.serviceAccount.create | toString) "true" ) }}
apiVersion: v1

View file

@ -1,7 +1,6 @@
{{ template "vault.mode" . }}
{{- if ne .mode "external" }}
{{- if ne .mode "" }}
{{- template "vault.serverEnabled" . -}}
{{- if .serverEnabled -}}
# StatefulSet to run the actual vault server cluster.
apiVersion: apps/v1
@ -208,4 +207,4 @@ spec:
{{ template "vault.volumeclaims" . }}
{{ end }}
{{ end }}
{{ end }}
{{ end }}

View file

@ -1,6 +1,5 @@
{{ template "vault.mode" . }}
{{- if ne .mode "external" }}
{{- template "vault.serverEnabled" . -}}
{{- if .serverEnabled -}}
apiVersion: v1
kind: Pod