From 04e71df7549d8d7f98dc8afa60ced5c7cba52dfb Mon Sep 17 00:00:00 2001 From: Victoria Martinez de la Cruz Date: Thu, 13 Jun 2024 13:20:09 +0200 Subject: [PATCH] Expose the networkType config in run_ocp Make the networkType configurable depending on the OCP version to use. For now, default to OpenShiftSDN. OpenShiftSDN was deprecated in OCP 4.15 and will be removed in OCP 4.16 --- cluster_config.sh.example | 5 +++++ run_ocp.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cluster_config.sh.example b/cluster_config.sh.example index 5436837..b3d343b 100644 --- a/cluster_config.sh.example +++ b/cluster_config.sh.example @@ -10,6 +10,11 @@ export SSH_PUB_KEY="`cat $HOME/.ssh/id_rsa.pub`" export MASTER_COUNT=3 export WORKER_COUNT=3 +# Select the CNI plugin to use in your OCP deployment +# From OCP 4.15 <, use OpenShiftSDN +# From OCP 4.15 >=, use KubernetesOVN +export OPENSHIFT_NETWORKTYPE="OpenShiftSDN" + ############################################## # The following settings are platform specific ############################################## diff --git a/run_ocp.sh b/run_ocp.sh index 6cb82d6..a0686c7 100755 --- a/run_ocp.sh +++ b/run_ocp.sh @@ -101,7 +101,7 @@ networking: hostPrefix: 23 machineNetwork: - cidr: 10.0.128.0/17 - networkType: OpenShiftSDN + networkType: ${OPENSHIFT_NETWORKTYPE} serviceNetwork: - 172.30.0.0/16 platform: