Add egress-router-cni init container

This commit adds a new init container for the deployment of the
egress-router-cni plugin to the hosts.

bindata/network/multus/multus.yaml

@@ -133,6 +133,25 @@ spec:
           value: "/usr/src/multus-cni/rhel8/bin/"
         - name: DEFAULT_SOURCE_DIRECTORY
           value: "/usr/src/multus-cni/bin/"
+      - name: egress-router-binary-copy
+        image: "quay.io/dmellado/egress-router-test:latest"
+        image: {{.EgressRouterImage}}
+        command: ["/entrypoint/cnibincopy.sh"]
+        volumeMounts:
+        - mountPath: /entrypoint
+          name: cni-binary-copy
+        - mountPath: /host/opt/cni/bin
+          name: cnibin
+        - mountPath: /host/etc/os-release
+          name: os-release
+          readOnly: true
+        env:
+        - name: RHEL7_SOURCE_DIRECTORY
+          value: "/usr/src/egress-router-cni/rhel7/bin/"
+        - name: RHEL8_SOURCE_DIRECTORY
+          value: "/usr/src/egress-router-cni/rhel8/bin/"
+        - name: DEFAULT_SOURCE_DIRECTORY
+          value: "/usr/src/egress-router-cni/bin/"
       - name: cni-plugins
         image: {{.CNIPluginsImage}}
         command: ["/entrypoint/cnibincopy.sh"]

manifests/0000_70_cluster-network-operator_03_deployment.yaml

@@ -53,6 +53,8 @@ spec:
           value: "5000"
         - name: OVN_CONTROLLER_INACTIVITY_PROBE
           value: "30000"
+        - name: EGRESS_ROUTER_IMAGE
+          value: "quay.io/dmellado/egress-router-test:latest"
         - name: KURYR_DAEMON_IMAGE
           value: "quay.io/openshift/origin-kuryr-cni:4.3"
         - name: KURYR_CONTROLLER_IMAGE

manifests/image-references

@@ -42,6 +42,10 @@ spec:
     from:
       kind: DockerImage
       name: quay.io/openshift/origin-ovn-kubernetes:4.3
+  - name: egress-router
+    from:
+      kind: DockerImage
+      name: quay.io/dmellado/egress-router-test:latest
   - name: kuryr-cni
     from:
       kind: DockerImage

pkg/network/egress_router.go

@@ -0,0 +1,25 @@
+package network
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/openshift/cluster-network-operator/pkg/render"
+	"github.com/pkg/errors"
+	uns "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+)
+
+// renderEgressRouterConfig returns the manifests of Egress Router CNI
+func renderEgressRouterConfig(manifestDir string) ([]*uns.Unstructured, error) {
+	objs := []*uns.Unstructured{}
+
+	data = render.MakeRenderData()
+	data.Data["EgressRouterImage"] = os.Getenv("EGRESS_ROUTER_IMAGE")
+
+	manifests, err := render.RenderDir(filepath.Join(manifestDir, "network/egress-router-cni"), &data)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to render egress router cni manifests")
+	}
+	objs = append(objs, manifests...)
+	return objs, nil
+}

pkg/network/render.go

@@ -32,6 +32,12 @@ func Render(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.BootstrapResult
 	}
 	objs = append(objs, o...)
 
+	// render EgressRouter
+	o, err = renderEgressRouter(conf, manifestDir)
+	if err != nil {
+		return nil, err
+	}
+
 	// render default network
 	o, err = renderDefaultNetwork(conf, bootstrapResult, manifestDir)
 	if err != nil {