OVN: use config file via ConfigMap rather than environment variables

bindata/network/ovn-kubernetes/000-ns.yaml

@@ -1,7 +1,6 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  # NOTE: ovnkube.sh in the OVN image currently hardcodes this namespace name
   name: openshift-ovn-kubernetes
   labels:
     openshift.io/run-level: "0"

bindata/network/ovn-kubernetes/004-config.yaml

@@ -6,6 +6,5 @@ metadata:
   name: ovn-config
   namespace: openshift-ovn-kubernetes
 data:
-  net_cidr:   {{.OVN_cidr}}
-  svc_cidr:   {{.OVN_service_cidr}}
   k8s_apiserver: "{{.K8S_APISERVER}}"
+  namespace:  "openshift-ovn-kubernetes"

bindata/network/ovn-kubernetes/006-ovnkube-config.yaml

@@ -0,0 +1,25 @@
+---
+# The config file used by ovnkube is passed as a configmap.
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: ovnkube-config
+  namespace: openshift-ovn-kubernetes
+data:
+  ovn_k8s.conf:   |-
+    [default]
+    mtu="{{.MTU}}"
+    cluster-subnets="{{.K8S_cluster_subnets}}"
+
+    [kubernetes]
+    service-cidr="{{.OVN_service_cidr}}"
+    ovn-config-namespace="openshift-ovn-kubernetes"
+    apiserver="{{.K8S_APISERVER}}"
+
+    [logging]
+    loglevel="{{.OVNKUBE_loglevel}}"
+
+    [gateway]
+    mode=local
+    nodeport=true
+

bindata/network/ovn-kubernetes/ovnkube-master.yaml

@@ -1,5 +1,5 @@
 # ovnkube-master
-# daemonset version 3
+# daemonset version 4
 # starts master daemons, each in a separate container
 # it is run on the master node(s)
 kind: Deployment
@@ -43,7 +43,7 @@ spec:
 
       # run-ovn-northd - v3
       - name: run-ovn-northd
-        image: {{.OvnImage}}
+        image: "{{.OvnImage}}"
 
         command: ["/root/ovnkube.sh", "run-ovn-northd"]
 
@@ -56,44 +56,25 @@ spec:
           name: host-var-lib-ovs
         - mountPath: /var/run/openvswitch/
           name: host-var-run-ovs
+        - mountPath: /var/run/ovn-config
+          name: ovn-config-mount
 
         resources:
           requests:
             cpu: 100m
             memory: 300Mi
         env:
         - name: OVN_DAEMONSET_VERSION
-          value: "3"
-        - name: OVN_LOG_NORTHD
-          value: "-vconsole:info"
-        - name: OVN_NET_CIDR
-          valueFrom:
-            configMapKeyRef:
-              name: ovn-config
-              key: net_cidr
-        - name: OVN_SVC_CIDR
-          valueFrom:
-            configMapKeyRef:
-              name: ovn-config
-              key: svc_cidr
+          value: "4"
         - name: K8S_NODE
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        - name: K8S_APISERVER
-          valueFrom:
-            configMapKeyRef:
-              name: ovn-config
-              key: k8s_apiserver
-        - name: OVN_KUBERNETES_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
       # end of container
 
       # nb-ovsdb - v3
       - name: nb-ovsdb
-        image: {{.OvnImage}}
+        image: "{{.OvnImage}}"
 
         command: ["/root/ovnkube.sh", "nb-ovsdb"]
 
@@ -106,44 +87,25 @@ spec:
           name: host-var-lib-ovs
         - mountPath: /var/run/openvswitch/
           name: host-var-run-ovs
+        - mountPath: /var/run/ovn-config
+          name: ovn-config-mount
 
         resources:
           requests:
             cpu: 100m
             memory: 300Mi
         env:
         - name: OVN_DAEMONSET_VERSION
-          value: "3"
-        - name: OVN_LOG_NB
-          value: "-vconsole:info -vfile:info"
-        - name: OVN_NET_CIDR
-          valueFrom:
-            configMapKeyRef:
-              name: ovn-config
-              key: net_cidr
-        - name: OVN_SVC_CIDR
-          valueFrom:
-            configMapKeyRef:
-              name: ovn-config
-              key: svc_cidr
+          value: "4"
         - name: K8S_NODE
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        - name: K8S_APISERVER
-          valueFrom:
-            configMapKeyRef:
-              name: ovn-config
-              key: k8s_apiserver
-        - name: OVN_KUBERNETES_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
       # end of container
 
       # sb-ovsdb - v3
       - name: sb-ovsdb
-        image: {{.OvnImage}}
+        image: "{{.OvnImage}}"
 
         command: ["/root/ovnkube.sh", "sb-ovsdb"]
 
@@ -158,43 +120,24 @@ spec:
           name: host-var-run-ovs
         - mountPath: /var/run/kubernetes/
           name: host-var-run-kubernetes
+        - mountPath: /var/run/ovn-config
+          name: ovn-config-mount
 
         resources:
           requests:
             cpu: 100m
             memory: 300Mi
         env:
         - name: OVN_DAEMONSET_VERSION
-          value: "3"
-        - name: OVN_LOG_SB
-          value: "-vconsole:info -vfile:info"
-        - name: OVN_NET_CIDR
-          valueFrom:
-            configMapKeyRef:
-              name: ovn-config
-              key: net_cidr
-        - name: OVN_SVC_CIDR
-          valueFrom:
-            configMapKeyRef:
-              name: ovn-config
-              key: svc_cidr
+          value: "4"
         - name: K8S_NODE
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        - name: K8S_APISERVER
-          valueFrom:
-            configMapKeyRef:
-              name: ovn-config
-              key: k8s_apiserver
-        - name: OVN_KUBERNETES_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
       # end of container
 
       - name: ovnkube-master
-        image: {{.OvnImage}}
+        image: "{{.OvnImage}}"
 
         command: ["/root/ovnkube.sh", "ovn-master"]
 
@@ -209,41 +152,22 @@ spec:
           name: host-var-run-ovs
         - mountPath: /var/run/kubernetes/
           name: host-var-run-kubernetes
+        - mountPath: /var/run/ovn-config
+          name: ovn-config-mount
+        - mountPath: /var/run/ovnkube-config
+          name: ovnkube-config-mount
 
         resources:
           requests:
             cpu: 100m
             memory: 300Mi
         env:
         - name: OVN_DAEMONSET_VERSION
-          value: "3"
-        - name: OVN_MASTER
-          value: "true"
-        - name: OVNKUBE_LOGLEVEL
           value: "4"
-        - name: OVN_NET_CIDR
-          valueFrom:
-            configMapKeyRef:
-              name: ovn-config
-              key: net_cidr
-        - name: OVN_SVC_CIDR
-          valueFrom:
-            configMapKeyRef:
-              name: ovn-config
-              key: svc_cidr
         - name: K8S_NODE
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        - name: K8S_APISERVER
-          valueFrom:
-            configMapKeyRef:
-              name: ovn-config
-              key: k8s_apiserver
-        - name: OVN_KUBERNETES_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
       # end of container
 
       nodeSelector:
@@ -262,6 +186,13 @@ spec:
       - name: host-var-run-kubernetes
         hostPath:
           path: /var/run/kubernetes
+      - configMap:
+          name: ovn-config
+        name: ovn-config-mount
+      - configMap:
+          name: ovnkube-config
+        name: ovnkube-config-mount
+
       tolerations:
       - key: "node-role.kubernetes.io/master"
         operator: "Exists"