From 8a05bdc88d51c236b8a20040282a808b51ccada2 Mon Sep 17 00:00:00 2001 From: zhangzujian Date: Thu, 15 Jul 2021 11:00:05 +0800 Subject: [PATCH] add field defaultNetworkType in configmap ovn-config --- dist/images/install-pre-1.16.sh | 4 ++++ dist/images/install.sh | 4 ++++ yamls/ovn-dpdk.yaml | 3 ++- yamls/ovn-ha.yaml | 2 ++ yamls/ovn.yaml | 2 ++ 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dist/images/install-pre-1.16.sh b/dist/images/install-pre-1.16.sh index 2821e2961ce..4245353fd0a 100644 --- a/dist/images/install-pre-1.16.sh +++ b/dist/images/install-pre-1.16.sh @@ -678,6 +678,8 @@ kind: ConfigMap metadata: name: ovn-config namespace: kube-system +data: + defaultNetworkType: '$NETWORK_TYPE' --- apiVersion: v1 @@ -1154,6 +1156,8 @@ kind: ConfigMap metadata: name: ovn-config namespace: kube-system +data: + defaultNetworkType: '$NETWORK_TYPE' --- apiVersion: v1 kind: ServiceAccount diff --git a/dist/images/install.sh b/dist/images/install.sh index 93dc8e36fa2..48890cd92f9 100755 --- a/dist/images/install.sh +++ b/dist/images/install.sh @@ -720,6 +720,8 @@ kind: ConfigMap metadata: name: ovn-config namespace: kube-system +data: + defaultNetworkType: '$NETWORK_TYPE' --- apiVersion: v1 @@ -1196,6 +1198,8 @@ kind: ConfigMap metadata: name: ovn-config namespace: kube-system +data: + defaultNetworkType: '$NETWORK_TYPE' --- apiVersion: v1 kind: ServiceAccount diff --git a/yamls/ovn-dpdk.yaml b/yamls/ovn-dpdk.yaml index 197c8ad54c0..2c08bb0c457 100644 --- a/yamls/ovn-dpdk.yaml +++ b/yamls/ovn-dpdk.yaml @@ -33,7 +33,8 @@ kind: ConfigMap metadata: name: ovn-config namespace: kube-system - +data: + defaultNetworkType: geneve --- apiVersion: v1 kind: ServiceAccount diff --git a/yamls/ovn-ha.yaml b/yamls/ovn-ha.yaml index b13707f1134..67971c5734a 100644 --- a/yamls/ovn-ha.yaml +++ b/yamls/ovn-ha.yaml @@ -33,6 +33,8 @@ kind: ConfigMap metadata: name: ovn-config namespace: kube-system +data: + defaultNetworkType: geneve --- apiVersion: v1 kind: ServiceAccount diff --git a/yamls/ovn.yaml b/yamls/ovn.yaml index 8ba5225405b..b7100de8042 100644 --- a/yamls/ovn.yaml +++ b/yamls/ovn.yaml @@ -33,6 +33,8 @@ kind: ConfigMap metadata: name: ovn-config namespace: kube-system +data: + defaultNetworkType: geneve --- apiVersion: v1 kind: ServiceAccount