update ocp networktype from OpenShiftSDN to OVNKubernetes (#7764)

* update ocp networktype from OpenShiftSDN to OVNKubernetes and revert versions for ocp

.buildkite/e2e/nightly-main-matrix.yaml

@@ -57,7 +57,7 @@
     #- DEPLOYER_CLIENT_VERSION: "4.10.55"
     #- DEPLOYER_CLIENT_VERSION: "4.11.33"
     #- DEPLOYER_CLIENT_VERSION: "4.13.4"
-    - DEPLOYER_CLIENT_VERSION: "4.15.8"
+    - DEPLOYER_CLIENT_VERSION: "4.14.12"
 
 - label: eks-arm
   fixed:

README.md

@@ -18,7 +18,7 @@ Current features:
 Supported versions:
 
 *  Kubernetes 1.26-1.30
-*  OpenShift 4.12-4.15
+*  OpenShift 4.11-4.14
 *  Elasticsearch, Kibana, APM Server: 6.8+, 7.1+, 8+
 *  Enterprise Search: 7.7+, 8+
 *  Beats: 7.0+, 8+

docs/supported-versions.asciidoc

@@ -1,5 +1,5 @@
 * Kubernetes 1.26-1.30
-* OpenShift 4.12-4.15
+* OpenShift 4.11-4.14
 * Google Kubernetes Engine (GKE), Azure Kubernetes Service (AKS), and Amazon Elastic Kubernetes Service (EKS)
 * Helm: 3.2.0+
 * Elasticsearch, Kibana, APM Server: 6.8+, 7.1+, 8+

hack/deployer/config/plans.yml

@@ -94,7 +94,7 @@ plans:
 - id: ocp-ci
   operation: create
   clusterName: ci
-  clientVersion: 4.13.4
+  clientVersion: 4.14.12
   provider: ocp
   machineType: n1-standard-8
   serviceAccount: true
@@ -104,7 +104,7 @@ plans:
 - id: ocp-dev
   operation: create
   clusterName: dev
-  clientVersion: 4.13.4
+  clientVersion: 4.14.12
   provider: ocp
   machineType: n1-standard-8
   serviceAccount: true

hack/deployer/runner/ocp.go

@@ -58,7 +58,7 @@ networking:
   - cidr: 10.128.0.0/14
     hostPrefix: 23
   machineCIDR: 10.0.0.0/16
-  networkType: OpenShiftSDN
+  networkType: OVNKubernetes
   serviceNetwork:
   - 172.30.0.0/16
 platform:

hack/operatorhub/templates/csv.tpl

@@ -286,7 +286,7 @@ spec:
 
     * Kubernetes 1.26-1.30
 
-    * OpenShift 4.12-4.15
+    * OpenShift 4.11-4.14
 
     * Google Kubernetes Engine (GKE), Azure Kubernetes Service (AKS), and Amazon Elastic Kubernetes Service (EKS)