aba33b3440
- corrected the path of "socket" volume, which is used for sharing metadata proxy unix socket among the agents - and give neutron user permission to write to the dir - set the default nova_metadata_ip to full hostname of metadata so that it could be accessed properly via ingress - removed unnecessary configurations from values Change-Id: I4d20dc670fecebd9799851d659c5f42edb4821ac Closes-Bug:1745370
166 lines
6.7 KiB
YAML
166 lines
6.7 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.
|
|
*/}}
|
|
|
|
{{- if .Values.manifests.daemonset_l3_agent }}
|
|
{{- $envAll := . }}
|
|
{{- $dependencies := .Values.dependencies.l3 }}
|
|
|
|
{{- $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 }}
|
|
|
|
{{- $serviceAccountName := "neutron-l3-agent" }}
|
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
|
---
|
|
apiVersion: extensions/v1beta1
|
|
kind: DaemonSet
|
|
metadata:
|
|
name: neutron-l3-agent
|
|
spec:
|
|
{{ 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:
|
|
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:
|
|
serviceAccountName: {{ $serviceAccountName }}
|
|
nodeSelector:
|
|
{{ .Values.labels.agent.l3.node_selector_key }}: {{ .Values.labels.agent.l3.node_selector_value }}
|
|
dnsPolicy: ClusterFirstWithHostNet
|
|
hostNetwork: true
|
|
initContainers:
|
|
{{ tuple $envAll $dependencies $mounts_neutron_l3_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
|
containers:
|
|
- name: neutron-l3-agent
|
|
image: {{ .Values.images.tags.neutron_l3 }}
|
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
|
{{ tuple $envAll $envAll.Values.pod.resources.agent.l3 | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
|
securityContext:
|
|
runAsUser: {{ .Values.pod.user.neutron.uid }}
|
|
privileged: true
|
|
command:
|
|
- /tmp/neutron-l3-agent.sh
|
|
volumeMounts:
|
|
- name: neutron-bin
|
|
mountPath: /tmp/neutron-l3-agent.sh
|
|
subPath: neutron-l3-agent.sh
|
|
readOnly: true
|
|
- 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
|
|
{{- if eq .Values.network.backend "ovs" }}
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/plugins/ml2/openvswitch_agent.ini
|
|
subPath: openvswitch_agent.ini
|
|
readOnly: true
|
|
- name: runopenvswitch
|
|
mountPath: /run/openvswitch
|
|
{{- 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
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/debug.filters
|
|
subPath: debug.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/dibbler.filters
|
|
subPath: dibbler.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/ipset-firewall.filters
|
|
subPath: ipset-firewall.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/l3.filters
|
|
subPath: l3.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/netns-cleanup.filters
|
|
subPath: netns-cleanup.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/dhcp.filters
|
|
subPath: dhcp.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/ebtables.filters
|
|
subPath: ebtables.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/iptables-firewall.filters
|
|
subPath: iptables-firewall.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/linuxbridge-plugin.filters
|
|
subPath: linuxbridge-plugin.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/openvswitch-plugin.filters
|
|
subPath: openvswitch-plugin.filters
|
|
readOnly: true
|
|
- name: libmodules
|
|
mountPath: /lib/modules
|
|
readOnly: true
|
|
- name: socket
|
|
mountPath: /var/lib/neutron/openstack-helm
|
|
{{ if $mounts_neutron_l3_agent.volumeMounts }}{{ toYaml $mounts_neutron_l3_agent.volumeMounts | indent 12 }}{{ end }}
|
|
volumes:
|
|
- name: neutron-bin
|
|
configMap:
|
|
name: neutron-bin
|
|
defaultMode: 0555
|
|
- name: neutron-etc
|
|
configMap:
|
|
name: neutron-etc
|
|
defaultMode: 0444
|
|
{{- if eq .Values.network.backend "ovs" }}
|
|
- name: runopenvswitch
|
|
hostPath:
|
|
path: /run/openvswitch
|
|
{{- end }}
|
|
- name: libmodules
|
|
hostPath:
|
|
path: /lib/modules
|
|
- name: socket
|
|
hostPath:
|
|
path: /var/lib/neutron/openstack-helm
|
|
{{ if $mounts_neutron_l3_agent.volumes }}{{ toYaml $mounts_neutron_l3_agent.volumes | indent 8 }}{{ end }}
|
|
{{- end }}
|