summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-04 17:51:58 +0000
committerGerrit Code Review <review@openstack.org>2019-01-04 17:51:58 +0000
commit2320e43122bb0ac1aa105a191b902d2e0a3e0505 (patch)
tree471dc169e12ec7d78e3404b5735851eb609ba703
parent602ecfae28dde15f8a9cab29f7938223fa9a8b61 (diff)
parent90ff84013d2919b660599aa8277e154117b44dfe (diff)
Merge "Fix some misspellings within Kuryr-Kubernetes"
-rw-r--r--CONTRIBUTING.rst2
-rw-r--r--doc/source/devref/port_crd_usage.rst2
-rw-r--r--doc/source/installation/containerized.rst2
-rw-r--r--doc/source/installation/devstack/ovn_support.rst4
-rw-r--r--kuryr_kubernetes/controller/drivers/base.py2
-rw-r--r--kuryr_kubernetes/controller/drivers/network_policy.py4
6 files changed, 8 insertions, 8 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 6badca9..a7d90c6 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -16,7 +16,7 @@ Bugs should be filed on Launchpad, not GitHub:
16 16
17 https://bugs.launchpad.net/kuryr-kubernetes 17 https://bugs.launchpad.net/kuryr-kubernetes
18 18
19If you want to have your code checked for pep8 automatically before commiting 19If you want to have your code checked for pep8 automatically before committing
20changes, you can just do:: 20changes, you can just do::
21 21
22 pip install pre-commit 22 pip install pre-commit
diff --git a/doc/source/devref/port_crd_usage.rst b/doc/source/devref/port_crd_usage.rst
index 05d86b2..2633ea5 100644
--- a/doc/source/devref/port_crd_usage.rst
+++ b/doc/source/devref/port_crd_usage.rst
@@ -167,7 +167,7 @@ KuryrPorts objects that were annotated with `deleting` label at the
167(or any other SDN) associated resources. 167(or any other SDN) associated resources.
168 168
169As for the Ports Pools, right now they reside on memory on the 169As for the Ports Pools, right now they reside on memory on the
170Kuryr-controller and need to be recovered everytime the controller gets 170Kuryr-controller and need to be recovered every time the controller gets
171restarted. To perform this recovery we are relying on Neutron Port 171restarted. To perform this recovery we are relying on Neutron Port
172device-owner information which may not be completely waterproof in all 172device-owner information which may not be completely waterproof in all
173situations (e.g., if there is another entity using the same device 173situations (e.g., if there is another entity using the same device
diff --git a/doc/source/installation/containerized.rst b/doc/source/installation/containerized.rst
index fce0c3c..c644f97 100644
--- a/doc/source/installation/containerized.rst
+++ b/doc/source/installation/containerized.rst
@@ -108,7 +108,7 @@ This should generate 5 files in your ``<output_dir>``:
108 kuryr-cni daemonset mounts /var/run, due to necessity of accessing to several sub directories 108 kuryr-cni daemonset mounts /var/run, due to necessity of accessing to several sub directories
109 like openvswitch and auxiliary directory for vhostuser configuration and socket files. Also when 109 like openvswitch and auxiliary directory for vhostuser configuration and socket files. Also when
110 neutron-openvswitch-agent works with datapath_type = netdev configuration option, kuryr-kubernetes 110 neutron-openvswitch-agent works with datapath_type = netdev configuration option, kuryr-kubernetes
111 has to move vhostuser socket to auxilary directory, that auxiliary directory should be on the same 111 has to move vhostuser socket to auxiliary directory, that auxiliary directory should be on the same
112 mount point, otherwise connection of this socket will be refused. 112 mount point, otherwise connection of this socket will be refused.
113 In case when Open vSwitch keeps vhostuser socket files not in /var/run/openvswitch, openvswitch 113 In case when Open vSwitch keeps vhostuser socket files not in /var/run/openvswitch, openvswitch
114 mount point in cni_ds.yaml and [vhostuser] section in config_map.yml should be changed properly. 114 mount point in cni_ds.yaml and [vhostuser] section in config_map.yml should be changed properly.
diff --git a/doc/source/installation/devstack/ovn_support.rst b/doc/source/installation/devstack/ovn_support.rst
index 35d18e6..634e823 100644
--- a/doc/source/installation/devstack/ovn_support.rst
+++ b/doc/source/installation/devstack/ovn_support.rst
@@ -57,9 +57,9 @@ Feel free to edit it if you'd like, but it should work as-is.
57 57
58Note that due to OVN compiling OVS from source at 58Note that due to OVN compiling OVS from source at
59/usr/local/var/run/openvswitch we need to state at the local.conf that the path 59/usr/local/var/run/openvswitch we need to state at the local.conf that the path
60is different from the default one (i.e., /var/run/openvswtich). 60is different from the default one (i.e., /var/run/openvswitch).
61 61
62Optionally, the ports pool funcionality can be enabled by following: 62Optionally, the ports pool functionality can be enabled by following:
63:doc:`./ports-pool` 63:doc:`./ports-pool`
64 64
655. Run DevStack. 655. Run DevStack.
diff --git a/kuryr_kubernetes/controller/drivers/base.py b/kuryr_kubernetes/controller/drivers/base.py
index 00bc568..765e3dd 100644
--- a/kuryr_kubernetes/controller/drivers/base.py
+++ b/kuryr_kubernetes/controller/drivers/base.py
@@ -778,7 +778,7 @@ class NetworkPolicyDriver(DriverBase):
778 :param policy: dict containing Kubernetes NP object 778 :param policy: dict containing Kubernetes NP object
779 :param selector: (optional) specifc pod selector 779 :param selector: (optional) specifc pod selector
780 :returns: list of Pods objects affected by the policy or the selector 780 :returns: list of Pods objects affected by the policy or the selector
781 if it is pased 781 if it is passed
782 """ 782 """
783 raise NotImplementedError() 783 raise NotImplementedError()
784 784
diff --git a/kuryr_kubernetes/controller/drivers/network_policy.py b/kuryr_kubernetes/controller/drivers/network_policy.py
index d49db44..2a903ed 100644
--- a/kuryr_kubernetes/controller/drivers/network_policy.py
+++ b/kuryr_kubernetes/controller/drivers/network_policy.py
@@ -241,12 +241,12 @@ class NetworkPolicyDriver(base.NetworkPolicyDriver):
241 elif namespace_selector: 241 elif namespace_selector:
242 selectors = True 242 selectors = True
243 if pod_selector: 243 if pod_selector:
244 # allow matching pods on maching namespaces 244 # allow matching pods on matching namespaces
245 allowed_cidrs.extend(self._get_pods_ips( 245 allowed_cidrs.extend(self._get_pods_ips(
246 pod_selector, 246 pod_selector,
247 namespace_selector=namespace_selector)) 247 namespace_selector=namespace_selector))
248 else: 248 else:
249 # allow from/to all on the maching namespaces 249 # allow from/to all on the matching namespaces
250 allowed_cidrs.extend(self._get_namespaces_cidr( 250 allowed_cidrs.extend(self._get_namespaces_cidr(
251 namespace_selector)) 251 namespace_selector))
252 else: 252 else: