Merge "Neutron-network services split out into discrete pods"

etc/kolla-kubernetes/service_resources.yml

@@ -162,7 +162,9 @@ kolla-kubernetes:
       pod:
       - services/neutron/neutron-compute-pod.yml.j2
       - services/neutron/neutron-control-pod.yml.j2
-      - services/neutron/neutron-network-pod.yml.j2
+      - services/neutron/neutron-dhcp-agent-pod.yml.j2
+      - services/neutron/neutron-l3-agent-pod.yml.j2
+      - services/neutron/neutron-metadata-agent-pod.yml.j2
   - name: swift
     pods:
     - name: swift-account

services/neutron/neutron-dhcp-agent-pod.yml.j2

@@ -0,0 +1,59 @@
+apiVersion: v1
+kind: Pod
+spec:
+  hostNetwork: True
+  containers:
+    - image: "{{ neutron_dhcp_agent_image_full }}"
+      name: neutron-dhcp-agent
+      securityContext:
+        privileged: true
+      volumeMounts:
+        - mountPath: {{ container_config_directory }}
+          name: neutron-dhcp-agent-config
+          readOnly: true
+        - mountPath: /var/lib/neutron/kolla/
+          name: neutron-metadata-socket
+        - mountPath: /run
+          name: host-run
+        - mountPath: /run/netns/
+          name: host-run-netns
+          # shared: true # This seems not support in K8s yet :(
+        - mountPath: /etc/localtime
+          name: host-etc-localtime
+          readOnly: true
+        - mountPath: /var/log/kolla/
+          name: kolla-logs
+      env:
+        - name: KOLLA_CONFIG_STRATEGY
+          value: {{ config_strategy }}
+  volumes:
+    - name: neutron-dhcp-agent-config
+      configMap:
+        name: neutron-dhcp-agent-configmap
+        items:
+        - key: neutron.conf
+          path: neutron.conf
+        - key: config.json
+          path: config.json
+        - key: ml2-conf.ini
+          path: ml2_conf.ini
+        - key: dhcp-agent.ini
+          path: dhcp_agent.ini
+        - key: dnsmasq.conf
+          path: dnsmasq.conf
+    - name: host-run-netns
+      hostPath:
+        path: /run/netns
+    - name: host-run
+      hostPath:
+        path: /run
+    - name: host-etc-localtime
+      hostPath:
+        path: /etc/localtime
+    - name: neutron-metadata-socket
+      hostPath:
+        path: /var/lib/neutron/kolla/metadata_proxy
+    - name: kolla-logs
+      emptyDir: {}
+metadata:
+   name: neutron-dhcp-agent

services/neutron/neutron-l3-agent-pod.yml.j2

@@ -0,0 +1,58 @@
+apiVersion: v1
+kind: Pod
+spec:
+  hostNetwork: True
+  containers:
+    - image: "{{ neutron_l3_agent_image_full }}"
+      name: neutron-l3-agent
+      securityContext:
+        privileged: true
+      volumeMounts:
+        - mountPath: {{ container_config_directory }}
+          name: neutron-l3-agent-config
+        - mountPath: /var/lib/neutron/kolla/
+          name: neutron-metadata-socket
+        - mountPath: /run
+          name: host-run
+        - mountPath: /run/netns/
+          name: host-run-netns
+          # shared: true # This seems not support in K8s yet :(
+        - mountPath: /etc/localtime
+          name: host-etc-localtime
+          readOnly: true
+        - mountPath: /var/log/kolla/
+          name: kolla-logs
+      env:
+        - name: KOLLA_CONFIG_STRATEGY
+          value: {{ config_strategy }}
+  volumes:
+    - name: neutron-l3-agent-config
+      configMap:
+        name: neutron-l3-agent-configmap
+        items:
+        - key: neutron.conf
+          path: neutron.conf
+        - key: config.json
+          path: config.json
+        - key: ml2-conf.ini
+          path: ml2_conf.ini
+        - key: fwaas-driver.ini
+          path: fwaas_driver.ini
+        - key: l3-agent.ini
+          path: l3_agent.ini
+    - name: host-run-netns
+      hostPath:
+        path: /run/netns
+    - name: host-run
+      hostPath:
+        path: /run
+    - name: host-etc-localtime
+      hostPath:
+        path: /etc/localtime
+    - name: neutron-metadata-socket
+      hostPath:
+        path: /var/lib/neutron/kolla/metadata_proxy
+    - name: kolla-logs
+      emptyDir: {}
+metadata:
+   name: neutron-l3-agent

services/neutron/neutron-metadata-agent-pod.yml.j2

