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) (cherry picked from commit c1b19c850a)
Update .gitreview for unmaintained/xena
2024-06-17 18:06:47 +02:00 · 2024-03-28 10:13:52 +00:00 · 2023-03-13 16:37:36 +01:00 · 2022-03-22 04:41:52 +00:00 · 2021-09-24 14:57:13 +00:00
5 changed files with 7 additions and 2 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/devstack-plugin-container.git
+defaultbranch=unmaintained/xena
--- 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
@@ -59,6 +59,7 @@ function install_docker {
    local arch
    arch=$(dpkg --print-architecture)
    if is_ubuntu; then
+        apt_get install apparmor
        if [[ ${dist_version} == 'trusty' ]]; then
            if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | grep -qE '^ii|^hi' 2>/dev/null; then
                apt_get install linux-image-extra-$(uname -r) linux-image-extra-virtual
--- 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
@@ -21,3 +21,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	ac44a0e105	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`) (cherry picked from commit `c1b19c850a`)	2024-06-17 18:06:47 +02:00
OpenStack Release Bot	27265a8dbe	Update .gitreview for unmaintained/xena Change-Id: I31d60aff0e4d84f5ca6f5bbb4cbd6aca4a3db6b3	2024-03-28 10:13:52 +00:00
Roman Dobosz	e381c0ad1b	Install apparmor tools also for Ubuntu Focal. k8s gate is still on focal, so patch which unblock the apparmor for jammy does not affect it. Here is the fix for focal as well. Change-Id: I2a9bc69a59e7d6d21d61e79115d5a3c726c73ab0 (cherry picked from commit `bdc0b49ce3`)	2023-03-13 16:37:36 +01:00
yangjianfeng	3971293629	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:52 +00:00
OpenStack Release Bot	4c9398b1c9	Update .gitreview for stable/xena Change-Id: I5ee92432b7faef502dad85972731a57a38c407ef	2021-09-24 14:57:13 +00:00