From 219a7eab4129b3e500bcaf6c62819011580895ba Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Mon, 24 Feb 2020 12:42:24 +0800 Subject: Add nodeaffinity for cFW pods Change-Id: I31077bbaff99f7ffc2c13abd5899afd05cf560f9 Issue-ID: MULTICLOUD-999 Signed-off-by: Bin Yang --- .../pktgen-host-netdevice/templates/deployment.yaml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'starlingx/demo/firewall-host-netdevice/charts/pktgen-host-netdevice') diff --git a/starlingx/demo/firewall-host-netdevice/charts/pktgen-host-netdevice/templates/deployment.yaml b/starlingx/demo/firewall-host-netdevice/charts/pktgen-host-netdevice/templates/deployment.yaml index 4e48937e..276b3df8 100644 --- a/starlingx/demo/firewall-host-netdevice/charts/pktgen-host-netdevice/templates/deployment.yaml +++ b/starlingx/demo/firewall-host-netdevice/charts/pktgen-host-netdevice/templates/deployment.yaml @@ -23,6 +23,19 @@ spec: "interface": "veth11" } ]' spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + {{- range .Values.global.nodeAffinity }} + - key: {{ .label.labelkey }} + operator: {{ .label.op }} + values: + {{- range .label.labelvalues }} + - {{ . }} + {{- end }} + {{- end }} containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" @@ -32,12 +45,10 @@ spec: env: - name: unprotectedNetCidr value: "{{.Values.global.unprotectedNetCidr}}" - - name: unprotectedNetGw - value: "{{.Values.global.unprotectedNetGw}}" + - name: unprotectedNetGwIp + value: "{{.Values.global.unprotectedNetGwIp}}" - name: protectedNetCidr value: "{{.Values.global.protectedNetCidr}}" - - name: protectedNetGw - value: "{{.Values.global.protectedNetGw}}" - name: protectedNetGwIp value: "{{.Values.global.protectedNetGwIp}}" - name: dcaeCollectorIp -- cgit 1.2.3-korg