Merge remote-tracking branch 'origin/master' into openshift-rebase

Change-Id: If75c8f51f88a30f13766a08295dad7fcafef5cf3

.zuul.d/project.yaml

@@ -38,13 +38,14 @@
         - kuryr-kubernetes-tempest-containerized-openshift-serial
         - kuryr-kubernetes-tempest-ovn
         - kuryr-kubernetes-tempest-openshift
+        - kuryr-kubernetes-tempest-containerized-ovn-provider-ovn
         - kuryr-kubernetes-tempest-openshift-multi-vif
         - kuryr-kubernetes-tempest-multinode-ha
         - kuryr-kubernetes-tempest-containerized-crio
 
 - project:
     templates:
-      - openstack-python3-ussuri-jobs
+      - openstack-python3-victoria-jobs
       - openstack-lower-constraints-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3

.zuul.d/sdn.yaml

@@ -18,25 +18,30 @@
     description: |
         Kuryr-Kubernetes tempest job using OVN
     required-projects:
-      - openstack/networking-ovn
+      - openstack/neutron
     host-vars:
       controller:
         devstack_plugins:
-          networking-ovn: https://opendev.org/openstack/networking-ovn
           neutron: https://opendev.org/openstack/neutron
     vars:
       devstack_localrc:
+        Q_AGENT: ovn
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
+        Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve
+        Q_ML2_TENANT_NETWORK_TYPE: geneve
         VAR_RUN_PATH: /usr/local/var/run
         Q_USE_PROVIDERNET_FOR_PUBLIC: true
         PHYSICAL_NETWORK: public
         OVN_L3_CREATE_PUBLIC_NETWORK: true
         # OVN already builds from source by default
         Q_BUILD_OVS_FROM_GIT: false
         KURYR_NEUTRON_DEFAULT_ROUTER: kuryr-router
+        OVN_BRANCH: branch-20.03
       devstack_services:
         ovn-northd: true
         ovn-controller: true
-        networking-ovn-metadata-agent: true
+        q-ovn-metadata-agent: true
+        q-svc: true
         q-agt: false
         q-l3: false
         q-dhcp: false
@@ -63,6 +68,38 @@
         KURYR_IPV6: true
     voting: false
 
+- job:
+    name: kuryr-kubernetes-tempest-containerized-ovn-provider-ovn
+    parent: kuryr-kubernetes-tempest-containerized-ovn
+    description: |
+        Kuryr-Kubernetes tempest job using OVN, CNI daemon, Containerized, Octavia provider OVN, and Network Policy drivers
+    required-projects:
+      - openstack/ovn-octavia-provider
+    host-vars:
+      controller:
+        devstack_plugins:
+          ovn-octavia-provider: https://opendev.org/openstack/ovn-octavia-provider
+    vars:
+      devstack_services:
+          o-da: true
+      devstack_local_conf:
+        post-config:
+          $OCTAVIA_CONF:
+            controller_worker:
+              amp_active_retries: 9999
+            api_settings:
+              enabled_provider_drivers: amphora:'Octavia Amphora driver',ovn:'Octavia OVN driver'
+      devstack_localrc:
+        ENABLE_CHASSIS_AS_GW: true
+        KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn
+        KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
+        KURYR_K8S_OCTAVIA_SG_MODE: create
+        KURYR_ENFORCE_SG_RULES: false
+        KURYR_LB_ALGORITHM: SOURCE_IP_PORT
+        KURYR_SUBNET_DRIVER: namespace
+        KURYR_SG_DRIVER: policy
+        KURYR_ENABLED_HANDLERS: vif,lb,lbaasspec,namespace,pod_label,policy,kuryrnetpolicy,kuryrnetwork
+
 - job:
     name: kuryr-kubernetes-tempest-dragonflow
     parent: kuryr-kubernetes-tempest

CONTRIBUTING.rst

@@ -1,23 +1,19 @@
-If you would like to contribute to the development of OpenStack, you must
-follow the steps in this page:
-https://docs.openstack.org/infra/manual/developers.html
+The source repository for this project can be found at:
 
-If you already have a good understanding of how the system works and your
-OpenStack accounts are set up, you can skip to the development workflow section
-of this documentation to learn how changes to OpenStack should be submitted for
-review via the Gerrit tool:
-https://docs.openstack.org/infra/manual/developers.html#development-workflow
+   https://opendev.org/openstack/kuryr-kubernetes
 
-Pull requests submitted through GitHub will be ignored.
+Pull requests submitted through GitHub are not monitored.
 
