From 9b0c925761dddd6be0b578b13bf8d9d26964c64a Mon Sep 17 00:00:00 2001 From: Madhukar Nayakbomman Date: Wed, 21 Mar 2018 16:11:47 -0700 Subject: [PATCH] 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 --- .../templates/daemonset-vrouter-agent-dpdk.yaml | 16 ++++++++-------- .../daemonset-vrouter-agent-kernel.yaml | 8 ++++---- contrail-vrouter/values.yaml | 3 ++- contrail/values.yaml | 3 ++- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/contrail-vrouter/templates/daemonset-vrouter-agent-dpdk.yaml b/contrail-vrouter/templates/daemonset-vrouter-agent-dpdk.yaml index 1241e31..f566689 100644 --- 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 index e15b5c6..5f02b95 100644 --- 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 index 352b8f3..f3a493c 100644 --- 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 index 87c7862..cd65269 100644 --- 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