Merge "Allow to configure service network policy"

This commit is contained in:
Zuul 2019-09-27 10:36:41 +00:00 committed by Gerrit Code Review
commit d5ab6a05c4
4 changed files with 52 additions and 0 deletions

View File

@ -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 -}}

View File

@ -338,6 +338,13 @@ pod:
memory: "128Mi"
cpu: "100m"
network_policy:
armada:
ingress:
- {}
egress:
- {}
manifests:
configmap_bin: true
configmap_etc: true
@ -352,3 +359,4 @@ manifests:
service: true
service_ingress: true
test_armada_api: true
network_policy: false

View File

@ -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 -}}

View File

@ -61,6 +61,14 @@ pod:
memory: "128Mi"
cpu: "100m"
network_policy:
tiller:
ingress:
- {}
egress:
- {}
manifests:
deployment_tiller: true
service_tiller_deploy: true
network_policy: false