-Bugs should be filed on Launchpad, not GitHub:
-https://bugs.launchpad.net/kuryr-kubernetes
+To start contributing to OpenStack, follow the steps in the contribution guide
+to set up and use Gerrit:
 
-If you want to have your code checked for pep8 automatically before committing
-changes, you can just do::
+   https://docs.openstack.org/contributors/code-and-documentation/quick-start.html
 
-    pip install pre-commit
-    pre-commit install
+Bugs should be filed on Launchpad:
 
-From that moment on, every time you run *git commit* it will first check your
-diff for pep8 compliance and refuse to commit if it doesn't pass.
+   https://bugs.launchpad.net/kuryr-kubernetes
+
+For more specific information about contributing to this repository, see the
+kuryr-kubernetes contributor guide:
+
+   https://docs.openstack.org/kuryr-kubernetes/latest/contributor/contributing.html

cni.Dockerfile

@@ -11,7 +11,8 @@ ARG UPPER_CONSTRAINTS_FILE="https://releases.openstack.org/constraints/upper/mas
 ARG OSLO_LOCK_PATH=/var/kuryr-lock
 ARG PKG_YUM_REPO=https://rdoproject.org/repos/rdo-release.rpm
 
-RUN yum install -y epel-release $PKG_YUM_REPO \
+RUN yum upgrade -y \
+    && yum install -y epel-release $PKG_YUM_REPO \
     && yum install -y --setopt=tsflags=nodocs python3-pip openvswitch sudo iproute libstdc++ pciutils kmod-libs \
     && yum install -y --setopt=tsflags=nodocs gcc gcc-c++ python3-devel git
 

controller.Dockerfile

@@ -3,7 +3,8 @@ LABEL authors="Antoni Segura Puimedon<toni@kuryr.org>, Michał Dulko<mdulko@redh
 
 ARG UPPER_CONSTRAINTS_FILE="https://releases.openstack.org/constraints/upper/master"
 
-RUN yum install -y epel-release \
+RUN yum upgrade -y \
+    && yum install -y epel-release \
     && yum install -y --setopt=tsflags=nodocs python3-pip libstdc++ \
     && yum install -y --setopt=tsflags=nodocs gcc gcc-c++ python3-devel git
 

devstack/local.conf.ovn.sample

@@ -27,13 +27,17 @@ IDENTITY_API_VERSION=3
 ENABLED_SERVICES=""
 
 # OVN components
-enable_plugin networking-ovn https://opendev.org/openstack/networking-ovn
+Q_AGENT=ovn
+Q_ML2_PLUGIN_MECHANISM_DRIVERS=ovn,logger
+Q_ML2_PLUGIN_TYPE_DRIVERS=local,flat,vlan,geneve
+Q_ML2_TENANT_NETWORK_TYPE=geneve
+
 enable_service ovn-northd
 enable_service ovn-controller
-enable_service networking-ovn-metadata-agent
+enable_service q-ovn-metadata-agent
 
 # Neutron services
-enable_service neutron
+enable_plugin neutron https://opendev.org/openstack/neutron
 enable_service q-svc
 
 # VAR RUN PATH
@@ -87,6 +91,8 @@ enable_service placement-client
 enable_service g-api
 enable_service g-reg
 
+# OVN octavia provider plugin
+enable_plugin ovn-octavia-provider https://opendev.org/openstack/ovn-octavia-provider
 
 # Keystone
 enable_service key

devstack/plugin.sh

@@ -16,10 +16,19 @@ XTRACE=$(set +o | grep xtrace)
 set -o xtrace
 
 function container_runtime {
+    # Ignore error at killing/removing a container doesn't running to avoid
+    # unstack is terminated.
+    # TODO: Support for CRI-O if it's required.
+    local regex_cmds_ignore="(kill|rm)\s+"
+
     if [[ ${CONTAINER_ENGINE} == 'crio' ]]; then
-        sudo podman "$@"
+        sudo podman "$@" || die $LINENO "Error when running podman command"
     else
-        docker "$@"
+        if [[ $@ =~ $regex_cmds_ignore ]]; then
+            docker "$@"
+        else
+            docker "$@" || die $LINENO "Error when running docker command"
+        fi
     fi
 }
 
