Mounting right hp dir and changing container name

Mounting right hugepages directory for dpdk pod and changing the container names to match with previous release contrail vrouter service names Change-Id: Icfaa7d3611b897e176a66cbec3258bec061cb07d Partial-Bug: #1749018
Juniper · Mar 21, 2018 · 9b0c925 · 9b0c925
1 parent 182fa43
commit 9b0c925
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/contrail-vrouter/templates/daemonset-vrouter-agent-dpdk.yaml b/contrail-vrouter/templates/daemonset-vrouter-agent-dpdk.yaml
@@ -33,7 +33,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       initContainers:
 {{ tuple $context .Values.dependencies.vrouter_agent_dpdk nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
-        - name: contrail-init-dpdk
+        - name: contrail-vrouter-init-dpdk
           image: {{ .Values.global.images.tags.vrouter_init_dpdk | quote }}
           imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
           securityContext:
@@ -52,7 +52,7 @@ spec:
             name: os-release
           - mountPath: /etc/lsb-release
             name: lsb-release
-          - mountPath: {{ .Values.global.contrail_env.HUGE_PAGES_DIR | default "/hugepages" }}
+          - mountPath: {{ .Values.global.contrail_env_vrouter_dpdk.HUGE_PAGES_DIR | default "/dev/hugepages" }}
             name: hugepages
       containers:
         - name: contrail-vrouter-dpdk
@@ -80,11 +80,11 @@ spec:
             name: os-release
           - mountPath: /etc/lsb-release
             name: lsb-release
-          - mountPath: {{ .Values.global.contrail_env.HUGE_PAGES_DIR | default "/hugepages" }}
+          - mountPath: {{ .Values.global.contrail_env_vrouter_dpdk.HUGE_PAGES_DIR | default "/dev/hugepages" }}
             name: hugepages
           - mountPath: /var/crashes
             name: var-crashes-vrouter
-        - name: contrail-dpdk-watchdog
+        - name: contrail-vrouter-watchdog
           image: {{ .Values.global.images.tags.dpdk_watchdog | quote }}
           imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
           securityContext:
@@ -105,7 +105,7 @@ spec:
             name: var-run
           - mountPath: /host/bin
             name: host-bin
-        - name: contrail-vrouter-dpdk-agent
+        - name: contrail-vrouter-agent
           image: {{ .Values.global.images.tags.vrouter_agent | quote }}
           imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
           securityContext:
@@ -124,7 +124,7 @@ spec:
             name: etc-contrail
           - mountPath: /var/run/
             name: var-run
-          - mountPath: {{ .Values.global.contrail_env.HUGE_PAGES_DIR | default "/hugepages" }}
+          - mountPath: {{ .Values.global.contrail_env_vrouter_dpdk.HUGE_PAGES_DIR | default "/dev/dev/hugepages" }}
             name: hugepages
           - mountPath: /var/crashes
             name: var-crashes-vrouter
@@ -134,7 +134,7 @@ spec:
           - mountPath: /etc/sysconfig/network-scripts
             name: network-scripts
 {{- end }}
-        - name: contrail-agent-nodemgr
+        - name: contrail-vrouter-nodemgr
           image: {{ .Values.global.images.tags.nodemgr | quote }}
           imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
           envFrom:
@@ -199,7 +199,7 @@ spec:
           path: /etc
       - name: hugepages
         hostPath:
-          path: {{ .Values.global.contrail_env.HUGE_PAGES_DIR | default "/hugepages" }}
+          path: {{ .Values.global.contrail_env_vrouter_dpdk.HUGE_PAGES_DIR | default "/dev/hugepages" }}
       - name: var-crashes-vrouter
         hostPath:
           path: /var/crashes/contrail/vrouter

diff --git a/contrail-vrouter/templates/daemonset-vrouter-agent-kernel.yaml b/contrail-vrouter/templates/daemonset-vrouter-agent-kernel.yaml
@@ -35,7 +35,7 @@ spec:
       initContainers:
 {{ tuple $context .Values.dependencies.vrouter_agent_kernel nil | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
 {{- if eq $host_os "ubuntu"}}
-        - name: contrail-init-kernel
+        - name: contrail-vrouter-init-kernel
           image: {{ .Values.global.images.tags.build_driver_init | quote }}
           imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
           securityContext:
@@ -53,7 +53,7 @@ spec:
           - mountPath: /host/bin
             name: host-bin
 {{- else if $host_os "centos" }}
-        - name: contrail-init-kernel
+        - name: contrail-vrouter-init-kernel
           image: {{ .Values.global.images.tags.vrouter_init_kernel | quote }}
           imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
           securityContext:
@@ -70,7 +70,7 @@ spec:
             name: host-bin
 {{- end }}
       containers:
-      - name: contrail-vrouter-kernel-agent
+      - name: contrail-vrouter-agent
         image: {{ .Values.global.images.tags.vrouter_agent | quote }}
         imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         securityContext:
@@ -95,7 +95,7 @@ spec:
           name: var-crashes-vrouter
         - mountPath: /host/bin
           name: host-bin
-      - name: contrail-agent-nodemgr
+      - name: contrail-vrouter-nodemgr
         image: {{ .Values.global.images.tags.nodemgr | quote }}
         imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}
         envFrom:

diff --git a/contrail-vrouter/values.yaml b/contrail-vrouter/values.yaml
@@ -33,7 +33,8 @@ global:
     #DPDK_UIO_DRIVER: uio_pci_generic
     #HUGE_PAGES: 32000
     #AGENT_MODE: dpdk
-    #HUGE_PAGES_DIR: /hugepages
+    #HUGE_PAGES_DIR: /dev/hugepages
+    #DPDK_MEM_PER_SOCKET: 1024
 
   node:
     host_os: ubuntu

diff --git a/contrail/values.yaml b/contrail/values.yaml
@@ -53,7 +53,8 @@ global:
     #DPDK_UIO_DRIVER: uio_pci_generic
     #HUGE_PAGES: 32000
     #AGENT_MODE: dpdk
-    #HUGE_PAGES_DIR: /hugepages
+    #HUGE_PAGES_DIR: /dev/hugepages
+    #DPDK_MEM_PER_SOCKET: 1024
 
   node:
     host_os: ubuntu