Remove way of running without kuryr-daemon

Deploying without kuryr-daemon is deprecated since Rocky and we
announced that it will be removed in the Rocky release notes. This
commit removes all the code that allows that, updates the documentation,
DevStack plugin and gates definitions.

Implements: blueprint remove-non-daemon

Change-Id: I65598d4a6ecb5c3dfde04dc5fefd7b02fc72a0cb

.zuul.d/base.yaml

@@ -76,6 +76,7 @@
         kubernetes-scheduler: true
         kubelet: true
         kuryr-kubernetes: true
+        kuryr-daemon: true
       zuul_copy_output:
         '{{ devstack_log_dir }}/kubernetes': 'logs'
     irrelevant-files:

.zuul.d/multi-vif.yaml

@@ -13,10 +13,10 @@
 # limitations under the License.
 
 - job:
-    name: kuryr-kubernetes-tempest-daemon-openshift-octavia-multi-vif
-    parent: kuryr-kubernetes-tempest-daemon-openshift-octavia
+    name: kuryr-kubernetes-tempest-openshift-octavia-multi-vif
+    parent: kuryr-kubernetes-tempest-openshift-octavia
     description: |
-      Kuryr-Kubernetes tempest job using octavia, CNI daemon, Openshift and NPWG multi-vif driver
+      Kuryr-Kubernetes tempest job using octavia, Openshift and NPWG multi-vif driver
     vars:
       devstack_localrc:
         KURYR_MULTI_VIF_DRIVER: npwg_multiple_interfaces

.zuul.d/multinode.yaml

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 - job:
-    name: kuryr-kubernetes-tempest-multinode-daemon-octavia-containerized
+    name: kuryr-kubernetes-tempest-multinode-octavia-containerized
     parent: kuryr-kubernetes-tempest-octavia
     description: |
         Kuryr-Kubernetes tempest multinode job using octavia
@@ -55,8 +55,8 @@
     voting: false
 
 - job:
-    name: kuryr-kubernetes-tempest-multinode-daemon-octavia-ha
-    parent: kuryr-kubernetes-tempest-multinode-daemon-octavia-containerized
+    name: kuryr-kubernetes-tempest-multinode-octavia-ha
+    parent: kuryr-kubernetes-tempest-multinode-octavia-containerized
     description: |
         Kuryr-Kubernetes tempest multinode job using octavia and running
         containerized in HA

.zuul.d/octavia.yaml

@@ -44,7 +44,6 @@
         o-cw: true
         o-hk: true
         o-hm: true
-        kuryr-daemon: false
 
 - job:
     name: kuryr-kubernetes-tempest-octavia-centos-7
@@ -53,38 +52,29 @@
     voting: false
 
 - job:
-    name: kuryr-kubernetes-tempest-daemon-octavia
+    name: kuryr-kubernetes-tempest-octavia-py36
     parent: kuryr-kubernetes-tempest-octavia
     description: |
-        Kuryr-Kubernetes tempest job using octavia and CNI daemon
-    vars:
-      devstack_services:
-        kuryr-daemon: true
-
-- job:
-    name: kuryr-kubernetes-tempest-daemon-octavia-py36
-    parent: kuryr-kubernetes-tempest-daemon-octavia
-    description: |
-      Tempest with Octavia, CNI daemon with DevStack running on Python 3.6
+      Tempest with Octavia with DevStack running on Python 3.6
     vars:
       devstack_localrc:
         USE_PYTHON3: true
 
 - job:
-    name: kuryr-kubernetes-tempest-daemon-containerized-octavia
-    parent: kuryr-kubernetes-tempest-daemon-octavia
+    name: kuryr-kubernetes-tempest-containerized-octavia
+    parent: kuryr-kubernetes-tempest-octavia
     description: |
-        Kuryr-Kubernetes tempest job using octavia, kuryr containerized and CNI daemon
+        Kuryr-Kubernetes tempest job using octavia, kuryr containerized
     vars:
       devstack_localrc:
         KURYR_K8S_CONTAINERIZED_DEPLOYMENT: true
     voting: false
 
 - job:
-    name: kuryr-kubernetes-tempest-daemon-containerized-octavia-l2
-    parent: kuryr-kubernetes-tempest-daemon-containerized-octavia
+    name: kuryr-kubernetes-tempest-containerized-octavia-l2
+    parent: kuryr-kubernetes-tempest-containerized-octavia
     description: |
-        Kuryr-Kubernetes tempest job using octavia in l2 mode, kuryr containerized and CNI daemon
+        Kuryr-Kubernetes tempest job using octavia in l2 mode, kuryr containerized
     vars:
       devstack_localrc:
         KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
@@ -97,6 +87,9 @@
     vars:
       devstack_localrc:
         DOCKER_CGROUP_DRIVER: "systemd"
