Merge "Add tempest test job for annotation project driver"

.zuul.d/project.yaml

@@ -26,6 +26,7 @@
         - kuryr-kubernetes-tempest-ipv6-ovs
         - kuryr-kubernetes-tempest-amphora
         - kuryr-kubernetes-tempest-amphora-ovs
+        - kuryr-kubernetes-tempest-annotation-project-driver
         - kuryr-kubernetes-e2e-np
     gate:
       jobs:

.zuul.d/tempest-jobs.yaml

@@ -167,6 +167,16 @@
         KURYR_VIF_POOL_DRIVER: neutron
         KURYR_CONFIGMAP_MODIFIABLE: false
 
+- job:
+    name: kuryr-kubernetes-tempest-annotation-project-driver
+    parent: kuryr-kubernetes-octavia-base
+    description: |
+        Run kuryr-Kubernetes tempest job with annotation project driver
+    vars:
+      devstack_localrc:
+        KURYR_PROJECT_DRIVER: annotation
+    voting: true
+
 - job:
     name: kuryr-kubernetes-tempest-docker
     parent: kuryr-kubernetes-octavia-base

devstack/lib/kuryr_kubernetes

@@ -1013,6 +1013,14 @@ function configure_kuryr {
     # Let Kuryr retry connections to K8s API for 20 minutes.
     iniset "$KURYR_CONFIG" kubernetes watch_retry_timeout 1200
 
+
+    if [[ "$KURYR_PROJECT_DRIVER" == "annotation" ]]; then
+        iniset "$KURYR_CONFIG" kubernetes pod_project_driver annotation
+        iniset "$KURYR_CONFIG" kubernetes service_project_driver annotation
+        iniset "$KURYR_CONFIG" kubernetes namespace_project_driver annotation
+        iniset "$KURYR_CONFIG" kubernetes network_policy_project_driver annotation
+    fi
+
     if [ "${KURYR_CONT}" == "True" ]; then
         # This works around the issue of being unable to set oslo.privsep mode
         # to FORK in os-vif. When running in a container we disable `sudo` that
@@ -1587,6 +1595,9 @@ function update_tempest_conf_file {
     if [[ "$KURYR_EP_DRIVER_OCTAVIA_PROVIDER" == "ovn" ]]; then
         iniset "$TEMPEST_CONFIG" kuryr_kubernetes enable_reconciliation True
     fi
+    if [[ "$KURYR_PROJECT_DRIVER" == "annotation" ]]; then
+        iniset "$TEMPEST_CONFIG" kuryr_kubernetes annotation_project_driver True
+    fi
     iniset "$TEMPEST_CONFIG" kuryr_kubernetes validate_crd True
     iniset "$TEMPEST_CONFIG" kuryr_kubernetes kuryrports True
     iniset "$TEMPEST_CONFIG" kuryr_kubernetes kuryrloadbalancers True

devstack/settings

@@ -57,6 +57,9 @@ KURYR_K8S_CONTAINERIZED_DEPLOYMENT=${KURYR_K8S_CONTAINERIZED_DEPLOYMENT:-True}
 # Kuryr Endpoint LBaaS OCTAVIA provider
 KURYR_EP_DRIVER_OCTAVIA_PROVIDER=${KURYR_EP_DRIVER_OCTAVIA_PROVIDER:-default}
 
+# kuryr project driver
+KURYR_PROJECT_DRIVER=${KURYR_PROJECT_DRIVER:-default}
+
 # Kuryr VIF driver
 KURYR_POD_VIF_DRIVER=${KURYR_POD_VIF_DRIVER:-neutron-vif}