Use host network for ovn controller pods
Change-Id: I9f852ff54cfc42536387fa51a73f019b56070345
This commit is contained in:
parent
1a112e9fba
commit
4d5919b070
@ -15,7 +15,7 @@ apiVersion: v1
|
|||||||
appVersion: v23.3.0
|
appVersion: v23.3.0
|
||||||
description: OpenStack-Helm OVN
|
description: OpenStack-Helm OVN
|
||||||
name: ovn
|
name: ovn
|
||||||
version: 0.1.6
|
version: 0.1.7
|
||||||
home: https://www.ovn.org
|
home: https://www.ovn.org
|
||||||
icon: https://www.ovn.org/images/ovn-logo.png
|
icon: https://www.ovn.org/images/ovn-logo.png
|
||||||
sources:
|
sources:
|
||||||
|
@ -68,7 +68,7 @@ ovs-vsctl set open . external-ids:ovn-bridge-mappings="{{ .Values.conf.ovn_bridg
|
|||||||
ovs-vsctl set open . external-ids:ovn-cms-options="{{ .Values.conf.ovn_cms_options }}"
|
ovs-vsctl set open . external-ids:ovn-cms-options="{{ .Values.conf.ovn_cms_options }}"
|
||||||
|
|
||||||
# Configure hostname
|
# Configure hostname
|
||||||
{{- if .Values.conf.use_fqdn.compute }}
|
{{- if .Values.pod.use_fqdn.compute }}
|
||||||
ovs-vsctl set open . external-ids:hostname="$(hostname -f)"
|
ovs-vsctl set open . external-ids:hostname="$(hostname -f)"
|
||||||
{{- else }}
|
{{- else }}
|
||||||
ovs-vsctl set open . external-ids:hostname="$(hostname)"
|
ovs-vsctl set open . external-ids:hostname="$(hostname)"
|
||||||
|
@ -42,11 +42,16 @@ spec:
|
|||||||
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
|
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: {{ $serviceAccountName }}
|
serviceAccountName: {{ $serviceAccountName }}
|
||||||
|
hostNetwork: true
|
||||||
|
hostPID: true
|
||||||
|
hostIPC: true
|
||||||
|
dnsPolicy: ClusterFirstWithHostNet
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
{{ .Values.labels.ovn_controller.node_selector_key }}: {{ .Values.labels.ovn_controller.node_selector_value }}
|
{{ .Values.labels.ovn_controller.node_selector_key }}: {{ .Values.labels.ovn_controller.node_selector_value }}
|
||||||
initContainers:
|
initContainers:
|
||||||
{{- tuple $envAll "ovn_controller" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
{{- tuple $envAll "ovn_controller" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
||||||
- name: controller-init
|
- name: controller-init
|
||||||
|
{{ dict "envAll" $envAll "application" "ovn_controller" "container" "controller_init" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
||||||
{{ tuple $envAll "ovn_controller" | include "helm-toolkit.snippets.image" | indent 10 }}
|
{{ tuple $envAll "ovn_controller" | include "helm-toolkit.snippets.image" | indent 10 }}
|
||||||
command:
|
command:
|
||||||
- /tmp/ovn-controller-init.sh
|
- /tmp/ovn-controller-init.sh
|
||||||
@ -82,6 +87,10 @@ spec:
|
|||||||
readOnly: true
|
readOnly: true
|
||||||
- name: run-openvswitch
|
- name: run-openvswitch
|
||||||
mountPath: /run/openvswitch
|
mountPath: /run/openvswitch
|
||||||
|
- name: logs
|
||||||
|
mountPath: /var/log/ovn
|
||||||
|
- name: run-ovn
|
||||||
|
mountPath: /run/ovn
|
||||||
volumes:
|
volumes:
|
||||||
- name: ovn-bin
|
- name: ovn-bin
|
||||||
configMap:
|
configMap:
|
||||||
@ -95,4 +104,12 @@ spec:
|
|||||||
secret:
|
secret:
|
||||||
secretName: {{ $configMapName }}
|
secretName: {{ $configMapName }}
|
||||||
defaultMode: 0444
|
defaultMode: 0444
|
||||||
|
- name: logs
|
||||||
|
hostPath:
|
||||||
|
path: /var/log/ovn
|
||||||
|
type: DirectoryOrCreate
|
||||||
|
- name: run-ovn
|
||||||
|
hostPath:
|
||||||
|
path: /run/ovn
|
||||||
|
type: DirectoryOrCreate
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -76,11 +76,10 @@ conf:
|
|||||||
# br-public: eth1
|
# br-public: eth1
|
||||||
auto_bridge_add: {}
|
auto_bridge_add: {}
|
||||||
|
|
||||||
# NOTE: should be same as nova.conf.use_fqdn.compute
|
pod:
|
||||||
|
# NOTE: should be same as nova.pod.use_fqdn.compute
|
||||||
use_fqdn:
|
use_fqdn:
|
||||||
compute: true
|
compute: true
|
||||||
|
|
||||||
pod:
|
|
||||||
security_context:
|
security_context:
|
||||||
ovn_northd:
|
ovn_northd:
|
||||||
container:
|
container:
|
||||||
@ -90,10 +89,12 @@ pod:
|
|||||||
- SYS_NICE
|
- SYS_NICE
|
||||||
ovn_controller:
|
ovn_controller:
|
||||||
container:
|
container:
|
||||||
|
controller_init:
|
||||||
|
readOnlyRootFilesystem: true
|
||||||
|
privileged: true
|
||||||
controller:
|
controller:
|
||||||
capabilities:
|
readOnlyRootFilesystem: true
|
||||||
add:
|
privileged: true
|
||||||
- SYS_NICE
|
|
||||||
tolerations:
|
tolerations:
|
||||||
ovn_ovsdb_nb:
|
ovn_ovsdb_nb:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
@ -7,4 +7,5 @@ ovn:
|
|||||||
- 0.1.4 Add support for OVN HA + refactor
|
- 0.1.4 Add support for OVN HA + refactor
|
||||||
- 0.1.5 Add ubuntu_focal and ubuntu_jammy overrides
|
- 0.1.5 Add ubuntu_focal and ubuntu_jammy overrides
|
||||||
- 0.1.6 Fix ovsdb port number
|
- 0.1.6 Fix ovsdb port number
|
||||||
|
- 0.1.7 Use host network for ovn controller pods
|
||||||
...
|
...
|
||||||
|
Loading…
Reference in New Issue
Block a user