+        KURYR_SUBNET_DRIVER: namespace
+        KURYR_SG_DRIVER: namespace
+        KURYR_ENABLED_HANDLERS: vif,lb,lbaasspec,namespace
       devstack_services:
         kubernetes-api: false
         kubernetes-controller-manager: false
@@ -106,26 +99,13 @@
         openshift-node: true
         openshift-dnsmasq: true
         openshift-dns: true
-
-- job:
-    name: kuryr-kubernetes-tempest-daemon-openshift-octavia
-    parent: kuryr-kubernetes-tempest-openshift-octavia
-    description: |
-      Kuryr-Kubernetes tempest job using octavia, CNI daemon and OpenShift
-    vars:
-      devstack_services:
-        kuryr-daemon: true
-      devstack_localrc:
-        KURYR_SUBNET_DRIVER: namespace
-        KURYR_SG_DRIVER: namespace
-        KURYR_ENABLED_HANDLERS: vif,lb,lbaasspec,namespace
     voting: false
 
 - job:
-    name: kuryr-kubernetes-tempest-daemon-containerized-octavia-pools-namespace
+    name: kuryr-kubernetes-tempest-containerized-octavia-pools-namespace
     description: |
       Tempest with Octavia, CNI daemon, containers, port pools and namespace subnet driver
-    parent: kuryr-kubernetes-tempest-daemon-containerized-octavia
+    parent: kuryr-kubernetes-tempest-containerized-octavia
     vars:
       devstack_localrc:
         KURYR_SUBNET_DRIVER: namespace
@@ -136,10 +116,10 @@
         KURYR_VIF_POOL_DRIVER: neutron
 
 - job:
-    name: kuryr-kubernetes-tempest-daemon-containerized-octavia-network-policy
+    name: kuryr-kubernetes-tempest-containerized-octavia-network-policy
     description: |
       Tempest with Octavia, CNI daemon, containers and network policy driver
-    parent: kuryr-kubernetes-tempest-daemon-containerized-octavia
+    parent: kuryr-kubernetes-tempest-containerized-octavia
     vars:
       tempest_test_regex: '^(kuryr_tempest_plugin.tests.scenario.test_network_policy.TestNetworkPolicyScenario)'
       devstack_localrc:
@@ -149,38 +129,37 @@
     voting: false
 
 - job:
-    name: kuryr-kubernetes-tempest-daemon-containerized-octavia-py36
+    name: kuryr-kubernetes-tempest-containerized-octavia-py36
     description: |
-      Tempest with Octavia, CNI daemon, containers with Kuryr running on
-      Python3.6 containers
-    parent: kuryr-kubernetes-tempest-daemon-containerized-octavia
+      Tempest with Octavia and Kuryr running on Python3.6 containers
+    parent: kuryr-kubernetes-tempest-containerized-octavia
     vars:
       devstack_localrc:
         KURYR_CONTAINERS_USE_PY3: True
         USE_PYTHON3: true
     voting: true
 
 - job:
-    name: kuryr-kubernetes-tempest-daemon-containerized-openshift-octavia
-    description: Tempest with Octavia, CNI daemon enabled, containers and OpenShift
-    parent: kuryr-kubernetes-tempest-daemon-openshift-octavia
+    name: kuryr-kubernetes-tempest-containerized-openshift-octavia
+    description: Tempest with Octavia, containers and OpenShift
+    parent: kuryr-kubernetes-tempest-openshift-octavia
     vars:
       devstack_localrc:
         KURYR_K8S_CONTAINERIZED_DEPLOYMENT: true
 
 - job:
-    name: kuryr-kubernetes-tempest-daemon-containerized-openshift-octavia-serial
-    description: Tempest with Octavia running in serial, CNI daemon enabled, containers and OpenShift
-    parent: kuryr-kubernetes-tempest-daemon-containerized-openshift-octavia
+    name: kuryr-kubernetes-tempest-containerized-openshift-octavia-serial
+    description: Tempest with Octavia running in serial, containers and OpenShift
+    parent: kuryr-kubernetes-tempest-containerized-openshift-octavia
     vars:
       devstack_localrc:
         KURYR_K8S_SERIAL_TESTS: True
       tempest_concurrency: 1
 
 
 - job:
-   name: kuryr-kubernetes-tempest-daemon-openshift-octavia-ingress
-   parent: kuryr-kubernetes-tempest-daemon-openshift-octavia
+   name: kuryr-kubernetes-tempest-openshift-octavia-ingress
+   parent: kuryr-kubernetes-tempest-openshift-octavia
    description: |
      Kuryr-Kubernetes tempest job using octavia, ingress controller and OpenShift
    vars:
@@ -190,8 +169,8 @@
    voting: false
 
 - job:
