2f65d993f3
This commit implements basic CNI daemon service. The aim of this new entity is to increase scalability of CNI operations by moving watching for VIF to a separate process. This commit: * Introduces kuryr-daemon service * Implements communication between CNI driver and CNI daemon using HTTP * Consolidates watching for VIF on CNI side to a single Watcher that looks for all the pods on the node it is running on. * Solves bug 1731485 when running with CNI daemon. * Enables new service in DevStack plugin * Provides unit tests for new code. Follow up patches will include: - Documentation. - Support for running in containerized mode. To test the patch add `enable_service kuryr-daemon` to your DevStack's local.conf file. Partial-Bug: 1731485 Co-Authored-By: Janonymous <janonymous.codevulture@gmail.com> Implements: blueprint cni-split-exec-daemon Change-Id: I1bd6406dacab0735a94474e146645c63d933be16
53 lines
2.0 KiB
Python
53 lines
2.0 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
import copy
|
|
|
|
from oslo_log import _options
|
|
|
|
from kuryr.lib import opts as lib_opts
|
|
from kuryr_kubernetes import config
|
|
from kuryr_kubernetes.controller.drivers import nested_vif
|
|
from kuryr_kubernetes.controller.drivers import vif_pool
|
|
from kuryr_kubernetes.controller.managers import pool
|
|
|
|
_kuryr_k8s_opts = [
|
|
('kubernetes', config.k8s_opts),
|
|
('kuryr-kubernetes', config.kuryr_k8s_opts),
|
|
('neutron_defaults', config.neutron_defaults),
|
|
('pod_vif_nested', nested_vif.nested_vif_driver_opts),
|
|
('vif_pool', vif_pool.vif_pool_driver_opts),
|
|
('octavia_defaults', config.octavia_defaults),
|
|
('pool_manager', pool.pool_manager_opts),
|
|
('cni_daemon', config.daemon_opts),
|
|
]
|
|
|
|
|
|
def list_kuryr_opts():
|
|
"""Return a list of oslo_config options available in Kuryr service.
|
|
|
|
Each element of the list is a tuple. The first element is the name of the
|
|
group under which the list of elements in the second element will be
|
|
registered. A group name of None corresponds to the [DEFAULT] group in
|
|
config files.
|
|
|
|
This function is also discoverable via the 'kuryr' entry point under
|
|
the 'oslo_config.opts' namespace.
|
|
|
|
The purpose of this is to allow tools like the Oslo sample config file
|
|
generator to discover the options exposed to users by Kuryr.
|
|
|
|
:returns: a list of (group_name, opts) tuples
|
|
"""
|
|
|
|
return ([(k, copy.deepcopy(o)) for k, o in _kuryr_k8s_opts] +
|
|
lib_opts.list_kuryr_opts() + _options.list_opts())
|