diff --git a/RELEASE.md b/RELEASE.md index 6bb8eb3b3..2cf993beb 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -12,7 +12,7 @@ The Kubespray Project is released on an as-needed basis. The process is as follo 1. (Only for major releases) An approver creates a release branch in the form `release-X.Y` 1. (For major releases) On the `master` branch: bump the version in `galaxy.yml` to the next expected major release (X.y.0 with y = Y + 1), make a Pull Request. 1. (For minor releases) On the `release-X.Y` branch: bump the version in `galaxy.yml` to the next expected minor release (X.Y.z with z = Z + 1), make a Pull Request. -1. The corresponding version of [quay.io/kubespray/kubespray:vX.Y.Z](https://quay.io/repository/kubespray/kubespray) and [quay.io/kubespray/vagrant:vX.Y.Z](https://quay.io/repository/kubespray/vagrant) container images are built and tagged. See the following `Container image creation` section for the details. +1. The corresponding version of the [quay.io/kubespray/kubespray:vX.Y.Z](https://quay.io/repository/kubespray/kubespray) container image is built and tagged. See the following `Container image creation` section for the details. 1. The release issue is closed 1. An announcement email is sent to `dev@kubernetes.io` with the subject `[ANNOUNCE] Kubespray $VERSION is released` 1. The topic of the #kubespray channel is updated with `vX.Y.Z is released! | ...` @@ -76,12 +76,5 @@ nerdctl build -t quay.io/kubespray/kubespray:vX.Y.Z . nerdctl push quay.io/kubespray/kubespray:vX.Y.Z ``` -The container image `quay.io/kubespray/vagrant:vX.Y.Z` can be created from build.sh of test-infra/vagrant-docker/: - -```shell -cd kubespray/test-infra/vagrant-docker/ -./build vX.Y.Z -``` - Please note that the above operation requires the permission to push container images into quay.io/kubespray/. If you don't have the permission, please ask it on the #kubespray-dev channel. diff --git a/docs/developers/ci-setup.md b/docs/developers/ci-setup.md index 4b2c88049..e78fb1169 100644 --- a/docs/developers/ci-setup.md +++ b/docs/developers/ci-setup.md @@ -9,11 +9,11 @@ See [.gitlab-ci.yml](/.gitlab-ci.yml) and the included files for an overview. Kubespray has 2 types of GitLab runners, both deployed on the Kubespray CI cluster (hosted on Oracle Cloud Infrastructure): - pods: use the [gitlab-ci kubernetes executor](https://docs.gitlab.com/runner/executors/kubernetes/) -- vagrant: custom executor running in pods with access to the libvirt socket on the nodes +- vagrant: custom executor running jobs inside KubeVirt VMs ## Vagrant -Vagrant jobs are using the [quay.io/kubespray/vagrant](/test-infra/vagrant-docker/Dockerfile) docker image with `/var/run/libvirt/libvirt-sock` exposed from the host, allowing the container to boot VMs on the host. +Vagrant jobs use the `quay.io/kubespray/vm-kubespray-ci` VM image configured in [.gitlab-ci/vagrant.yml](/.gitlab-ci/vagrant.yml). Vagrant and libvirt run inside the KubeVirt VM to provision the test nodes. ## CI Variables diff --git a/test-infra/vagrant-docker/Dockerfile b/test-infra/vagrant-docker/Dockerfile deleted file mode 100644 index 7a0f0e08d..000000000 --- a/test-infra/vagrant-docker/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -# Docker image published at quay.io/kubespray/vagrant - -ARG KUBESPRAY_VERSION -FROM quay.io/kubespray/kubespray:${KUBESPRAY_VERSION} - -ENV VAGRANT_VERSION=2.3.7 -ENV VAGRANT_DEFAULT_PROVIDER=libvirt -ENV VAGRANT_ANSIBLE_TAGS=facts - -RUN apt-get update && apt-get install -y wget libvirt-dev openssh-client rsync git build-essential - -# Install Vagrant -RUN wget https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}-1_amd64.deb && \ - dpkg -i vagrant_${VAGRANT_VERSION}-1_amd64.deb && \ - rm vagrant_${VAGRANT_VERSION}-1_amd64.deb && \ - vagrant plugin install vagrant-libvirt diff --git a/test-infra/vagrant-docker/README.md b/test-infra/vagrant-docker/README.md deleted file mode 100644 index 36dcb9e96..000000000 --- a/test-infra/vagrant-docker/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# vagrant docker image - -This image is used for the vagrant CI jobs. It is using the libvirt driver. - -## Usage - -```console -$ docker run --net host --rm -it -v /var/run/libvirt/libvirt-sock:/var/run/libvirt/libvirt-sock quay.io/kubespray/vagrant -$ vagrant up -Bringing machine 'k8s-1' up with 'libvirt' provider... -Bringing machine 'k8s-2' up with 'libvirt' provider... -Bringing machine 'k8s-3' up with 'libvirt' provider... -[...] -``` - -## Cache - -You can set `/root/kubespray_cache` as a volume to keep cache between runs. - -## Building - -```shell -./build.sh v2.12.5 -``` diff --git a/test-infra/vagrant-docker/build.sh b/test-infra/vagrant-docker/build.sh deleted file mode 100755 index dcf54456b..000000000 --- a/test-infra/vagrant-docker/build.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -set -euo pipefail - -if [ "$#" -ne 1 ]; then - echo "Usage: $0 tag" >&2 - exit 1 -fi - -VERSION="$1" -IMG="quay.io/kubespray/vagrant:${VERSION}" - -docker build . --build-arg "KUBESPRAY_VERSION=${VERSION}" --tag "$IMG" -docker push "$IMG"