-    name: kuryr-kubernetes-tempest-daemon-containerized-octavia-crio
-    parent: kuryr-kubernetes-tempest-daemon-containerized-octavia
+    name: kuryr-kubernetes-tempest-containerized-octavia-crio
+    parent: kuryr-kubernetes-tempest-containerized-octavia
     nodeset: openstack-single-node-bionic
     vars:
       devstack_localrc:

.zuul.d/project.yaml

@@ -17,33 +17,31 @@
     check:
       jobs:
         - kuryr-kubernetes-tempest-octavia
-        - kuryr-kubernetes-tempest-daemon-octavia
-        - kuryr-kubernetes-tempest-daemon-openshift-octavia
-        - kuryr-kubernetes-tempest-daemon-containerized-octavia
-        - kuryr-kubernetes-tempest-daemon-containerized-ovn
-        - kuryr-kubernetes-tempest-daemon-octavia-py36
-        - kuryr-kubernetes-tempest-daemon-containerized-octavia-py36
-        - kuryr-kubernetes-tempest-multinode-daemon-octavia-containerized
+        - kuryr-kubernetes-tempest-openshift-octavia
+        - kuryr-kubernetes-tempest-containerized-octavia
+        - kuryr-kubernetes-tempest-containerized-ovn
+        - kuryr-kubernetes-tempest-octavia-py36
+        - kuryr-kubernetes-tempest-containerized-octavia-py36
+        - kuryr-kubernetes-tempest-multinode-octavia-containerized
         - kuryr-kubernetes-tempest-octavia-centos-7
     gate:
       jobs:
         - kuryr-kubernetes-tempest-octavia
-        - kuryr-kubernetes-tempest-daemon-octavia
-        - kuryr-kubernetes-tempest-daemon-octavia-py36
-        - kuryr-kubernetes-tempest-daemon-containerized-octavia-py36
+        - kuryr-kubernetes-tempest-octavia-py36
+        - kuryr-kubernetes-tempest-containerized-octavia-py36
     experimental:
       jobs:
         - kuryr-kubernetes-tempest-dragonflow
-        - kuryr-kubernetes-tempest-daemon-containerized-openshift-octavia
-        - kuryr-kubernetes-tempest-daemon-containerized-octavia-l2
-        - kuryr-kubernetes-tempest-daemon-containerized-octavia-pools-namespace
-        - kuryr-kubernetes-tempest-daemon-containerized-octavia-network-policy
-        - kuryr-kubernetes-tempest-daemon-containerized-openshift-octavia-serial
-        - kuryr-kubernetes-tempest-daemon-ovn
-        - kuryr-kubernetes-tempest-daemon-openshift-octavia-ingress
-        - kuryr-kubernetes-tempest-daemon-openshift-octavia-multi-vif
-        - kuryr-kubernetes-tempest-multinode-daemon-octavia-ha
-        - kuryr-kubernetes-tempest-daemon-containerized-octavia-crio
+        - kuryr-kubernetes-tempest-containerized-openshift-octavia
+        - kuryr-kubernetes-tempest-containerized-octavia-l2
+        - kuryr-kubernetes-tempest-containerized-octavia-pools-namespace
+        - kuryr-kubernetes-tempest-containerized-octavia-network-policy
+        - kuryr-kubernetes-tempest-containerized-openshift-octavia-serial
+        - kuryr-kubernetes-tempest-ovn
+        - kuryr-kubernetes-tempest-openshift-octavia-ingress
+        - kuryr-kubernetes-tempest-openshift-octavia-multi-vif
+        - kuryr-kubernetes-tempest-multinode-octavia-ha
+        - kuryr-kubernetes-tempest-containerized-octavia-crio
 
 - project:
     templates:

.zuul.d/sdn.yaml

@@ -41,23 +41,13 @@
         q-dhcp: false
         q-meta: false
         q-trunk: true
-        kuryr-daemon: true
     voting: false
 
 - job:
-    name: kuryr-kubernetes-tempest-daemon-ovn
+    name: kuryr-kubernetes-tempest-containerized-ovn
     parent: kuryr-kubernetes-tempest-ovn
     description: |
-        Kuryr-Kubernetes tempest job using OVN, CNI daemon
-    vars:
-      devstack_services:
-        kuryr-daemon: true
-
-- job:
-    name: kuryr-kubernetes-tempest-daemon-containerized-ovn
-    parent: kuryr-kubernetes-tempest-daemon-ovn
-    description: |
-        Kuryr-Kubernetes tempest job using OVN, CNI daemon and Containerized
+        Kuryr-Kubernetes tempest job using OVN and Containerized
     vars:
       devstack_localrc:
         KURYR_K8S_CONTAINERIZED_DEPLOYMENT: true

cni_ds_init

@@ -61,9 +61,4 @@ EOF
 cleanup
 deploy
 