@@ -0,0 +1,55 @@
+apiVersion: v1
+kind: Pod
+spec:
+  hostNetwork: True
+  containers:
+    - image: "{{ neutron_metadata_agent_image_full }}"
+      name: neutron-metadata-agent
+      securityContext:
+        privileged: true
+      volumeMounts:
+        - mountPath: {{ container_config_directory }}
+          name: neutron-metadata-agent-config
+          readOnly: true
+        - mountPath: /var/lib/neutron/kolla/
+          name: neutron-metadata-socket
+        - mountPath: /run/netns/
+          name: host-run-netns
+          # shared: true # This seems not support in K8s yet :(
+        - mountPath: /etc/localtime
+          name: host-etc-localtime
+          readOnly: true
+        - mountPath: /var/log/kolla/
+          name: kolla-logs
+      env:
+        - name: KOLLA_CONFIG_STRATEGY
+          value: {{ config_strategy }}
+  volumes:
+    - name: neutron-metadata-agent-config
+      configMap:
+        name: neutron-metadata-agent-configmap
+        items:
+        - key: neutron.conf
+          path: neutron.conf
+        - key: config.json
+          path: config.json
+        - key: ml2-conf.ini
+          path: ml2_conf.ini
+        - key: metadata-agent.ini
+          path: metadata_agent.ini
+    - name: host-run-netns
+      hostPath:
+        path: /run/netns
+    - name: host-run
+      hostPath:
+        path: /run
+    - name: host-etc-localtime
+      hostPath:
+        path: /etc/localtime
+    - name: neutron-metadata-socket
+      hostPath:
+        path: /var/lib/neutron/kolla/metadata_proxy
+    - name: kolla-logs
+      emptyDir: {}
+metadata:
+   name: neutron-metadata-agent

services/neutron/neutron-network-pod.yml.j2

@@ -1,91 +0,0 @@
-apiVersion: v1
-kind: Pod
-spec:
-  hostNetwork: True
-  containers:
-    - image: "{{ neutron_dhcp_agent_image_full }}"
-      name: neutron-dhcp-agent
-      securityContext:
-        privileged: true
-      volumeMounts:
-        - mountPath: {{ container_config_directory }}/neutron-dhcp-agent/
-          name: neutron-dhcp-agent-config
-          readOnly: true
-        - mountPath: /var/lib/neutron/kolla/
-          name: neutron-metadata-socket
-        - mountPath: /run
-          name: host-run
-        - mountPath: /run/netns/
-          name: host-run-netns
-          # shared: true # This seems not support in K8s yet :(
-        - mountPath: /etc/localtime
-          name: host-etc-localtime
-          readOnly: true
-        - mountPath: /var/log/kolla/
-          name: kolla-logs
-
-    - image: "{{ neutron_l3_agent_image_full }}"
-      name: neutron-l3-agent
-      securityContext:
-        privileged: true
-      volumeMounts:
-        - mountPath: {{ container_config_directory }}/neutron-l3-agent/
-          name: neutron-l3-agent-config
-        - mountPath: /var/lib/neutron/kolla/
-          name: neutron-metadata-socket
-        - mountPath: /run
-          name: host-run
-        - mountPath: /run/netns/
-          name: host-run-netns
-          # shared: true # This seems not support in K8s yet :(
-        - mountPath: /etc/localtime
-          name: host-etc-localtime
-          readOnly: true
-        - mountPath: /var/log/kolla/
-          name: kolla-logs
-
-    - image: "{{ neutron_metadata_agent_image_full }}"
-      name: neutron-metadata-agent
-      securityContext:
-        privileged: true
-      volumeMounts:
-        - mountPath: {{ container_config_directory }}/neutron-metadata-agent
-          name: neutron-metadata-agent-config
-          readOnly: true
-        - mountPath: /var/lib/neutron/kolla/
-          name: neutron-metadata-socket
-        - mountPath: /run/netns/
-          name: host-run-netns
-          # shared: true # This seems not support in K8s yet :(
-        - mountPath: /etc/localtime
-          name: host-etc-localtime
-          readOnly: true
-        - mountPath: /var/log/kolla/
-          name: kolla-logs
-
-  volumes:
-    - name: neutron-metadata-agent-config
-      configMap:
-        name: neutron-metadata-agent-configmap
-    - name: neutron-l3-agent-config
-      configMap:
-        name: neutron-l3-agent-configmap
-    - name: neutron-dhcp-agent-config
-      configMap:
-        name: neutron-dhcp-agent-configmap
-    - name: host-run-netns
-      hostPath:
-        path: /run/netns
-    - name: host-run
-      hostPath:
-        path: /run
-    - name: host-etc-localtime
-      hostPath:
-        path: /etc/localtime
-    - name: neutron-metadata-socket
-      hostPath:
-        path: /var/lib/neutron/kolla/metadata_proxy
-    - name: kolla-logs
-      emptyDir: {}
-metadata:
-   name: neutron-network