Allow explicit network policy enablement (#381)

* Disable default network policy

* Make network policy configurable by explicit flag only
This commit is contained in:
Volodymyr Stoiko 2020-09-16 09:40:56 +03:00 committed by GitHub
parent fc8ebfdd4e
commit 66ea34c702
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions

View file

@ -1,4 +1,4 @@
{{- if .Values.global.openshift }} {{- if eq (.Values.server.networkPolicy.enabled | toString) "true" }}
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
kind: NetworkPolicy kind: NetworkPolicy
metadata: metadata:

View file

@ -2,7 +2,7 @@
load _helpers load _helpers
@test "server/network-policy: OpenShift - disabled by default" { @test "server/network-policy: disabled by default" {
cd `chart_dir` cd `chart_dir`
local actual=$( (helm template \ local actual=$( (helm template \
--show-only templates/server-network-policy.yaml \ --show-only templates/server-network-policy.yaml \
@ -11,12 +11,12 @@ load _helpers
[ "${actual}" = "false" ] [ "${actual}" = "false" ]
} }
@test "server/network-policy: OpenShift - enabled if OpenShift" { @test "server/network-policy: enabled by server.networkPolicy.enabled" {
cd `chart_dir` cd `chart_dir`
local actual=$( (helm template \ local actual=$( (helm template \
--set 'global.openshift=true' \ --set 'server.networkPolicy.enabled=true' \
--show-only templates/server-network-policy.yaml \ --show-only templates/server-network-policy.yaml \
. || echo "---") | tee /dev/stderr | . || echo "---") | tee /dev/stderr |
yq 'length > 0' | tee /dev/stderr) yq 'length > 0' | tee /dev/stderr)
[ "${actual}" = "true" ] [ "${actual}" = "true" ]
} }

View file

@ -318,6 +318,10 @@ server:
# beta.kubernetes.io/arch: amd64 # beta.kubernetes.io/arch: amd64
nodeSelector: null nodeSelector: null
# Enables network policy for server pods
networkPolicy:
enabled: false
# Priority class for server pods # Priority class for server pods
priorityClassName: "" priorityClassName: ""