Bug 1954302: Remove OVS daemonsets

README.md

@@ -229,7 +229,6 @@ data:
   ip-10-0-135-96.us-east-2.compute.internal: |
     OVN_KUBE_LOG_LEVEL=5
     OVN_LOG_LEVEL=dbg
-    OVS_LOG_LEVEL=dbg
   # to adjust master log levels, use _master
   _master: |
     OVN_KUBE_LOG_LEVEL=5

bindata/network/openshift-sdn/alert-rules.yaml

@@ -15,15 +15,6 @@ spec:
     # note: all joins on kube_pod_* need a a "topk by (key) (1, <metric> )"
     # otherwise you will generate query errors when kube_state_metrics is being
     # upgraded and there are duplicate rows on the "right" side of the join.
-    - alert: NodeWithoutOVSPod
-      annotations:
-        message: |
-          All nodes should be running an ovs pod, {{"{{"}} $labels.node {{"}}"}} is not.
-      expr: |
-        (kube_node_info unless on(node) topk by (node) (1, kube_pod_info{namespace="openshift-sdn",  pod=~"ovs.*"})) > 0
-      for: 10m
-      labels:
-        severity: warning
     - alert: NodeWithoutSDNPod
       annotations:
         message: |

bindata/network/ovn-kubernetes/ipsec.yaml

@@ -206,8 +206,6 @@ spec:
             sleep 60
           done
         env:
-        - name: OVS_LOG_LEVEL
-          value: info
         - name: K8S_NODE
           valueFrom:
             fieldRef:

pkg/network/openshift_sdn.go

@@ -31,7 +31,6 @@ func renderOpenShiftSDN(conf *operv1.NetworkSpec, manifestDir string) ([]*uns.Un
 
 	data := render.MakeRenderData()
 	data.Data["ReleaseVersion"] = os.Getenv("RELEASE_VERSION")
-	data.Data["InstallOVS"] = (c.UseExternalOpenvswitch == nil || *c.UseExternalOpenvswitch == false)
 	data.Data["SDNImage"] = os.Getenv("SDN_IMAGE")
 	data.Data["CNIPluginsImage"] = os.Getenv("CNI_PLUGINS_IMAGE")
 	data.Data["KubeRBACProxyImage"] = os.Getenv("KUBE_RBAC_PROXY_IMAGE")

pkg/network/openshift_sdn_test.go

@@ -43,24 +43,13 @@ func TestRenderOpenShiftSDN(t *testing.T) {
 
 	crd := OpenShiftSDNConfig.DeepCopy()
 	config := &crd.Spec
-	sdnConfig := config.DefaultNetwork.OpenShiftSDNConfig
 
 	errs := validateOpenShiftSDN(config)
 	g.Expect(errs).To(HaveLen(0))
 	FillDefaults(config, nil)
 
-	// Make sure the OVS daemonset isn't created
-	truth := true
-	sdnConfig.UseExternalOpenvswitch = &truth
 	objs, err := renderOpenShiftSDN(config, manifestDir)
 	g.Expect(err).NotTo(HaveOccurred())
-	g.Expect(objs).NotTo(ContainElement(HaveKubernetesID("DaemonSet", "openshift-sdn", "ovs")))
-
-	// enable openvswitch
-	sdnConfig.UseExternalOpenvswitch = nil
-	objs, err = renderOpenShiftSDN(config, manifestDir)
-	g.Expect(err).NotTo(HaveOccurred())
-	g.Expect(objs).To(ContainElement(HaveKubernetesID("DaemonSet", "openshift-sdn", "ovs")))
 
 	// It's important that the namespace is first
 	g.Expect(objs[0]).To(HaveKubernetesID("Namespace", "", "openshift-sdn"))