diff options
| author |   Kuralamudhan Ramakrishnan <kuralamudhan.ramakrishnan@intel.com> | 2020-04-21 17:19:34 +0000 |
|---|---|---|
| committer | Kuralamudhan Ramakrishnan <kuralamudhan.ramakrishnan@intel.com> | 2020-09-17 16:25:10 -0700 |
| commit | 3de63ee756f9d7c0a4524b40a89e92b918a9249f (patch) | |
| tree | 3579bc50aee0a38d7c63c5787fca6205ced7a2df /build | |
| parent | 7f01772cdf3916026a93e9e9ac5ce54d57401476 (diff) | |
Adding cnishim and cniserver
- inspired from ovn-kubernetes and sdn openshift - cniserver & cnishim concepts
- removed cni binary to depend on the host ovs binary installation
- encapsulated all the binaries within the ovn and ovs containers
- ovn4nfv-k8s cni server run along with nfn-agent
- cnishim act as the httpclient and cniserver as httpservers
- cnishim wrap all the cni commands to cniserver
- cniserver do the actual network pumping work and send result back to cnishim
- cnishim print the results as per the cni spec requirement
- currently supports only debian installation for ovn daemon
- support for debian kernel installation
- Consolidated all yaml into single ovn4nfv-k8s-plugin
Signed-off-by: Kuralamudhan Ramakrishnan <kuralamudhan.ramakrishnan@intel.com>
Change-Id: I1e2b114d90f717baa2ee94ff379c849d73b2754e
Diffstat (limited to 'build')
| -rw-r--r-- | build/Dockerfile | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/build/Dockerfile b/build/Dockerfile index 9530772..af88d13 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -8,13 +8,21 @@ ENV https_proxy $HTTPS_PROXY ENV no_proxy $NO_PROXY RUN apt-get update && apt-get install -y -qq apt-transport-https make curl net-tools iproute2 \ - && echo "deb https://packages.wand.net.nz bionic ovs-2.10" > /etc/apt/sources.list.d/ovs.list \ - && curl https://packages.wand.net.nz/keyring.gpg -o /etc/apt/trusted.gpg.d/wand.gpg \ - && apt-get update && apt install -y -qq ovn-common openvswitch-common openvswitch-switch + wget software-properties-common setpriv dpkg-dev netcat jq + +RUN mkdir -p /opt/ovn4nfv-k8s-plugin/dist/ubuntu/deb +RUN bash -xc "\ +pushd /opt/ovn4nfv-k8s-plugin/dist/ubuntu/deb; \ +wget -q -nv -O- https://api.github.com/repos/akraino-icn/ovs/releases/tags/v2.12.0 2>/dev/null | jq -r '.assets[] | select(.browser_download_url | contains("\""deb"\"")) | .browser_download_url' | wget -i -; \ +dpkg-scanpackages . | gzip -c9 > Packages.gz; \ +popd; \ +" +RUN echo "deb [trusted=yes] file:///opt/ovn4nfv-k8s-plugin/dist/ubuntu/deb ./" | tee -a /etc/apt/sources.list > /dev/null +RUN apt-get update && apt-get install -y -qq ovn-common=2.12.0-1 openvswitch-common=2.12.0-1 openvswitch-switch=2.12.0-1 ENV GOLANG_VERSION 1.14.1 RUN curl -sSL https://storage.googleapis.com/golang/go$GOLANG_VERSION.linux-amd64.tar.gz \ - | tar -v -C /usr/local -xz + | tar -v -C /usr/local -xz ENV PATH /usr/local/go/bin:$PATH RUN mkdir -p /go/src /go/bin && chmod -R 777 /go @@ -32,5 +40,4 @@ ENV OPERATOR=/usr/local/bin/nfn-operator \ USER_NAME=nfn-operator RUN cp -r build/bin/* /usr/local/bin/ - ENTRYPOINT ["entrypoint"] |