From 2d320ff0aa97e2ba51902a8b1983a9fafeb6b1ce Mon Sep 17 00:00:00 2001 From: Evgeny L Date: Fri, 20 Sep 2019 19:41:50 +0000 Subject: [PATCH] Allow to configure service network policy The patch introduces network policy configuration similar to openstack-helm services. It allows users to configure policies depending on the environment. * Network policies are disabled by default. * When enabled default policies allow all ingress and egress traffic (i.e. policy set to {}), this may be changed in future patch-sets. Change-Id: Ie14a652830b4366e070ded91f8bbf83ca24d1007 --- charts/armada/templates/network_policy.yaml | 18 ++++++++++++++++++ charts/armada/values.yaml | 8 ++++++++ charts/tiller/templates/network_policy.yaml | 18 ++++++++++++++++++ charts/tiller/values.yaml | 8 ++++++++ 4 files changed, 52 insertions(+) create mode 100644 charts/armada/templates/network_policy.yaml create mode 100644 charts/tiller/templates/network_policy.yaml diff --git a/charts/armada/templates/network_policy.yaml b/charts/armada/templates/network_policy.yaml new file mode 100644 index 00000000..f22e061a --- /dev/null +++ b/charts/armada/templates/network_policy.yaml @@ -0,0 +1,18 @@ +# Copyright 2017-2018 The Openstack-Helm Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +{{- if .Values.manifests.network_policy -}} +{{- $netpol_opts := dict "envAll" . "name" "application" "label" "armada" -}} +{{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }} +{{- end -}} diff --git a/charts/armada/values.yaml b/charts/armada/values.yaml index e5147a52..a9d0a319 100644 --- a/charts/armada/values.yaml +++ b/charts/armada/values.yaml @@ -337,6 +337,13 @@ pod: memory: "128Mi" cpu: "100m" +network_policy: + armada: + ingress: + - {} + egress: + - {} + manifests: configmap_bin: true configmap_etc: true @@ -351,3 +358,4 @@ manifests: service: true service_ingress: true test_armada_api: true + network_policy: false diff --git a/charts/tiller/templates/network_policy.yaml b/charts/tiller/templates/network_policy.yaml new file mode 100644 index 00000000..719d5bcf --- /dev/null +++ b/charts/tiller/templates/network_policy.yaml @@ -0,0 +1,18 @@ +# Copyright 2017-2018 The Openstack-Helm Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +{{- if .Values.manifests.network_policy -}} +{{- $netpol_opts := dict "envAll" . "name" "application" "label" "tiller" -}} +{{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }} +{{- end -}} diff --git a/charts/tiller/values.yaml b/charts/tiller/values.yaml index d701eba6..9ed80fa7 100644 --- a/charts/tiller/values.yaml +++ b/charts/tiller/values.yaml @@ -60,6 +60,14 @@ pod: memory: "128Mi" cpu: "100m" +network_policy: + tiller: + ingress: + - {} + egress: + - {} + manifests: deployment_tiller: true service_tiller_deploy: true + network_policy: false