9abf057340
This reverts commit 09d6a3e68c3d95e27ce7a7395735d058062e9d17. It causes failures during brown field upgrade. Change-Id: Ie619358bd0ae046bfb94b9e9d811251b54d2897e
298 lines
13 KiB
YAML
298 lines
13 KiB
YAML
{{/*
|
|
Copyright 2017 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.
|
|
*/}}
|
|
|
|
{{- define "ovsAgentReadinessProbeTemplate" }}
|
|
exec:
|
|
command:
|
|
- /tmp/neutron-openvswitch-agent-readiness.sh
|
|
{{- end }}
|
|
{{- define "ovsAgentLivenessProbeTemplate" }}
|
|
exec:
|
|
command:
|
|
- python
|
|
- /tmp/health-probe.py
|
|
- --config-file
|
|
- /etc/neutron/neutron.conf
|
|
- --config-file
|
|
- /etc/neutron/plugins/ml2/openvswitch_agent.ini
|
|
- --agent-queue-name
|
|
- q-agent-notifier-tunnel-update
|
|
- --liveness-probe
|
|
{{- if .Values.pod.use_fqdn.neutron_agent }}
|
|
- --use-fqdn
|
|
{{- end }}
|
|
{{- end }}
|
|
|
|
{{- define "neutron.ovs_agent.daemonset" }}
|
|
{{- $daemonset := index . 0 }}
|
|
{{- $configMapName := index . 1 }}
|
|
{{- $serviceAccountName := index . 2 }}
|
|
{{- $envAll := index . 3 }}
|
|
{{- with $envAll }}
|
|
|
|
{{- $mounts_neutron_ovs_agent := .Values.pod.mounts.neutron_ovs_agent.neutron_ovs_agent }}
|
|
{{- $mounts_neutron_ovs_agent_init := .Values.pod.mounts.neutron_ovs_agent.init_container }}
|
|
|
|
---
|
|
apiVersion: apps/v1
|
|
kind: DaemonSet
|
|
metadata:
|
|
name: neutron-ovs-agent
|
|
annotations:
|
|
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
|
|
labels:
|
|
{{ tuple $envAll "neutron" "neutron-ovs-agent" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
|
|
spec:
|
|
selector:
|
|
matchLabels:
|
|
{{ tuple $envAll "neutron" "neutron-ovs-agent" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
|
|
{{ tuple $envAll "ovs_agent" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
|
|
template:
|
|
metadata:
|
|
labels:
|
|
{{ tuple $envAll "neutron" "neutron-ovs-agent" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
|
annotations:
|
|
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
|
|
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
|
|
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
|
|
spec:
|
|
{{ dict "envAll" $envAll "application" "neutron_ovs_agent" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
|
|
serviceAccountName: {{ $serviceAccountName }}
|
|
nodeSelector:
|
|
{{ .Values.labels.ovs.node_selector_key }}: {{ .Values.labels.ovs.node_selector_value }}
|
|
dnsPolicy: ClusterFirstWithHostNet
|
|
hostNetwork: true
|
|
{{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "10" ) }}
|
|
shareProcessNamespace: true
|
|
{{- else }}
|
|
hostPID: true
|
|
{{- end }}
|
|
initContainers:
|
|
{{ tuple $envAll "pod_dependency" $mounts_neutron_ovs_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
|
- name: neutron-openvswitch-agent-kernel-modules
|
|
{{ tuple $envAll "neutron_openvswitch_agent" | include "helm-toolkit.snippets.image" | indent 10 }}
|
|
{{ dict "envAll" $envAll "application" "neutron_ovs_agent" "container" "neutron_openvswitch_agent_kernel_modules" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
|
command:
|
|
- /tmp/neutron-openvswitch-agent-init-modules.sh
|
|
volumeMounts:
|
|
- name: pod-tmp
|
|
mountPath: /tmp
|
|
- name: neutron-bin
|
|
mountPath: /tmp/neutron-openvswitch-agent-init-modules.sh
|
|
subPath: neutron-openvswitch-agent-init-modules.sh
|
|
readOnly: true
|
|
- name: host-rootfs
|
|
mountPath: /mnt/host-rootfs
|
|
readOnly: true
|
|
{{- if .Values.conf.ovs_dpdk.enabled }}
|
|
- name: pci-devices
|
|
mountPath: /sys/bus/pci/devices
|
|
{{- end }}
|
|
- name: neutron-ovs-agent-init
|
|
{{ tuple $envAll "neutron_openvswitch_agent" | include "helm-toolkit.snippets.image" | indent 10 }}
|
|
{{ tuple $envAll $envAll.Values.pod.resources.agent.ovs | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
|
{{ dict "envAll" $envAll "application" "neutron_ovs_agent" "container" "neutron_ovs_agent_init" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
|
command:
|
|
- /tmp/neutron-openvswitch-agent-init.sh
|
|
volumeMounts:
|
|
- name: pod-tmp
|
|
mountPath: /tmp
|
|
- name: neutron-bin
|
|
mountPath: /tmp/neutron-openvswitch-agent-init.sh
|
|
subPath: neutron-openvswitch-agent-init.sh
|
|
readOnly: true
|
|
- name: pod-shared
|
|
mountPath: /tmp/pod-shared
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/neutron.conf
|
|
subPath: neutron.conf
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
|
|
subPath: ml2_conf.ini
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/plugins/ml2/openvswitch_agent.ini
|
|
subPath: openvswitch_agent.ini
|
|
readOnly: true
|
|
{{- if .Values.conf.neutron.DEFAULT.log_config_append }}
|
|
- name: neutron-etc
|
|
mountPath: {{ .Values.conf.neutron.DEFAULT.log_config_append }}
|
|
subPath: {{ base .Values.conf.neutron.DEFAULT.log_config_append }}
|
|
readOnly: true
|
|
{{- end }}
|
|
{{- if .Values.conf.plugins.taas.taas.enabled }}
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/plugins/ml2/taas.ini
|
|
subPath: taas.ini
|
|
readOnly: true
|
|
{{- end }}
|
|
- name: neutron-etc
|
|
# NOTE (Portdirect): We mount here to override Kollas
|
|
# custom sudoers file when using Kolla images, this
|
|
# location will also work fine for other images.
|
|
mountPath: /etc/sudoers.d/kolla_neutron_sudoers
|
|
subPath: neutron_sudoers
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /tmp/auto_bridge_add
|
|
subPath: auto_bridge_add
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.conf
|
|
subPath: rootwrap.conf
|
|
readOnly: true
|
|
{{- if .Values.conf.ovs_dpdk.enabled }}
|
|
- name: neutron-etc
|
|
mountPath: /tmp/dpdk.conf
|
|
subPath: dpdk.conf
|
|
readOnly: true
|
|
{{- end }}
|
|
{{- range $key, $value := $envAll.Values.conf.rootwrap_filters }}
|
|
{{- if ( has "ovs_agent" $value.pods ) }}
|
|
{{- $filePrefix := replace "_" "-" $key }}
|
|
{{- $rootwrapFile := printf "/etc/neutron/rootwrap.d/%s.filters" $filePrefix }}
|
|
- name: neutron-etc
|
|
mountPath: {{ $rootwrapFile }}
|
|
subPath: {{ base $rootwrapFile }}
|
|
readOnly: true
|
|
{{- end }}
|
|
{{- end }}
|
|
- name: run
|
|
mountPath: /run
|
|
{{ if $mounts_neutron_ovs_agent.volumeMounts }}{{ toYaml $mounts_neutron_ovs_agent.volumeMounts | indent 12 }}{{ end }}
|
|
containers:
|
|
- name: neutron-ovs-agent
|
|
{{ tuple $envAll "neutron_openvswitch_agent" | include "helm-toolkit.snippets.image" | indent 10 }}
|
|
{{ tuple $envAll $envAll.Values.pod.resources.agent.ovs | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
|
{{ dict "envAll" $envAll "component" "ovs_agent" "container" "ovs_agent" "type" "readiness" "probeTemplate" (include "ovsAgentReadinessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }}
|
|
{{ dict "envAll" $envAll "component" "ovs_agent" "container" "ovs_agent" "type" "liveness" "probeTemplate" (include "ovsAgentLivenessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }}
|
|
{{ dict "envAll" $envAll "application" "neutron_ovs_agent" "container" "neutron_ovs_agent" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
|
command:
|
|
- /tmp/neutron-openvswitch-agent.sh
|
|
volumeMounts:
|
|
- name: pod-tmp
|
|
mountPath: /tmp
|
|
- name: pod-var-neutron
|
|
mountPath: {{ .Values.conf.neutron.DEFAULT.state_path }}
|
|
- name: neutron-bin
|
|
mountPath: /tmp/neutron-openvswitch-agent.sh
|
|
subPath: neutron-openvswitch-agent.sh
|
|
readOnly: true
|
|
- name: neutron-bin
|
|
mountPath: /tmp/neutron-openvswitch-agent-readiness.sh
|
|
subPath: neutron-openvswitch-agent-readiness.sh
|
|
readOnly: true
|
|
- name: neutron-bin
|
|
mountPath: /tmp/health-probe.py
|
|
subPath: health-probe.py
|
|
readOnly: true
|
|
- name: pod-shared
|
|
mountPath: /tmp/pod-shared
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/neutron.conf
|
|
subPath: neutron.conf
|
|
readOnly: true
|
|
{{- if .Values.conf.neutron.DEFAULT.log_config_append }}
|
|
- name: neutron-etc
|
|
mountPath: {{ .Values.conf.neutron.DEFAULT.log_config_append }}
|
|
subPath: {{ base .Values.conf.neutron.DEFAULT.log_config_append }}
|
|
readOnly: true
|
|
{{- end }}
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
|
|
subPath: ml2_conf.ini
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/plugins/ml2/openvswitch_agent.ini
|
|
subPath: openvswitch_agent.ini
|
|
readOnly: true
|
|
{{- if .Values.conf.plugins.taas.taas.enabled }}
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/plugins/ml2/taas.ini
|
|
subPath: taas.ini
|
|
readOnly: true
|
|
{{- end }}
|
|
- name: neutron-etc
|
|
# NOTE (Portdirect): We mount here to override Kollas
|
|
# custom sudoers file when using Kolla images, this
|
|
# location will also work fine for other images.
|
|
mountPath: /etc/sudoers.d/kolla_neutron_sudoers
|
|
subPath: neutron_sudoers
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.conf
|
|
subPath: rootwrap.conf
|
|
readOnly: true
|
|
{{- range $key, $value := $envAll.Values.conf.rootwrap_filters }}
|
|
{{- if ( has "ovs_agent" $value.pods ) }}
|
|
{{- $filePrefix := replace "_" "-" $key }}
|
|
{{- $rootwrapFile := printf "/etc/neutron/rootwrap.d/%s.filters" $filePrefix }}
|
|
- name: neutron-etc
|
|
mountPath: {{ $rootwrapFile }}
|
|
subPath: {{ base $rootwrapFile }}
|
|
readOnly: true
|
|
{{- end }}
|
|
{{- end }}
|
|
- name: run
|
|
mountPath: /run
|
|
{{ if $mounts_neutron_ovs_agent.volumeMounts }}{{ toYaml $mounts_neutron_ovs_agent.volumeMounts | indent 12 }}{{ end }}
|
|
volumes:
|
|
- name: pod-tmp
|
|
emptyDir: {}
|
|
- name: pod-var-neutron
|
|
emptyDir: {}
|
|
- name: varlibopenvswitch
|
|
emptyDir: {}
|
|
- name: pod-shared
|
|
emptyDir: {}
|
|
- name: neutron-bin
|
|
configMap:
|
|
name: neutron-bin
|
|
defaultMode: 0555
|
|
- name: neutron-etc
|
|
secret:
|
|
secretName: {{ $configMapName }}
|
|
defaultMode: 0444
|
|
- name: run
|
|
hostPath:
|
|
path: /run
|
|
- name: host-rootfs
|
|
hostPath:
|
|
path: /
|
|
{{- if .Values.conf.ovs_dpdk.enabled }}
|
|
- name: pci-devices
|
|
hostPath:
|
|
path: /sys/bus/pci/devices
|
|
type: Directory
|
|
{{- end }}
|
|
{{ if $mounts_neutron_ovs_agent.volumes }}{{ toYaml $mounts_neutron_ovs_agent.volumes | indent 8 }}{{ end }}
|
|
{{- end }}
|
|
{{- end }}
|
|
|
|
{{- if and .Values.manifests.daemonset_ovs_agent ( has "openvswitch" .Values.network.backend ) }}
|
|
{{- $envAll := . }}
|
|
{{- $daemonset := "ovs-agent" }}
|
|
{{- $configMapName := "neutron-etc" }}
|
|
{{- $serviceAccountName := "neutron-ovs-agent" }}
|
|
{{- $dependencyOpts := dict "envAll" $envAll "dependencyMixinParam" $envAll.Values.network.backend "dependencyKey" "ovs_agent" -}}
|
|
{{- $_ := include "helm-toolkit.utils.dependency_resolver" $dependencyOpts | toString | fromYaml }}
|
|
{{ tuple $envAll "pod_dependency" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
|
{{- $daemonset_yaml := list $daemonset $configMapName $serviceAccountName . | include "neutron.ovs_agent.daemonset" | toString | fromYaml }}
|
|
{{- $configmap_yaml := "neutron.configmap.etc" }}
|
|
{{- list $daemonset $daemonset_yaml $configmap_yaml $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }}
|
|
{{- end }}
|