-# Start CNI daemon if required
-if [ "$CNI_DAEMON" == "True" ]; then
-    exec kuryr-daemon --config-file /etc/kuryr/kuryr.conf
-else
-    exec sleep infinity
-fi
+exec kuryr-daemon --config-file /etc/kuryr/kuryr.conf

devstack/lib/kuryr_kubernetes

@@ -583,9 +583,8 @@ EOF
 function generate_cni_daemon_set() {
     output_dir=$1
     cni_health_server_port=$2
-    cni_daemon=${3:-False}
-    cni_bin_dir=${4:-/opt/cni/bin}
-    cni_conf_dir=${5:-/etc/cni/net.d}
+    cni_bin_dir=${3:-/opt/cni/bin}
+    cni_conf_dir=${4:-/etc/cni/net.d}
     mkdir -p "$output_dir"
     rm -f ${output_dir}/cni_ds.yml
     cat >> "${output_dir}/cni_ds.yml" << EOF
@@ -624,8 +623,6 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-        - name: CNI_DAEMON
-          value: "${cni_daemon}"
         securityContext:
           privileged: true
         volumeMounts:
@@ -645,8 +642,7 @@ EOF
           mountPath: /var/run
 EOF
     fi
-    if [ "$cni_daemon" == "True" ]; then
-        cat >> "${output_dir}/cni_ds.yml" << EOF
+    cat >> "${output_dir}/cni_ds.yml" << EOF
         readinessProbe:
           httpGet:
             path: /ready
@@ -659,9 +655,6 @@ EOF
             path: /alive
             port: ${cni_health_server_port}
           initialDelaySeconds: 60
-EOF
-    fi
-    cat >> "${output_dir}/cni_ds.yml" << EOF
       volumes:
         - name: bin
           hostPath:

devstack/plugin.sh

@@ -99,8 +99,6 @@ function configure_kuryr {
             iniset "$KURYR_CONFIG" cni_health_server cg_path \
                 "/system.slice/system-devstack.slice/devstack@kuryr-daemon.service"
         fi
-    else
-        iniset "$KURYR_CONFIG" cni_daemon daemon_enabled False
     fi
 
     create_kuryr_cache_dir
@@ -131,8 +129,6 @@ function configure_kuryr {
 }
 
 function generate_containerized_kuryr_resources {
-    local cni_daemon
-    cni_daemon=$1
     if [[ $KURYR_CONTROLLER_REPLICAS -eq 1 ]]; then
         KURYR_CONTROLLER_HA="False"
     else
@@ -892,9 +888,6 @@ function update_tempest_conf_file {
     if [[ "$KURYR_ENABLED_HANDLERS" =~ .*policy.* ]]; then
         iniset $TEMPEST_CONFIG kuryr_kubernetes network_policy_enabled True
     fi
-    if ! is_service_enabled kuryr-daemon; then
-        iniset $TEMPEST_CONFIG kuryr_kubernetes kuryr_daemon_enabled False
-    fi
     # NOTE(yboaron): Services with protocol UDP are supported in Kuryr
     # starting from Stein release
     iniset $TEMPEST_CONFIG kuryr_kubernetes test_udp_services True
@@ -1038,23 +1031,15 @@ if [[ "$1" == "stack" && "$2" == "extra" ]]; then
     KURYR_FORCE_IMAGE_BUILD=$(trueorfalse False KURYR_FORCE_IMAGE_BUILD)
     if is_service_enabled kuryr-kubernetes || [[ ${KURYR_FORCE_IMAGE_BUILD} == "True" ]]; then
         if [ "$KURYR_K8S_CONTAINERIZED_DEPLOYMENT" == "True" ]; then
-            if is_service_enabled kuryr-daemon; then
-                build_kuryr_containers True
-            else
-                build_kuryr_containers False
-            fi
+            build_kuryr_containers
         fi
     fi
 
     if is_service_enabled kuryr-kubernetes; then
         /usr/local/bin/kubectl apply -f ${KURYR_HOME}/kubernetes_crds/kuryrnet.yaml
         /usr/local/bin/kubectl apply -f ${KURYR_HOME}/kubernetes_crds/kuryrnetpolicy.yaml
         if [ "$KURYR_K8S_CONTAINERIZED_DEPLOYMENT" == "True" ]; then
-            if is_service_enabled kuryr-daemon; then
-                generate_containerized_kuryr_resources True
-            else
-                generate_containerized_kuryr_resources False
-            fi
+            generate_containerized_kuryr_resources
         fi
         if [ "$KURYR_MULTI_VIF_DRIVER" == "npwg_multiple_interfaces" ]; then
             /usr/local/bin/kubectl apply -f ${KURYR_HOME}/kubernetes_crds/network_attachment_definition_crd.yaml