zuul: drop devstack-gate reference

Devstack jobs no longer depend on the devstack-gate project, which has
been retired

Change-Id: Id4721d419b22b6d6498d192e3f313629ad33ef69
(cherry picked from commit 3e2a0ffe4f)

.gitreview

@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/devstack-plugin-container.git
-defaultbranch=stable/zed
+defaultbranch=stable/2023.2

.zuul.yaml

@@ -7,7 +7,6 @@
     timeout: 4200
     required-projects:
       - openstack/devstack
-      - openstack/devstack-gate
       - openstack/devstack-plugin-container
     vars:
       devstack_localrc:
@@ -25,7 +24,6 @@
     timeout: 7200
     required-projects:
       - openstack/devstack
-      - openstack/devstack-gate
       - openstack/devstack-plugin-container
     vars:
       devstack_services:

devstack/lib/crio

@@ -48,9 +48,9 @@ function install_crio {
             software-properties-common
         sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 \
             --recv ${kubic_obs_project_key}
-        sudo apt-add-repository "deb https://download.opensuse.org/"`
+        sudo apt-add-repository -y "deb https://download.opensuse.org/"`
             `"repositories/devel:/kubic:/libcontainers:/stable/${os}/ /"
-        sudo apt-add-repository "deb http://download.opensuse.org/"`
+        sudo apt-add-repository -y "deb http://download.opensuse.org/"`
             `"repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/"`
             `"${CRIO_VERSION}/${os}/ /"
 
@@ -66,6 +66,17 @@ function install_crio {
                 --add-repo \
                 https://cbs.centos.org/repos/paas7-crio-311-candidate/x86_64/os/
         fi
+        if [[ "${os_VENDOR}" == *'Stream' ]]; then
+                    local stream="_Stream"
+        fi
+        # NOTE: All crio versions are not supported for Centos 8 stream
+        # because crio rpm is not present for some minor versions
+        sudo yum-config-manager \
+            --add-repo \
+            "https://download.opensuse.org/repositories/"`
+            `"devel:/kubic:/libcontainers:/stable:/cri-o:/${CRIO_VERSION}/"`
+            `"CentOS_${os_RELEASE}${stream}/"
+
         yum_install cri-o podman buildah
     fi
 }
@@ -85,16 +96,38 @@ function configure_crio {
         iniset -sudo ${CRIO_CONF} crio.runtime log_level \"info\"
     fi
     if is_ubuntu; then
+        local crio_minor=${CRIO_VERSION#*.}
         # At least for 18.04 we need to set up /etc/containers/registries.conf
         # with some initial content. That's another bug with that PPA.
         local registries_conf
         registries_conf="/etc/containers/registries.conf"
-        if [[ ! -f ${registries_conf} ]]; then
+
+        if [[ ! -f ${registries_conf} && $crio_minor -lt 24 ]]; then
             sudo mkdir -p `dirname ${registries_conf}`
             cat << EOF | sudo tee ${registries_conf}
 [registries.search]
 registries = ['docker.io']
 EOF
+        else
+            # If there is a config file, that means, we are probably on the
+            # newer version of crio/container/podman, which basically means
+            # we cannot mix [registries.search] registries filled with
+            # something and unqualified-search-registries setting which appear
+            # on sysregistry v2 config syntax. And because it's a TOML now, we
+            # cannot rely on iniset, but directly change the file.
+
+            local rname='unqualified-search-registries'
+            local rval='["docker.io", "quay.io"]'
+            if [[ ! -f ${registries_conf} ]]; then
+                cat << EOF | sudo tee ${registries_conf}
+unqualified-search-registries = ["docker.io", "quay.io"]
+EOF
+            elif grep -wq "^${rname}" "${registries_conf}"; then
+                sudo sed -i -e \
+                    "s/^${rname}.*$/${rname} = ${rval}/" "${registries_conf}"
+            else
+                sudo sed -i "1s/^/${rname} = ${rval}\n/" "${registries_conf}"
+            fi
         fi
         # CRI-O from kubic repo have placed runc in different place, not even
         # in path, just to not conflict with runc package from official repo.
@@ -113,7 +146,7 @@ EOF
         # By default CRI-O doesn't allow ICMP between containers, although it
         # is ususally expected for testing purposes.
         if [ "${CRIO_ALLOW_ICMP}" == "True" ]; then
-            if grep -q 'default_sysctls =' ${CRIO_CONF}; then
+            if grep -wq '^default_sysctls' ${CRIO_CONF}; then
                 export CRIO_KEY="default_sysctls"
                 export CRIO_VAL='[ "net.ipv4.ping_group_range=0 2147483647", ]'
                 _update_config

devstack/lib/docker

@@ -24,7 +24,8 @@ set +o xtrace
 DOCKER_ENGINE_SOCKET_FILE=${DOCKER_ENGINE_SOCKET_FILE:-/var/run/docker.sock}
 DOCKER_ENGINE_PORT=${DOCKER_ENGINE_PORT:-2375}
 DOCKER_CLUSTER_STORE=${DOCKER_CLUSTER_STORE:-}
-DOCKER_GROUP=${DOCKER_GROUP:-$STACK_USER}
+STACK_GROUP="$( id --group --name "$STACK_USER" )"
+DOCKER_GROUP=${DOCKER_GROUP:-$STACK_GROUP}
 DOCKER_CGROUP_DRIVER=${DOCKER_CGROUP_DRIVER:-}
 # TODO(hongbin): deprecate and remove clear container
 ENABLE_CLEAR_CONTAINER=$(trueorfalse False ENABLE_CLEAR_CONTAINER)
@@ -235,7 +236,7 @@ ExecStart=/usr/bin/dockerd --config-file=$docker_config_file
 Environment="HTTP_PROXY=$http_proxy" "HTTPS_PROXY=$https_proxy" "NO_PROXY=$no_proxy"
 EOF
     sudo systemctl daemon-reload
-    sudo systemctl --no-block restart docker.service
+    sudo systemctl restart docker.service
 }
 
 function configure_containerd {

devstack/lib/k8s

@@ -27,7 +27,7 @@ K8S_NODE_IP=${K8S_NODE_IP:-$HOST_IP}
 K8S_API_SERVER_PORT=${K8S_API_SERVER_PORT:-6443}
 K8S_POD_NETWORK_CIDR=${K8S_POD_NETWORK_CIDR:-10.244.0.0/16}
 K8S_SERVICE_NETWORK_CIDR=${K8S_SERVICE_NETWORK_CIDR:-10.96.0.0/12}
-K8S_VERSION=${K8S_VERSION:-1.19.0-00}
+K8S_VERSION=${K8S_VERSION:-1.23.16-00}
 K8S_NETWORK_ADDON=${K8S_NETWORK_ADDON:-flannel}
 
 # Functions
@@ -60,8 +60,18 @@ function install_kubeadm {
 function kubeadm_init {
     local kubeadm_config_file
     kubeadm_config_file=$(mktemp)
+
+    if [[ ${CONTAINER_ENGINE} == 'crio' ]]; then
+        CGROUP_DRIVER=$(iniget "/etc/crio/crio.conf" crio.runtime cgroup_manager)
+        CRI_SOCKET="unix:///var/run/crio/crio.sock"
+    else
+        # docker is used
+        CGROUP_DRIVER=$(docker info -f '{{.CgroupDriver}}')
+        CRI_SOCKET="/var/run/dockershim.sock"
+    fi
+
     cat <<EOF | tee $kubeadm_config_file >/dev/null
-apiVersion: kubeadm.k8s.io/v1beta1
+apiVersion: kubeadm.k8s.io/v1beta2
 kind: ClusterConfiguration
 imageRepository: "${KUBEADMIN_IMAGE_REPOSITORY}"
 etcd:
@@ -72,7 +82,7 @@ networking:
   podSubnet: "${K8S_POD_NETWORK_CIDR}"
   serviceSubnet: "${K8S_SERVICE_NETWORK_CIDR}"
 ---
-apiVersion: kubeadm.k8s.io/v1beta1
+apiVersion: kubeadm.k8s.io/v1beta2
 bootstrapTokens:
 - token: "${K8S_TOKEN}"
   ttl: 0s
@@ -80,10 +90,19 @@ kind: InitConfiguration
 localAPIEndpoint:
   advertiseAddress: "${K8S_API_SERVER_IP}"
   bindPort: ${K8S_API_SERVER_PORT}
+nodeRegistration:
+  criSocket: "$CRI_SOCKET"
+  kubeletExtraArgs:
+    enable-server: "true"
+  taints:
+    []
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 failSwapOn: false
+address: "0.0.0.0"
+enableServer: true
+cgroupDriver: $CGROUP_DRIVER
 EOF
     sudo kubeadm config images pull --image-repository=${KUBEADMIN_IMAGE_REPOSITORY}
     sudo kubeadm init --config $kubeadm_config_file --ignore-preflight-errors Swap
@@ -94,15 +113,25 @@ EOF
     safe_chown $STACK_USER:$STACK_USER $kube_config_file
 
     if [[ "$K8S_NETWORK_ADDON" == "flannel" ]]; then
-        kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/4ff77dc7c35851913587f7daccf25d754e77aa65/Documentation/kube-flannel.yml
+        kubectl apply -f https://github.com/flannel-io/flannel/releases/latest/download/kube-flannel.yml
     fi
 }
 
 function kubeadm_join {
     local kubeadm_config_file
     kubeadm_config_file=$(mktemp)
+
+    if [[ ${CONTAINER_ENGINE} == 'crio' ]]; then
+        CGROUP_DRIVER=$(iniget "/etc/crio/crio.conf" crio.runtime cgroup_manager)
+        CRI_SOCKET="unix:///var/run/crio/crio.sock"
+    else
+        # docker is used
+        CGROUP_DRIVER=$(docker info -f '{{.CgroupDriver}}')
+        CRI_SOCKET="/var/run/dockershim.sock"
+    fi
+
     cat <<EOF | tee $kubeadm_config_file >/dev/null
-apiVersion: kubeadm.k8s.io/v1beta1
+apiVersion: kubeadm.k8s.io/v1beta2
 kind: JoinConfiguration
 discovery:
   bootstrapToken:
@@ -110,10 +139,19 @@ discovery:
     token: "${K8S_TOKEN}"
     unsafeSkipCAVerification: true
   tlsBootstrapToken: "${K8S_TOKEN}"
+nodeRegistration:
+  criSocket: "$CRI_SOCKET"
+  kubeletExtraArgs:
+    enable-server: "true"
+  taints:
+    []
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 failSwapOn: false
+address: "0.0.0.0"
+enableServer: true
+cgroupDriver: $CGROUP_DRIVER
 EOF
     sudo kubeadm join --config $kubeadm_config_file --ignore-preflight-errors Swap
 }

devstack/settings

@@ -9,7 +9,7 @@ ENABLE_LIVE_RESTORE=${ENABLE_LIVE_RESTORE:-false}
 ENABLE_IPV6=${ENABLE_IPV6:-false}
 K8S_NETWORK_ADDON=${K8S_NETWORK_ADDON:-flannel}
 ENABLE_CONTAINERD_CRI=${ENABLE_CONTAINERD_CRI:-false}
-CRIO_VERSION=${CRIO_VERSION:-"1.18:/1.18.0"}
+CRIO_VERSION=${CRIO_VERSION:-"1.23:/1.23.0"}
 CRIO_ALLOW_ICMP=${CRIO_ALLOW_ICMP:-true}
 CNI_CONF_DIR=${CNI_CONF_DIR:-}
 CNI_PLUGIN_DIR=${CNI_PLUGIN_DIR:-}
@@ -28,8 +28,8 @@ if [[ ,${ENABLED_SERVICES} =~ ,"k8s-master" ]]; then
 fi
 
 # Customize kubeadm container images repository
-KUBEADMIN_IMAGE_REPOSITORY=${KUBEADMIN_IMAGE_REPOSITORY:-"k8s.gcr.io"}
+KUBEADMIN_IMAGE_REPOSITORY=${KUBEADMIN_IMAGE_REPOSITORY:-"registry.k8s.io"}
 
 # Configure crio pause image
-CRIO_PAUSE_IMAGE=${CRIO_PAUSE_IMAGE:-"k8s.gcr.io/pause:3.6"}
+CRIO_PAUSE_IMAGE=${CRIO_PAUSE_IMAGE:-"registry.k8s.io/pause:3.6"}
 CRIO_PAUSE_COMMAND=${CRIO_PAUSE_COMMAND:-"/pause"}