From 59efd2bf7f331ec456d9b914cc71b33abad15e6e Mon Sep 17 00:00:00 2001 From: Stephen Taylor Date: Thu, 8 Aug 2024 13:31:21 -0600 Subject: [PATCH] Remove the CephFS and RBD provisioner images Neither the CephFS nor the RBD provisioner has been used in some time. This change removes both images from the build process. Change-Id: Ie3f837847afdcd91bd5d6ba5c31d3f5022b8190d --- .../Dockerfile.ubuntu_bionic | 32 ---------- .../Dockerfile.ubuntu_focal | 31 ---------- .../Dockerfile.ubuntu_jammy | 31 ---------- ceph-cephfs-provisioner/build.sh | 14 ----- ceph-daemon/Dockerfile.ubuntu_jammy | 4 +- ceph-rbd-provisioner/Dockerfile.ubuntu_bionic | 32 ---------- ceph-rbd-provisioner/Dockerfile.ubuntu_focal | 31 ---------- ceph-rbd-provisioner/Dockerfile.ubuntu_jammy | 30 ---------- ceph-rbd-provisioner/build.sh | 14 ----- zuul.d/ceph.yaml | 58 ------------------- 10 files changed, 3 insertions(+), 274 deletions(-) delete mode 100644 ceph-cephfs-provisioner/Dockerfile.ubuntu_bionic delete mode 100644 ceph-cephfs-provisioner/Dockerfile.ubuntu_focal delete mode 100644 ceph-cephfs-provisioner/Dockerfile.ubuntu_jammy delete mode 100755 ceph-cephfs-provisioner/build.sh delete mode 100644 ceph-rbd-provisioner/Dockerfile.ubuntu_bionic delete mode 100644 ceph-rbd-provisioner/Dockerfile.ubuntu_focal delete mode 100644 ceph-rbd-provisioner/Dockerfile.ubuntu_jammy delete mode 100755 ceph-rbd-provisioner/build.sh diff --git a/ceph-cephfs-provisioner/Dockerfile.ubuntu_bionic b/ceph-cephfs-provisioner/Dockerfile.ubuntu_bionic deleted file mode 100644 index cba53696..00000000 --- a/ceph-cephfs-provisioner/Dockerfile.ubuntu_bionic +++ /dev/null @@ -1,32 +0,0 @@ -ARG baseimg=docker.io/ubuntu:bionic -FROM ${baseimg} - -# Pacific 16.2.10 -ARG CEPH_RELEASE=pacific -ARG CEPH_RELEASE_TAG=16.2.10-1bionic -ARG CEPH_REPO=https://mirror.mirantis.com/acicd/ceph-pacific/ -ARG CEPH_KEY=https://mirror.mirantis.com/acicd/ceph-pacific/release.asc - -ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key -RUN set -ex ;\ - export DEBIAN_FRONTEND=noninteractive ;\ - apt-get update ;\ - apt-get install --no-install-recommends -y \ - apt-transport-https \ - ca-certificates \ - gnupg2 ;\ - apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\ - rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\ - echo "deb ${CEPH_REPO} bionic main" | tee /etc/apt/sources.list.d/ceph.list ;\ - apt-get update ;\ - apt-get dist-upgrade -y ;\ - apt-get install --no-install-recommends -y \ - ceph=${CEPH_RELEASE_TAG} \ - ceph-common=${CEPH_RELEASE_TAG} ;\ - rm -rf /var/lib/apt/lists/* ;\ - rm -rf /usr/share/doc/ ;\ - rm -rf /usr/share/man/ ;\ - rm -rf /usr/share/locale/ - -COPY --from=quay.io/external_storage/cephfs-provisioner:v2.1.0-k8s1.11 /usr/local/bin/cephfs* /usr/local/bin/ -RUN chmod -v o+x /usr/local/bin/cephfs_provisioner diff --git a/ceph-cephfs-provisioner/Dockerfile.ubuntu_focal b/ceph-cephfs-provisioner/Dockerfile.ubuntu_focal deleted file mode 100644 index 3f4232dc..00000000 --- a/ceph-cephfs-provisioner/Dockerfile.ubuntu_focal +++ /dev/null @@ -1,31 +0,0 @@ -ARG baseimg=docker.io/ubuntu:focal -FROM ${baseimg} - -ARG CEPH_RELEASE -ARG CEPH_RELEASE_TAG -ARG CEPH_REPO -ARG CEPH_KEY - -ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key -RUN set -ex ;\ - export DEBIAN_FRONTEND=noninteractive ;\ - apt-get update ;\ - apt-get install --no-install-recommends -y \ - apt-transport-https \ - ca-certificates \ - gnupg2 ;\ - apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\ - rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\ - echo "deb ${CEPH_REPO} focal main" | tee /etc/apt/sources.list.d/ceph.list ;\ - apt-get update ;\ - apt-get dist-upgrade -y ;\ - apt-get install --no-install-recommends -y \ - ceph=${CEPH_RELEASE_TAG} \ - ceph-common=${CEPH_RELEASE_TAG} ;\ - rm -rf /var/lib/apt/lists/* ;\ - rm -rf /usr/share/doc/ ;\ - rm -rf /usr/share/man/ ;\ - rm -rf /usr/share/locale/ - -COPY --from=quay.io/external_storage/cephfs-provisioner:v2.1.0-k8s1.11 /usr/local/bin/cephfs* /usr/local/bin/ -RUN chmod -v o+x /usr/local/bin/cephfs_provisioner diff --git a/ceph-cephfs-provisioner/Dockerfile.ubuntu_jammy b/ceph-cephfs-provisioner/Dockerfile.ubuntu_jammy deleted file mode 100644 index e3cd6870..00000000 --- a/ceph-cephfs-provisioner/Dockerfile.ubuntu_jammy +++ /dev/null @@ -1,31 +0,0 @@ -ARG baseimg=docker.io/ubuntu:jammy -FROM ${baseimg} - -ARG CEPH_RELEASE -ARG CEPH_RELEASE_TAG -ARG CEPH_REPO -ARG CEPH_KEY - -ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key -RUN set -ex ;\ - export DEBIAN_FRONTEND=noninteractive ;\ - apt-get update ;\ - apt-get install --no-install-recommends -y \ - apt-transport-https \ - ca-certificates \ - gnupg2 ;\ - apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\ - rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\ - echo "deb ${CEPH_REPO} jammy main" | tee /etc/apt/sources.list.d/ceph.list ;\ - apt-get update ;\ - apt-get dist-upgrade -y ;\ - apt-get install --no-install-recommends -y \ - ceph=${CEPH_RELEASE_TAG} \ - ceph-common=${CEPH_RELEASE_TAG} ;\ - rm -rf /var/lib/apt/lists/* ;\ - rm -rf /usr/share/doc/ ;\ - rm -rf /usr/share/man/ ;\ - rm -rf /usr/share/locale/ - -COPY --from=quay.io/external_storage/cephfs-provisioner:v2.1.0-k8s1.11 /usr/local/bin/cephfs* /usr/local/bin/ -RUN chmod -v o+x /usr/local/bin/cephfs_provisioner diff --git a/ceph-cephfs-provisioner/build.sh b/ceph-cephfs-provisioner/build.sh deleted file mode 100755 index faa187a3..00000000 --- a/ceph-cephfs-provisioner/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -SCRIPT=`realpath $0` -SCRIPT_DIR=`dirname ${SCRIPT}` -## Only build from main folder -cd ${SCRIPT_DIR}/.. - -IMAGE="ceph-cephfs-provisioner" -VERSION=${VERSION:-latest} -DISTRO=${DISTRO:-ubuntu_jammy} -REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"} -EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""} -docker build -f ${IMAGE}/Dockerfile.${DISTRO} --network=host -t ${REGISTRY_URI}${IMAGE}:${VERSION}-${DISTRO}${EXTRA_TAG_INFO} ${extra_build_args} ${IMAGE} - -cd - diff --git a/ceph-daemon/Dockerfile.ubuntu_jammy b/ceph-daemon/Dockerfile.ubuntu_jammy index 82357985..8b04d3c3 100644 --- a/ceph-daemon/Dockerfile.ubuntu_jammy +++ b/ceph-daemon/Dockerfile.ubuntu_jammy @@ -50,7 +50,9 @@ RUN set -ex ;\ alien \ lvm2 ;\ curl -sSL https://bootstrap.pypa.io/pip/3.6/get-pip.py | python3 ;\ - pip3 --no-cache-dir install --upgrade --ignore-installed PyYAML ;\ + pip3 --no-cache-dir install --upgrade --ignore-installed \ + PyYAML \ + setuptools==70.3.0 && \ pip3 --no-cache-dir install --upgrade --ignore-installed \ six \ openssl-python \ diff --git a/ceph-rbd-provisioner/Dockerfile.ubuntu_bionic b/ceph-rbd-provisioner/Dockerfile.ubuntu_bionic deleted file mode 100644 index 9030d3b7..00000000 --- a/ceph-rbd-provisioner/Dockerfile.ubuntu_bionic +++ /dev/null @@ -1,32 +0,0 @@ -ARG baseimg=docker.io/ubuntu:bionic -FROM ${baseimg} - -# Pacific 16.2.10 -ARG CEPH_RELEASE=pacific -ARG CEPH_RELEASE_TAG=16.2.10-1bionic - -ARG CEPH_REPO=https://mirror.mirantis.com/acicd/ceph-pacific/ -ARG CEPH_KEY=https://mirror.mirantis.com/acicd/ceph-pacific/release.asc - -ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key -RUN set -ex ;\ - export DEBIAN_FRONTEND=noninteractive ;\ - apt-get update ;\ - apt-get install --no-install-recommends -y \ - apt-transport-https \ - ca-certificates \ - gnupg2 ;\ - apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\ - rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\ - echo "deb ${CEPH_REPO} bionic main" | tee /etc/apt/sources.list.d/ceph.list ;\ - apt-get update ;\ - apt-get dist-upgrade -y ;\ - apt-get install --no-install-recommends -y \ - ceph-common=${CEPH_RELEASE_TAG} ;\ - rm -rf /var/lib/apt/lists/* ;\ - rm -rf /usr/share/doc/ ;\ - rm -rf /usr/share/man/ ;\ - rm -rf /usr/share/locale/ - -COPY --from=quay.io/external_storage/rbd-provisioner:v2.1.1-k8s1.11 /usr/local/bin/rbd-provisioner /usr/local/bin/rbd-provisioner -ENTRYPOINT ["/usr/local/bin/rbd-provisioner"] diff --git a/ceph-rbd-provisioner/Dockerfile.ubuntu_focal b/ceph-rbd-provisioner/Dockerfile.ubuntu_focal deleted file mode 100644 index e6faf028..00000000 --- a/ceph-rbd-provisioner/Dockerfile.ubuntu_focal +++ /dev/null @@ -1,31 +0,0 @@ -ARG baseimg=docker.io/ubuntu:focal -FROM ${baseimg} - -ARG CEPH_RELEASE -ARG CEPH_RELEASE_TAG - -ARG CEPH_REPO -ARG CEPH_KEY - -ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key -RUN set -ex ;\ - export DEBIAN_FRONTEND=noninteractive ;\ - apt-get update ;\ - apt-get install --no-install-recommends -y \ - apt-transport-https \ - ca-certificates \ - gnupg2 ;\ - apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\ - rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\ - echo "deb ${CEPH_REPO} focal main" | tee /etc/apt/sources.list.d/ceph.list ;\ - apt-get update ;\ - apt-get dist-upgrade -y ;\ - apt-get install --no-install-recommends -y \ - ceph-common=${CEPH_RELEASE_TAG} ;\ - rm -rf /var/lib/apt/lists/* ;\ - rm -rf /usr/share/doc/ ;\ - rm -rf /usr/share/man/ ;\ - rm -rf /usr/share/locale/ - -COPY --from=quay.io/external_storage/rbd-provisioner:v2.1.1-k8s1.11 /usr/local/bin/rbd-provisioner /usr/local/bin/rbd-provisioner -ENTRYPOINT ["/usr/local/bin/rbd-provisioner"] diff --git a/ceph-rbd-provisioner/Dockerfile.ubuntu_jammy b/ceph-rbd-provisioner/Dockerfile.ubuntu_jammy deleted file mode 100644 index b84198a6..00000000 --- a/ceph-rbd-provisioner/Dockerfile.ubuntu_jammy +++ /dev/null @@ -1,30 +0,0 @@ -ARG baseimg=docker.io/ubuntu:jammy -FROM ${baseimg} - -ARG CEPH_RELEASE -ARG CEPH_RELEASE_TAG -ARG CEPH_REPO -ARG CEPH_KEY - -ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key -RUN set -ex ;\ - export DEBIAN_FRONTEND=noninteractive ;\ - apt-get update ;\ - apt-get install --no-install-recommends -y \ - apt-transport-https \ - ca-certificates \ - gnupg2 ;\ - apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\ - rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\ - echo "deb ${CEPH_REPO} jammy main" | tee /etc/apt/sources.list.d/ceph.list ;\ - apt-get update ;\ - apt-get dist-upgrade -y ;\ - apt-get install --no-install-recommends -y \ - ceph-common=${CEPH_RELEASE_TAG} ;\ - rm -rf /var/lib/apt/lists/* ;\ - rm -rf /usr/share/doc/ ;\ - rm -rf /usr/share/man/ ;\ - rm -rf /usr/share/locale/ - -COPY --from=quay.io/external_storage/rbd-provisioner:v2.1.1-k8s1.11 /usr/local/bin/rbd-provisioner /usr/local/bin/rbd-provisioner -ENTRYPOINT ["/usr/local/bin/rbd-provisioner"] diff --git a/ceph-rbd-provisioner/build.sh b/ceph-rbd-provisioner/build.sh deleted file mode 100755 index c8efde08..00000000 --- a/ceph-rbd-provisioner/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -SCRIPT=`realpath $0` -SCRIPT_DIR=`dirname ${SCRIPT}` -## Only build from main folder -cd ${SCRIPT_DIR}/.. - -IMAGE="ceph-rbd-provisioner" -VERSION=${VERSION:-latest} -DISTRO=${DISTRO:-ubuntu_jammy} -REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"} -EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""} -docker build -f ${IMAGE}/Dockerfile.${DISTRO} --network=host -t ${REGISTRY_URI}${IMAGE}:${VERSION}-${DISTRO}${EXTRA_TAG_INFO} ${extra_build_args} ${IMAGE} - -cd - diff --git a/zuul.d/ceph.yaml b/zuul.d/ceph.yaml index 3d75257d..9d3f16d4 100644 --- a/zuul.d/ceph.yaml +++ b/zuul.d/ceph.yaml @@ -16,31 +16,23 @@ - project: check: jobs: - - openstack-helm-images-build-ceph-cephfs-provisioner - openstack-helm-images-build-ceph-config-helper - openstack-helm-images-build-ceph-daemon - - openstack-helm-images-build-ceph-rbd-provisioner - openstack-helm-images-build-ceph-utility gate: jobs: - - openstack-helm-images-upload-ceph-cephfs-provisioner - openstack-helm-images-upload-ceph-config-helper - openstack-helm-images-upload-ceph-daemon - - openstack-helm-images-upload-ceph-rbd-provisioner - openstack-helm-images-upload-ceph-utility promote: jobs: - - openstack-helm-images-promote-ceph-cephfs-provisioner - openstack-helm-images-promote-ceph-config-helper - openstack-helm-images-promote-ceph-daemon - - openstack-helm-images-promote-ceph-rbd-provisioner - openstack-helm-images-promote-ceph-utility periodic-weekly: jobs: - - openstack-helm-images-build-ceph-cephfs-provisioner - openstack-helm-images-build-ceph-config-helper - openstack-helm-images-build-ceph-daemon - - openstack-helm-images-build-ceph-rbd-provisioner - openstack-helm-images-build-ceph-utility - job: @@ -64,31 +56,6 @@ - ceph.* - zuul.d/ceph.* -- job: - name: openstack-helm-images-build-ceph-cephfs-provisioner - parent: openstack-helm-images-build-ceph-common - description: Build ceph-cephfs-provisioner images - vars: &ceph-cephfs-provisioner_vars - currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" - docker_images: - - <<: *ceph_image - context: ceph-cephfs-provisioner - repository: openstackhelm/ceph-cephfs-provisioner - -- job: - name: openstack-helm-images-upload-ceph-cephfs-provisioner - parent: openstack-helm-images-upload - description: Build and upload ceph-cephfs-provisioner images - vars: *ceph-cephfs-provisioner_vars - files: *ceph_files - -- job: - name: openstack-helm-images-promote-ceph-cephfs-provisioner - parent: openstack-helm-images-promote - description: Promote a previously published ceph-cephfs-provisioner image to latest. - vars: *ceph-cephfs-provisioner_vars - files: *ceph_files - - job: name: openstack-helm-images-build-ceph-config-helper parent: openstack-helm-images-build-ceph-common @@ -139,31 +106,6 @@ vars: *ceph-daemon_vars files: *ceph_files -- job: - name: openstack-helm-images-build-ceph-rbd-provisioner - parent: openstack-helm-images-build-ceph-common - description: Build ceph-rbd-provisioner images - vars: &ceph-rbd-provisioner_vars - currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" - docker_images: - - <<: *ceph_image - context: ceph-rbd-provisioner - repository: openstackhelm/ceph-rbd-provisioner - -- job: - name: openstack-helm-images-upload-ceph-rbd-provisioner - parent: openstack-helm-images-upload - description: Build and upload ceph-rbd-provisioner images - vars: *ceph-rbd-provisioner_vars - files: *ceph_files - -- job: - name: openstack-helm-images-promote-ceph-rbd-provisioner - parent: openstack-helm-images-promote - description: Promote a previously published ceph-rbd-provisioner image to latest. - vars: *ceph-rbd-provisioner_vars - files: *ceph_files - - job: name: openstack-helm-images-build-ceph-utility parent: openstack-helm-images-build-ceph-common