From f1bdcc3251bb7eb8671ef6c3177c463467f9c3c9 Mon Sep 17 00:00:00 2001 From: Tin Lam Date: Mon, 16 Mar 2020 08:09:04 -0500 Subject: [PATCH] Fix network policy job This patch set addresses an issue with the placement component of nova breaking the network policy job. Also, make the network policy jobs voting to ensure things do not break. Change-Id: I41dfa6a335a915dbaf08114c2e14e906c76e85ba Signed-off-by: Tin Lam --- nova/templates/netpol-nova.yaml | 20 +++++++++++++++++++ ...work_policy.yaml => netpol-placement.yaml} | 4 ---- zuul.d/project.yaml | 6 ++---- 3 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 nova/templates/netpol-nova.yaml rename nova/templates/{network_policy.yaml => netpol-placement.yaml} (78%) diff --git a/nova/templates/netpol-nova.yaml b/nova/templates/netpol-nova.yaml new file mode 100644 index 0000000000..4939aca7d7 --- /dev/null +++ b/nova/templates/netpol-nova.yaml @@ -0,0 +1,20 @@ +{{/* +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" "nova" }} +{{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }} +{{- end -}} diff --git a/nova/templates/network_policy.yaml b/nova/templates/netpol-placement.yaml similarity index 78% rename from nova/templates/network_policy.yaml rename to nova/templates/netpol-placement.yaml index 7cc8b7c0b7..110621464c 100644 --- a/nova/templates/network_policy.yaml +++ b/nova/templates/netpol-placement.yaml @@ -15,10 +15,6 @@ limitations under the License. */}} {{- if .Values.manifests.network_policy -}} -{{- $netpol_opts := dict "envAll" . "name" "application" "label" "nova" }} -{{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }} -{{- if .Values.manifests.deployment_placement -}} {{- $netpol_opts := dict "envAll" . "name" "application" "label" "placement" }} {{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }} {{- end -}} -{{- end -}} diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index e45871c715..c304f12335 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -46,10 +46,8 @@ - openstack-helm-horizon - openstack-helm-apparmor: voting: false - - openstack-helm-netpol-compute-kit: - voting: false - - openstack-helm-netpol-cinder: - voting: false + - openstack-helm-netpol-compute-kit + - openstack-helm-netpol-cinder gate: jobs: - openstack-helm-lint