Skip to content

Commit

Permalink
Revert "Add support for priorityClassName (#165)" (#287)
Browse files Browse the repository at this point in the history
This reverts commit 2af6f9b.
  • Loading branch information
jasonodonnell authored May 5, 2020
1 parent 2af6f9b commit 08a6f92
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 40 deletions.
3 changes: 0 additions & 3 deletions templates/injector-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@ spec:
periodSeconds: 2
successThreshold: 1
timeoutSeconds: 5
{{- if .Values.injector.priorityClassName }}
priorityClassName: {{ .Values.injector.priorityClassName }}
{{- end }}
{{- if .Values.injector.certs.secretName }}
volumeMounts:
- name: webhook-certs
Expand Down
3 changes: 0 additions & 3 deletions templates/server-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,6 @@ spec:
{{- if .Values.server.extraContainers }}
{{ toYaml .Values.server.extraContainers | nindent 8}}
{{- end }}
{{- if .Values.server.priorityClassName }}
priorityClassName: {{ .Values.server.priorityClassName }}
{{- end }}
{{- if .Values.global.imagePullSecrets }}
imagePullSecrets:
{{- toYaml .Values.global.imagePullSecrets | nindent 8 }}
Expand Down
23 changes: 0 additions & 23 deletions test/unit/server-statefulset.bats
Original file line number Diff line number Diff line change
Expand Up @@ -872,29 +872,6 @@ load _helpers
[[ "${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
@test "server/standalone-StatefulSet: preStop sleep duration default" {
Expand Down
11 changes: 0 additions & 11 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,6 @@ injector:
# memory: 256Mi
# 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
# injector deployment.
extraEnvironmentVars: {}
Expand Down Expand Up @@ -136,12 +131,6 @@ server:
# cpu: 250m

# 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.
ingress:
enabled: false
Expand Down

0 comments on commit 08a6f92

Please sign in to comment.