Merge "[images] Upgrade Ceph to Squad v19"

This commit is contained in:
Zuul 2025-02-22 01:28:00 +00:00 committed by Gerrit Code Review
commit 073810ca98
7 changed files with 13 additions and 13 deletions

@ -1,7 +1,7 @@
ARG FROM=quay.io/airshipit/ubuntu:jammy
ARG DOCKER_REGISTRY=quay.io
ARG CALICOCTL_IMAGE_PREFIX=calico/ctl
ARG CALICOCTL_VERSION=v3.28.1
ARG CALICOCTL_VERSION=v3.28.2
ARG CALICOCTL_IMAGE="${DOCKER_REGISTRY}/${CALICOCTL_IMAGE_PREFIX}:${CALICOCTL_VERSION}"
FROM ${CALICOCTL_IMAGE} as stage_calicoctl

@ -1,10 +1,10 @@
ARG FROM=quay.io/airshipit/ubuntu:jammy
ARG DOCKER_REGISTRY=quay.io
ARG CALICOCTL_IMAGE_PREFIX=tigera/calicoctl
ARG CALICOCTL_VERSION=v3.28.1
ARG CALICOCTL_VERSION=v3.28.2
ARG CALICOCTL_IMAGE="${DOCKER_REGISTRY}/${CALICOCTL_IMAGE_PREFIX}:${CALICOCTL_VERSION}"
ARG CALICOQ_IMAGE_PREFIX=tigera/calicoq
ARG CALICOQ_VERSION=v3.28.1
ARG CALICOQ_VERSION=v3.28.2
ARG CALICOQ_IMAGE="${DOCKER_REGISTRY}/${CALICOQ_IMAGE_PREFIX}:${CALICOQ_VERSION}"
FROM ${CALICOCTL_IMAGE} as stage_calicoctl

@ -8,13 +8,13 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0'
# Reef 18.2.2
ARG CEPH_RELEASE=reef
ARG CEPH_RELEASE_TAG=18.2.2-1~jammy
ARG KUBE_VERSION=1.32.0
# Squid 19.2.1
ARG CEPH_RELEASE=squid
ARG CEPH_RELEASE_TAG=19.2.1-1jammy
ARG KUBE_VERSION=1.32.2
ARG CEPH_REPO=https://mirror.mirantis.com/acicd/ceph/debian-18.2.2.patch1/jammy/
ARG CEPH_KEY=https://mirror.mirantis.com/acicd/ceph/debian-18.2.2.patch1/jammy/release.asc
ARG CEPH_REPO=https://mirror.mirantis.com/acicd/ceph-${CEPH_RELEASE}/
ARG CEPH_KEY=https://mirror.mirantis.com/acicd/ceph-${CEPH_RELEASE}/release.asc
ARG DEBIAN_FRONTEND=noninteractive

@ -8,7 +8,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0'
ARG KUBE_VERSION=1.32.0
ARG KUBE_VERSION=1.32.2
ARG DEBIAN_FRONTEND=noninteractive

@ -9,7 +9,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.licenses='Apache-2.0'
ARG ETCDCTL_VERSION=3.5.12
ARG KUBE_VERSION=1.32.0
ARG KUBE_VERSION=1.32.2
ENV GOOGLE_URL=https://storage.googleapis.com/etcd
ENV GITHUB_URL=https://github.com/etcd-io/etcd/releases/download

@ -8,7 +8,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0'
ARG KUBE_VERSION=1.32.0
ARG KUBE_VERSION=1.32.2
ARG MARIADB_VERSION=10.6
ARG PERCONA_TOOLKIT_VERSION=3.5.7

@ -8,7 +8,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0'
ARG KUBE_VERSION=1.32.0
ARG KUBE_VERSION=1.32.2
ARG DEBIAN_FRONTEND=noninteractive