94cd5a9935
The L3 neutron agent uses the -W flag when adding new iptable rules. That flag verifies if the lock is free to avoid race conditions. The lock is normally /run/xtables.lock. In iptables <1.6.2, if the file does not exist, iptables ignores the lock and silently continues. Starting with 1.6.2, that behaviour changed and if the file does not exist, iptables fails: https://git.netfilter.org/iptables/commit/?id=80d8bfaac9e2430d710084a10ec78e68bd61e6ec Leap 15.0 is using iptables 1.6.2 whereas Ubuntu Bionic uses 1.6.1. That is why Ubuntu compute-kit gates where working whereas openSUSE compute-kit gate was not This patch fixes the gate problem by mounting /run/xtables.lock Change-Id: Ia9c648cdf95c9824b34f40a6d9ed538a2cad5154 Signed-off-by: Manuel Buil <mbuil@suse.com>
216 lines
9.0 KiB
YAML
216 lines
9.0 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 "l3AgentReadinessProbeTemplate" }}
|
|
exec:
|
|
command:
|
|
- python
|
|
- /tmp/health-probe.py
|
|
- --config-file
|
|
- /etc/neutron/neutron.conf
|
|
- --config-file
|
|
- /etc/neutron/l3_agent.ini
|
|
- --agent-queue-name
|
|
- l3_agent
|
|
{{- end }}
|
|
{{- define "l3AgentLivenessProbeTemplate" }}
|
|
exec:
|
|
command:
|
|
- python
|
|
- /tmp/health-probe.py
|
|
- --config-file
|
|
- /etc/neutron/neutron.conf
|
|
- --config-file
|
|
- /etc/neutron/l3_agent.ini
|
|
- --agent-queue-name
|
|
- l3_agent
|
|
- --liveness-probe
|
|
{{- end }}
|
|
|
|
{{- define "neutron.l3_agent.daemonset" }}
|
|
{{- $daemonset := index . 0 }}
|
|
{{- $configMapName := index . 1 }}
|
|
{{- $serviceAccountName := index . 2 }}
|
|
{{- $envAll := index . 3 }}
|
|
{{- with $envAll }}
|
|
|
|
{{- $mounts_neutron_l3_agent := .Values.pod.mounts.neutron_l3_agent.neutron_l3_agent }}
|
|
{{- $mounts_neutron_l3_agent_init := .Values.pod.mounts.neutron_l3_agent.init_container }}
|
|
|
|
---
|
|
apiVersion: apps/v1
|
|
kind: DaemonSet
|
|
metadata:
|
|
name: neutron-l3-agent
|
|
annotations:
|
|
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
|
|
labels:
|
|
{{ tuple $envAll "neutron" "l3-agent" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
|
|
spec:
|
|
selector:
|
|
matchLabels:
|
|
{{ tuple $envAll "neutron" "l3-agent" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
|
|
{{ tuple $envAll "l3_agent" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
|
|
template:
|
|
metadata:
|
|
labels:
|
|
{{ tuple $envAll "neutron" "l3-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_l3_agent" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
|
|
serviceAccountName: {{ $serviceAccountName }}
|
|
nodeSelector:
|
|
{{ .Values.labels.agent.l3.node_selector_key }}: {{ .Values.labels.agent.l3.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_l3_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
|
containers:
|
|
- name: neutron-l3-agent
|
|
{{ tuple $envAll "neutron_l3" | include "helm-toolkit.snippets.image" | indent 10 }}
|
|
{{ tuple $envAll $envAll.Values.pod.resources.agent.l3 | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
|
{{ dict "envAll" $envAll "application" "neutron_l3_agent" "container" "neutron_l3_agent" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
|
{{ dict "envAll" $envAll "component" "l3_agent" "container" "l3_agent" "type" "readiness" "probeTemplate" (include "l3AgentReadinessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }}
|
|
{{ dict "envAll" $envAll "component" "l3_agent" "container" "l3_agent" "type" "liveness" "probeTemplate" (include "l3AgentLivenessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }}
|
|
command:
|
|
- /tmp/neutron-l3-agent.sh
|
|
volumeMounts:
|
|
- name: pod-tmp
|
|
mountPath: /tmp
|
|
- name: pod-var-neutron
|
|
mountPath: /var/lib/neutron
|
|
- name: neutron-bin
|
|
mountPath: /tmp/neutron-l3-agent.sh
|
|
subPath: neutron-l3-agent.sh
|
|
readOnly: true
|
|
- name: neutron-bin
|
|
mountPath: /tmp/health-probe.py
|
|
subPath: health-probe.py
|
|
readOnly: true
|
|
- 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
|
|
{{- if ( has "openvswitch" .Values.network.backend ) }}
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/plugins/ml2/openvswitch_agent.ini
|
|
subPath: openvswitch_agent.ini
|
|
readOnly: true
|
|
{{- end }}
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/l3_agent.ini
|
|
subPath: l3_agent.ini
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/metadata_agent.ini
|
|
subPath: metadata_agent.ini
|
|
readOnly: true
|
|
- 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 "l3_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: libmodules
|
|
mountPath: /lib/modules
|
|
readOnly: true
|
|
- name: iptables-lockfile
|
|
mountPath: /run/xtables.lock
|
|
- name: socket
|
|
mountPath: /var/lib/neutron/openstack-helm
|
|
{{- if .Values.network.share_namespaces }}
|
|
- name: host-run-netns
|
|
mountPath: /run/netns
|
|
mountPropagation: Bidirectional
|
|
{{- end }}
|
|
{{ if $mounts_neutron_l3_agent.volumeMounts }}{{ toYaml $mounts_neutron_l3_agent.volumeMounts | indent 12 }}{{ end }}
|
|
volumes:
|
|
- name: pod-tmp
|
|
emptyDir: {}
|
|
- name: pod-var-neutron
|
|
emptyDir: {}
|
|
- name: neutron-bin
|
|
configMap:
|
|
name: neutron-bin
|
|
defaultMode: 0555
|
|
- name: neutron-etc
|
|
secret:
|
|
secretName: {{ $configMapName }}
|
|
defaultMode: 0444
|
|
- name: libmodules
|
|
hostPath:
|
|
path: /lib/modules
|
|
- name: iptables-lockfile
|
|
hostPath:
|
|
path: /run/xtables.lock
|
|
- name: socket
|
|
hostPath:
|
|
path: /var/lib/neutron/openstack-helm
|
|
{{- if .Values.network.share_namespaces }}
|
|
- name: host-run-netns
|
|
hostPath:
|
|
path: /run/netns
|
|
{{- end }}
|
|
{{ if $mounts_neutron_l3_agent.volumes }}{{ toYaml $mounts_neutron_l3_agent.volumes | indent 8 }}{{ end }}
|
|
{{- end }}
|
|
{{- end }}
|
|
|
|
{{- if .Values.manifests.daemonset_l3_agent }}
|
|
{{- $envAll := . }}
|
|
{{- $daemonset := "l3-agent" }}
|
|
{{- $configMapName := "neutron-etc" }}
|
|
{{- $serviceAccountName := "neutron-l3-agent" }}
|
|
{{- $dependencyOpts := dict "envAll" $envAll "dependencyMixinParam" $envAll.Values.network.backend "dependencyKey" "l3" -}}
|
|
{{- $_ := 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.l3_agent.daemonset" | toString | fromYaml }}
|
|
{{- $configmap_yaml := "neutron.configmap.etc" }}
|
|
{{- list $daemonset $daemonset_yaml $configmap_yaml $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }}
|
|
{{- end }}
|