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) (cherry picked from commit 70f7bba359) (cherry picked from commit db4b92fce4)
Update .gitreview for unmaintained/yoga
2024-06-17 15:10:02 +02:00 · 2024-02-28 06:41:05 +00:00 · 2023-06-12 02:29:59 +00:00 · 2022-03-22 04:41:34 +00:00 · 2022-03-11 14:35:04 +00:00
5 changed files with 13 additions and 3 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/devstack-plugin-container.git
+defaultbranch=unmaintained/yoga
--- a/.zuul.yaml
+++ b/.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:
--- a/devstack/lib/docker
+++ b/devstack/lib/docker
@@ -73,7 +73,11 @@ function install_docker {
            ${dist_version} \
            stable"
        REPOS_UPDATED=False apt_get_update
-        apt_get install docker-ce
+        if [ -n "${UBUNTU_DOCKER_VERSION}" ]; then
+            apt_get install docker-ce=$UBUNTU_DOCKER_VERSION
+        else
+            apt_get install docker-ce
+        fi
    elif is_fedora; then
        if [[ "$lsb_dist" = "centos" ]]; then
            sudo yum-config-manager \
--- a/devstack/lib/k8s
+++ b/devstack/lib/k8s
@@ -63,6 +63,7 @@ function kubeadm_init {
    cat <<EOF | tee $kubeadm_config_file >/dev/null
 apiVersion: kubeadm.k8s.io/v1beta1
 kind: ClusterConfiguration
+imageRepository: "${KUBEADMIN_IMAGE_REPOSITORY}"
 etcd:
  external:
    endpoints:
@@ -84,6 +85,7 @@ apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
 failSwapOn: false
 EOF
+    sudo kubeadm config images pull --image-repository=${KUBEADMIN_IMAGE_REPOSITORY}
    sudo kubeadm init --config $kubeadm_config_file --ignore-preflight-errors Swap

    local kube_config_file=$HOME/.kube/config
--- a/devstack/settings
+++ b/devstack/settings
@@ -14,6 +14,8 @@ CRIO_ALLOW_ICMP=${CRIO_ALLOW_ICMP:-true}
 CNI_CONF_DIR=${CNI_CONF_DIR:-}
 CNI_PLUGIN_DIR=${CNI_PLUGIN_DIR:-}

+UBUNTU_DOCKER_VERSION=${UBUNTU_DOCKER_VERSION:-}
+
 # Enable container services
 enable_service container

@@ -24,3 +26,6 @@ if [[ ,${ENABLED_SERVICES} =~ ,"k8s-master" ]]; then
    enable_service kube-scheduler
    enable_service kube-proxy
 fi
+
+# Customize kubeadm container images repository
+KUBEADMIN_IMAGE_REPOSITORY=${KUBEADMIN_IMAGE_REPOSITORY:-"k8s.gcr.io"}
Author	SHA1	Message	Date
Dr. Jens Harbott	c1b19c850a	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`) (cherry picked from commit `70f7bba359`) (cherry picked from commit `db4b92fce4`)	2024-06-17 15:10:02 +02:00
OpenStack Release Bot	c5f9f256fe	Update .gitreview for unmaintained/yoga Change-Id: I10785ace81e670839354f2ed0b1bf45b25c6ca57	2024-02-28 06:41:05 +00:00
Hongbin Lu	53e3388873	Support installing specific version of docker Change-Id: I12015c28f6f8ffc125097a14514a6a90a20cf35b (cherry picked from commit `f8e786f0d5`)	2023-06-12 02:29:59 +00:00
yangjianfeng	c377bde924	Support config image repository for kubeadm In some places of which network environment was limited, kubeadm can't pull images from k8s.gcr.io. This patch add a variable `KUBEADMIN_IMAGE_REPOSITORY` in order to the developer who located in these places can set the kubeadm to pull container images from repository that they can access. Change-Id: I14aed50077ef0760635e575770fd2274cb759c53 (cherry picked from commit `90b4089cda`)	2022-03-22 04:41:34 +00:00
OpenStack Release Bot	853ae2b390	Update .gitreview for stable/yoga Change-Id: Ib25bc42db1e404cd4b3328941dea24e4c70f9d80	2022-03-11 14:35:04 +00:00