Commit Graph

7 Commits

Author SHA1 Message Date
xujingsong 257b5a80ab Update 10-kuryr.conf to 10-kuryr.conflist, and generate the
10-kuryr.conflist file from the template file kuryr.conflist.template

1. Currently kubelet's cni config file uses 10-kuryr.conf in kuryr. The
kubernetes can support the config file with two suffixes, ".conf" and
".conflist", the latter can be a list containing multiple cni plugins.
So I want to update the 10-kuryr.conf to 10-kuryr.conflist to satisfy
the need to use multiple plug-in support.

2. If I install the kuryr-cni by pod, the 10-kuryr.conf will only be
copied and overwrited from the kuryr/cni image container. What I
expected is we can customize the config file more freely. So I think we
can add an other file kuryr.conflist.template as the template, then we
generate the 10-kuryr.conflist fron it.

Change-Id: Ie3669db4e60a57b24012124cd24b524eb03f55cf
2020-09-02 20:03:51 +02:00
Alexey Perevalov 607a249e10 Proceed CNI output in format of version 0.3.1
Kuryr-kubernetes declares, that supported CNI version is 0.3.0, but
it prints to output in format of version 0.2.0.
Kubernetes can't parse it.
This patch modifies CNI output according to 0.3.1, it has a little
difference with version 0.3.0, just in naming of ips field.

Change-Id: I7b6bb5c178035b7c85fc28973f9a0cf1bc1a139e
Closes-Bug: 1779718
Signed-off-by: Alexey Perevalov <a.perevalov@samsung.com>
2018-07-04 13:04:35 +00:00
Michał Dulko e83627244f Remove 99-loopback.conf
Turns out 99-loopback.conf file isn't really required when running
kuryr-kubernetes. This commit removes its installation from DevStack
plugin and CNI Docker image.

Change-Id: I8f2097287df907675c4113cd225a7ee9f6cd7ef1
2017-10-09 15:32:20 +02:00
Ilya Chukhnakov fa03953aff Experimental CNI & VIFBridge binding
This patch provides an experimental CNI driver. It's primary purpose
is to enable development of other components (e.g. functional tests,
service/LBaaSv2 support). It is expected to be replaced with daemon
to configure VIF and connect it to the pods and a small lightweight
client to serve as CNI driver called by Kubernetes.

NOTE: unit tests are not provided as part of this patch as it is yet
unclear what parts of it will be reused in daemon-based
implementation.

Change-Id: Iacc8439dd3aee910d542e48ed013d6d3f354786e
Partially-Implements: blueprint kuryr-k8s-integration
2016-12-05 18:05:22 +00:00
Antoni S. Puimedon 33e829e820 devstack: make cni paths configurable
With this patch, we'll be able to place our cni executables in:

    /opt/stack/cni/bin

It also allows you to put configuration files for the kuryr cni driver
in:

    /opt/stack/cni/conf

For now we are not setting any non standard conf. It is foreseeable
though that some configuration like which host device to base the
ipvlan/vlan/macvlan devices off on container-in-vm environments could go
here (Although it could also be in a kuryr.conf for the cni driver).

Change-Id: I9abc0878612b97795c68c8d773e7a29e891d1a6f
Signed-off-by: Antoni S. Puimedon <asegurap@redhat.com>
2016-11-17 11:30:37 +01:00
Antoni Segura Puimedon ca64e1d5f1 move config and opt generation to new kuryr-lib
The config generation was from back when we did not have keystone v3
support, which moved around how it all is generated. This patch puts
kuryr-kubernetes in line with the rest of Kuryr.

Change-Id: I877fa57308aa4c2128bb5d12e801e7e566aef108
Closes-bug: #1626014
Signed-off-by: Antoni Segura Puimedon <antonisp@celebdor.com>
2016-09-26 13:11:47 +00:00
Jaume Devesa 86e35666c4 Introduce `kuryr-k8s` service
This commit introduces the `kuryr-k8s` service by adding the service
binary and focusing on loading configuration options.

The configuration options are inherited from kuryr-lib project
(http://github.com/openstack/kuryr) and loaded at runtime, together with
the project ones.

These configuration options can be also generated using the
`oslo-config-generator` utility by using:

    tox -e genconfig

The service runs as any other OpenStack-based service:

    kuryr-k8s [--debug] [--config-file foo] ...

Partial-Implements: blueprint kuryr-k8s-integration
Change-Id: I7e52aef8fb2767dcc46317f2212f4285a17b11da
Signed-off-by: Jaume Devesa <devvesa@gmail.com>
Co-Authored-By: Taku Fukushima <f.tac.mac@gmail.com>
2016-08-29 11:01:50 +02:00