Add node_selector_key for OVN VPN agent

Also Provide default value for manifests.daemonset_ovn*

Change-Id: I11d461c1b233862af6a6bff78c64543e758fa387
This commit is contained in:
ricolin 2024-10-08 21:17:53 +08:00 committed by Vladimir Kozhukalov
parent bdeb6412a3
commit 8e5ad85fd0
4 changed files with 8 additions and 2 deletions

View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Neutron description: OpenStack-Helm Neutron
name: neutron name: neutron
version: 0.3.48 version: 0.3.49
home: https://docs.openstack.org/neutron/latest/ home: https://docs.openstack.org/neutron/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
sources: sources:

View File

@ -83,7 +83,7 @@ spec:
{{ tuple $envAll "neutron" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} {{ tuple $envAll "neutron" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }}
{{ end }} {{ end }}
nodeSelector: nodeSelector:
{{ .Values.labels.ovs.node_selector_key }}: {{ .Values.labels.ovs.node_selector_value }} {{ .Values.labels.agent.ovn_vpn.node_selector_key }}: {{ .Values.labels.agent.ovn_vpn.node_selector_value }}
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet
hostNetwork: true hostNetwork: true
{{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "10" ) }} {{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "10" ) }}

View File

@ -70,6 +70,9 @@ labels:
l2gw: l2gw:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
node_selector_value: enabled node_selector_value: enabled
ovn_vpn:
node_selector_key: openstack-control-plane
node_selector_value: enabled
job: job:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
node_selector_value: enabled node_selector_value: enabled
@ -2651,6 +2654,8 @@ manifests:
daemonset_bagpipe_bgp: false daemonset_bagpipe_bgp: false
daemonset_bgp_dragent: false daemonset_bgp_dragent: false
daemonset_netns_cleanup_cron: true daemonset_netns_cleanup_cron: true
daemonset_ovn_metadata_agent: false
daemonset_ovn_vpn_agent: false
deployment_ironic_agent: false deployment_ironic_agent: false
deployment_server: true deployment_server: true
deployment_rpc_server: true deployment_rpc_server: true

View File

@ -90,4 +90,5 @@ neutron:
- 0.3.46 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default - 0.3.46 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default
- 0.3.47 Add service role to the Neutron user - 0.3.47 Add service role to the Neutron user
- 0.3.48 Add 2024.2 Ubuntu Jammy overrides - 0.3.48 Add 2024.2 Ubuntu Jammy overrides
- 0.3.49 Add node_selector_* for OVN VPN agent
... ...