This reverts commit 2af6f9b44f
.
This commit is contained in:
parent
2af6f9b44f
commit
08a6f929b8
4 changed files with 0 additions and 40 deletions
|
@ -94,9 +94,6 @@ spec:
|
||||||
periodSeconds: 2
|
periodSeconds: 2
|
||||||
successThreshold: 1
|
successThreshold: 1
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
{{- if .Values.injector.priorityClassName }}
|
|
||||||
priorityClassName: {{ .Values.injector.priorityClassName }}
|
|
||||||
{{- end }}
|
|
||||||
{{- if .Values.injector.certs.secretName }}
|
{{- if .Values.injector.certs.secretName }}
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: webhook-certs
|
- name: webhook-certs
|
||||||
|
|
|
@ -158,9 +158,6 @@ spec:
|
||||||
{{- if .Values.server.extraContainers }}
|
{{- if .Values.server.extraContainers }}
|
||||||
{{ toYaml .Values.server.extraContainers | nindent 8}}
|
{{ toYaml .Values.server.extraContainers | nindent 8}}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.server.priorityClassName }}
|
|
||||||
priorityClassName: {{ .Values.server.priorityClassName }}
|
|
||||||
{{- end }}
|
|
||||||
{{- if .Values.global.imagePullSecrets }}
|
{{- if .Values.global.imagePullSecrets }}
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
{{- toYaml .Values.global.imagePullSecrets | nindent 8 }}
|
{{- toYaml .Values.global.imagePullSecrets | nindent 8 }}
|
||||||
|
|
|
@ -872,29 +872,6 @@ load _helpers
|
||||||
[[ "${actual}" = *"foobar"* ]]
|
[[ "${actual}" = *"foobar"* ]]
|
||||||
}
|
}
|
||||||
|
|
||||||
#--------------------------------------------------------------------
|
|
||||||
# priorityClassName
|
|
||||||
|
|
||||||
@test "server/standalone-StatefulSet: priorityClassName disabled by default" {
|
|
||||||
cd `chart_dir`
|
|
||||||
local actual=$(helm template \
|
|
||||||
-x templates/server-statefulset.yaml \
|
|
||||||
. | tee /dev/stderr |
|
|
||||||
yq -r '.spec.template.spec.priorityClassName' | tee /dev/stderr)
|
|
||||||
|
|
||||||
[ "${actual}" = "null" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "server/standalone-StatefulSet: priorityClassName enabled" {
|
|
||||||
cd `chart_dir`
|
|
||||||
local actual=$(helm template \
|
|
||||||
-x templates/server-statefulset.yaml \
|
|
||||||
--set 'server.priorityClassName=foo' \
|
|
||||||
. | tee /dev/stderr |
|
|
||||||
yq -r '.spec.template.spec.priorityClassName' | tee /dev/stderr)
|
|
||||||
|
|
||||||
[ "${actual}" = "foo" ]
|
|
||||||
|
|
||||||
#--------------------------------------------------------------------
|
#--------------------------------------------------------------------
|
||||||
# preStop
|
# preStop
|
||||||
@test "server/standalone-StatefulSet: preStop sleep duration default" {
|
@test "server/standalone-StatefulSet: preStop sleep duration default" {
|
||||||
|
|
11
values.yaml
11
values.yaml
|
@ -81,11 +81,6 @@ injector:
|
||||||
# memory: 256Mi
|
# memory: 256Mi
|
||||||
# cpu: 250m
|
# cpu: 250m
|
||||||
|
|
||||||
# priorityClassName launches injector pods with a priority class.
|
|
||||||
# See: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
|
|
||||||
# for more details.
|
|
||||||
priorityClassName: null
|
|
||||||
|
|
||||||
# extraEnvironmentVars is a list of extra enviroment variables to set in the
|
# extraEnvironmentVars is a list of extra enviroment variables to set in the
|
||||||
# injector deployment.
|
# injector deployment.
|
||||||
extraEnvironmentVars: {}
|
extraEnvironmentVars: {}
|
||||||
|
@ -136,12 +131,6 @@ server:
|
||||||
# cpu: 250m
|
# cpu: 250m
|
||||||
|
|
||||||
# Ingress allows ingress services to be created to allow external access
|
# Ingress allows ingress services to be created to allow external access
|
||||||
# priorityClassName launches server pods with a priority class.
|
|
||||||
# See: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
|
|
||||||
# for more details.
|
|
||||||
priorityClassName: null
|
|
||||||
|
|
||||||
# Ingress allows ingress services to be created to allow external access
|
|
||||||
# from Kubernetes to access Vault pods.
|
# from Kubernetes to access Vault pods.
|
||||||
ingress:
|
ingress:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|
Loading…
Reference in a new issue