diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2020-02-24 12:42:24 +0800 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2020-02-24 12:42:24 +0800 |
| commit | 219a7eab4129b3e500bcaf6c62819011580895ba (patch) | |
| tree | d9f2eff458c8e1cd6ef36c250983a876a8322448 /starlingx/demo/firewall-sriov | |
| parent | 6547e45fd9f60437811ef35b9d101cdaef494542 (diff) | |
Add nodeaffinity for cFW pods
Change-Id: I31077bbaff99f7ffc2c13abd5899afd05cf560f9
Issue-ID: MULTICLOUD-999
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'starlingx/demo/firewall-sriov')
4 files changed, 61 insertions, 3 deletions
diff --git a/starlingx/demo/firewall-sriov/charts/pktgen-sriov/templates/deployment.yaml b/starlingx/demo/firewall-sriov/charts/pktgen-sriov/templates/deployment.yaml index 6c7000a7..53c306fc 100644 --- a/starlingx/demo/firewall-sriov/charts/pktgen-sriov/templates/deployment.yaml +++ b/starlingx/demo/firewall-sriov/charts/pktgen-sriov/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 }}" @@ -46,6 +59,10 @@ spec: value: "{{.Values.global.unprotectedNetProviderDriver}}" - name: protectedNetProviderDriver value: "{{.Values.global.protectedNetProviderDriver}}" + - name: unprotectedNetProviderVlan + value: "{{.Values.global.unprotectedNetProviderVlan}}" + - name: protectedNetProviderVlan + value: "{{.Values.global.protectedNetProviderVlan}}" command: ["/bin/bash", "/opt/vpg_start.sh"] securityContext: privileged: true diff --git a/starlingx/demo/firewall-sriov/charts/sink-sriov/templates/deployment.yaml b/starlingx/demo/firewall-sriov/charts/sink-sriov/templates/deployment.yaml index f3c29f05..45b3ecb1 100644 --- a/starlingx/demo/firewall-sriov/charts/sink-sriov/templates/deployment.yaml +++ b/starlingx/demo/firewall-sriov/charts/sink-sriov/templates/deployment.yaml @@ -23,6 +23,19 @@ spec: "interface": "veth22" } ]' 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 }}" @@ -46,6 +59,10 @@ spec: value: "{{.Values.global.unprotectedNetProviderDriver}}" - name: protectedNetProviderDriver value: "{{.Values.global.protectedNetProviderDriver}}" + - name: unprotectedNetProviderVlan + value: "{{.Values.global.unprotectedNetProviderVlan}}" + - name: protectedNetProviderVlan + value: "{{.Values.global.protectedNetProviderVlan}}" command: ["/bin/bash", "/opt/vsn_start.sh"] securityContext: privileged: true diff --git a/starlingx/demo/firewall-sriov/templates/deployment.yaml b/starlingx/demo/firewall-sriov/templates/deployment.yaml index 90677163..d4b59573 100644 --- a/starlingx/demo/firewall-sriov/templates/deployment.yaml +++ b/starlingx/demo/firewall-sriov/templates/deployment.yaml @@ -25,6 +25,19 @@ spec: "interface": "veth21" } ]' 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 }}" @@ -48,6 +61,10 @@ spec: value: "{{.Values.global.unprotectedNetProviderDriver}}" - name: protectedNetProviderDriver value: "{{.Values.global.protectedNetProviderDriver}}" + - name: unprotectedNetProviderVlan + value: "{{.Values.global.unprotectedNetProviderVlan}}" + - name: protectedNetProviderVlan + value: "{{.Values.global.protectedNetProviderVlan}}" command: ["/bin/bash", "/opt/vfw_start.sh"] securityContext: privileged: true diff --git a/starlingx/demo/firewall-sriov/values.yaml b/starlingx/demo/firewall-sriov/values.yaml index 53aa9de1..94a858cc 100644 --- a/starlingx/demo/firewall-sriov/values.yaml +++ b/starlingx/demo/firewall-sriov/values.yaml @@ -21,9 +21,16 @@ resources: global: nodeAffinity: - key: nodeName - values: worker-0 - op: In + - label: + labelkey: sriovdp + op: In + labelvalues: + - enabled + - label: + labelkey: kube-cpu-mgr-policy + op: In + labelvalues: + - static #Networks #unprotectedNetworkName: unprotected-private-net |