diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2019-06-19 22:47:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-06-19 22:47:15 +0000 |
| commit | 8233c9d84cb79759ca40eb80d8ed861c771a527b (patch) | |
| tree | 8575fbea5ea299f1713fca923ee60490c44d1050 | |
| parent | e862e3962a7b24c5d6060d3c37d93c80a0a0955c (diff) | |
| parent | 1b11b0510076c0cdf5ede9becadba9f77ba56389 (diff) | |
Merge "Multus error when the namesapace is not default"
| -rw-r--r-- | kud/demo/firewall/charts/packetgen/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kud/demo/firewall/charts/sink/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kud/demo/firewall/templates/deployment.yaml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kud/demo/firewall/charts/packetgen/templates/deployment.yaml b/kud/demo/firewall/charts/packetgen/templates/deployment.yaml index a3aa165f..3538a6e7 100644 --- a/kud/demo/firewall/charts/packetgen/templates/deployment.yaml +++ b/kud/demo/firewall/charts/packetgen/templates/deployment.yaml @@ -43,7 +43,7 @@ spec: - export protected_private_net_cidr={{ .Values.global.protectedPrivateNetCidr }} - wget -O - https://git.onap.org/multicloud/k8s/plain/kud/tests/vFW/packetgen | sudo -E bash VirtletRootVolumeSize: 5Gi - k8s.v1.cni.cncf.io/networks: '[{"name": {{ .Values.global.ovnMultusNetworkName | quote }}}]' + k8s.v1.cni.cncf.io/networks: '[{"name": {{ .Values.global.ovnMultusNetworkName | quote }}, "namespace": "default"}]' ovnNetwork: '[ { "name": {{ .Values.global.unprotectedNetworkName | quote }}, "ipAddress": {{ .Values.global.vpgPrivateIp0 | quote }}, "interface": "eth1" , "defaultGateway": "false"}, { "name": {{ .Values.global.onapPrivateNetworkName | quote }}, "ipAddress": {{ .Values.global.vpgPrivateIp1 | quote }}, "interface": "eth2" , "defaultGateway": "false"} diff --git a/kud/demo/firewall/charts/sink/templates/deployment.yaml b/kud/demo/firewall/charts/sink/templates/deployment.yaml index a988bc5d..57894010 100644 --- a/kud/demo/firewall/charts/sink/templates/deployment.yaml +++ b/kud/demo/firewall/charts/sink/templates/deployment.yaml @@ -18,7 +18,7 @@ spec: app: {{ include "sink.name" . }} release: {{ .Release.Name }} annotations: - k8s.v1.cni.cncf.io/networks: '[{"name": {{ .Values.global.ovnMultusNetworkName | quote }}}]' + k8s.v1.cni.cncf.io/networks: '[{"name": {{ .Values.global.ovnMultusNetworkName | quote }}, "namespace": "default"}]' ovnNetwork: '[ { "name": {{ .Values.global.protectedNetworkName | quote }}, "ipAddress": {{ .Values.global.vsnPrivateIp0 | quote }}, "interface": "eth1", "defaultGateway": "false" }, { "name": {{ .Values.global.onapPrivateNetworkName | quote }}, "ipAddress": {{ .Values.global.vsnPrivateIp1 | quote }}, "interface": "eth2" , "defaultGateway": "false"} diff --git a/kud/demo/firewall/templates/deployment.yaml b/kud/demo/firewall/templates/deployment.yaml index 41362a75..b273d287 100644 --- a/kud/demo/firewall/templates/deployment.yaml +++ b/kud/demo/firewall/templates/deployment.yaml @@ -41,7 +41,7 @@ spec: - export protected_private_net_cidr={{ .Values.global.protectedPrivateNetCidr }} - wget -O - https://git.onap.org/multicloud/k8s/plain/kud/tests/vFW/firewall | sudo -E bash VirtletRootVolumeSize: 5Gi - k8s.v1.cni.cncf.io/networks: '[{"name": {{ .Values.global.ovnMultusNetworkName | quote }}}]' + k8s.v1.cni.cncf.io/networks: '[{"name": {{ .Values.global.ovnMultusNetworkName | quote }}, "namespace": "default"}]' ovnNetwork: '[ { "name": {{ .Values.global.unprotectedNetworkName | quote }}, "ipAddress": {{ .Values.global.vfwPrivateIp0 | quote }}, "interface": "eth1" , "defaultGateway": "false"}, { "name": {{ .Values.global.protectedNetworkName | quote }}, "ipAddress": {{ .Values.global.vfwPrivateIp1 | quote }}, "interface": "eth2", "defaultGateway": "false" }, |