Cleanup cni.main file
Removed outdated comment and switched deprecation message to use a correct function as bug 1754087 [1] preventing that was fixed. [1] https://bugs.launchpad.net/oslo.log/+bug/1754087 Change-Id: If1617027eb70ce174530c57acbab3a3c9b391881
This commit is contained in:
parent
7a8bd050c1
commit
ea2323aa6d
@ -37,9 +37,6 @@ _CNI_TIMEOUT = 180
|
||||
|
||||
|
||||
def run():
|
||||
# REVISIT(ivc): current CNI implementation provided by this package is
|
||||
# experimental and its primary purpose is to enable development of other
|
||||
# components (e.g. functional tests, service/LBaaSv2 support)
|
||||
if six.PY3:
|
||||
d = jsonutils.load(sys.stdin.buffer)
|
||||
else:
|
||||
@ -62,13 +59,8 @@ def run():
|
||||
if CONF.cni_daemon.daemon_enabled:
|
||||
runner = cni_api.CNIDaemonizedRunner()
|
||||
else:
|
||||
# TODO(dulek): Switch that to versionutils.deprecation_warning once
|
||||
# bug 1754087 is fixed.
|
||||
versionutils.report_deprecated_feature(
|
||||
LOG,
|
||||
'Deploying kuryr-kubernetes without kuryr-daemon service is '
|
||||
'deprecated since Rocky release and may be removed in future '
|
||||
'releases.')
|
||||
versionutils.deprecation_warning(
|
||||
'Deploying kuryr-kubernetes without kuryr-daemon service', 'R')
|
||||
runner = cni_api.CNIStandaloneRunner(k8s_cni.K8sCNIPlugin())
|
||||
LOG.info("Using '%s' ", runner.__class__.__name__)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user