@@ -445,14 +454,14 @@ function configure_neutron_defaults {
         # NOTE(ltomasbo): As more security groups and rules are created, there
         # is a need to increase the quota for it
          openstack --os-cloud devstack-admin --os-region "$REGION_NAME" \
-             quota set --secgroups 100 --secgroup-rules 100 "$project_id"
+             quota set --secgroups 100 --secgroup-rules 300 "$project_id"
     fi
 
     # NOTE(dulek): DevStack's admin default for SG's and instances is 10, this
     #              is too little for our tests with Octavia configured to use
     #              amphora.
     openstack --os-cloud devstack-admin --os-region "$REGION_NAME" \
-        quota set --secgroups 100 --secgroup-rules 100 --instances 100 admin
+        quota set --secgroups 100 --secgroup-rules 300 --instances 100 admin
 
     if [ -n "$OVS_BRIDGE" ]; then
         iniset "$KURYR_CONFIG" neutron_defaults ovs_bridge "$OVS_BRIDGE"

doc/source/contributor/contributing.rst

@@ -0,0 +1,82 @@
+============================
+So You Want to Contribute...
+============================
+
+For general information on contributing to OpenStack, please check out the
+`contributor guide <https://docs.openstack.org/contributors/>`_ to get started.
+It covers all the basics that are common to all OpenStack projects: the
+accounts you need, the basics of interacting with our Gerrit review system, how
+we communicate as a community, etc.
+
+Below will cover the more project specific information you need to get started
+with kuryr-kubernetes.
+
+
+Communication
+-------------
+
+The primary communication channel of kuryr-kubernetes team is `#openstack-kuryr
+channel on IRC <irc://irc.freenode.net:+6697/openstack-kuryr>`_. For more
+formal inquiries you can use [kuryr] tag on `openstack-discuss mailing list
+<http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-discuss>`_.
+kuryr-kubernetes team is not holding weekly meetings, but we have office hours
+every Monday at 15:00 UTC on our IRC channel.
+
+
+Contacting the Core Team
+------------------------
+
+Outside of office hours, kuryr-kubernetes team is available mostly in the CET
+working hours (7:00-17:00 UTC), as most of the team is located in Europe. Feel
+free to try pinging dulek, ltomasbo, maysams or gryf on IRC, we have bouncers
+set up so we'll answer once online.
+
+
+New Feature Planning
+--------------------
+
+We don't really follow a very detailed way of feature planning. If you want to
+implement a feature, come talk to us on IRC, create a `blueprint on Launchpad
+<https://blueprints.launchpad.net/kuryr-kubernetes>`_ and start coding!
+kuryr-kubernetes follows OpenStack release schedule pretty loosely as we're
+more bound to Kubernetes release schedule. This means that we do not observe as
+hard deadlines as other projects.
+
+
+Task Tracking
+-------------
+
+We track our `tasks in Launchpad
+<https://bugs.launchpad.net/kuryr-kubernetes>`_.
+
+If you're looking for some smaller, easier work item to pick up and get started
+on, search for the 'low-hanging-fruit' tag in either blueprints or bugs.
+
+
+Reporting a Bug
+---------------
+
+You found an issue and want to make sure we are aware of it? You can do so on
+`Launchpad <https://bugs.launchpad.net/kuryr-kubernetes>`_. It won't hurt to
+ping us about it on IRC too.
+
+
+Getting Your Patch Merged
+-------------------------
+
+We follow the normal procedures, requiring two +2's before approving the patch.
+Due to limited number of contributors we do not require that those +2's are
+from reviewers working for separate businesses.
+
+If your patch is stuck in review, please ping us on IRC as listed in sections
+above.
+
+
+Project Team Lead Duties
+------------------------
+
+All common PTL duties are enumerated in the `PTL guide
+<https://docs.openstack.org/project-team-guide/ptl.html>`_.
+
+And additional PTL duty is to maintain `kuryr images on Docker Hub
+<https://hub.docker.com/orgs/kuryr/repositories>`_.

doc/source/contributor/index.rst

@@ -0,0 +1,8 @@
+===========================
+ Contributor Documentation
+===========================
+
+.. toctree::
+   :maxdepth: 2
+
+   contributing

doc/source/index.rst

@@ -15,7 +15,7 @@ Contents
    readme
    installation/index
    usage
-   contributing
+   contributor/index
 
 
 Developer Docs

doc/source/installation/containerized.rst

@@ -42,7 +42,7 @@ that can be used to Deploy Kuryr on Kubernetes. The script is placed in
 
 .. code-block:: console
 
-   $ ./tools/generate_k8s_resource_definitions <output_dir> [<controller_conf_path>] [<cni_conf_path>] [<ca_certificate_path>]
+   $ ./tools/generate_k8s_resource_definitions.sh <output_dir> [<controller_conf_path>] [<cni_conf_path>] [<ca_certificate_path>]
 
 * ``output_dir`` - directory where to put yaml files with definitions.
 * ``controller_conf_path`` - path to custom kuryr-controller configuration