From ecf721163041f16c9327df1ae9905ba4164404c5 Mon Sep 17 00:00:00 2001 From: "Anselme, Schubert (sa246v)" Date: Mon, 15 May 2023 13:31:24 +0000 Subject: [PATCH] Update calicoctl to v3.25.1 Change-Id: Ie91dbbc1281119c8e7ddd6e0b2cbc04a0639c2a1 Signed-off-by: Anselme, Schubert (sa246v) --- docs/requirements.txt | 4 ++-- images/calicoctl-utility/Dockerfile.ubuntu_focal | 2 +- .../Dockerfile_calicoq_calicoctl.ubuntu_focal | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index bbf2a7bf..3eb17f23 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,4 @@ -sphinx<=6.2.1 -sphinx_rtd_theme==0.2.4 +sphinx>=1.6.2 +sphinx_rtd_theme>=0.2.4 falcon==1.2.0 oslo.config==6.6.2 diff --git a/images/calicoctl-utility/Dockerfile.ubuntu_focal b/images/calicoctl-utility/Dockerfile.ubuntu_focal index bc23d95f..f722f8d6 100644 --- a/images/calicoctl-utility/Dockerfile.ubuntu_focal +++ b/images/calicoctl-utility/Dockerfile.ubuntu_focal @@ -1,7 +1,7 @@ ARG FROM=docker.io/ubuntu:focal ARG DOCKER_REGISTRY=quay.io ARG CALICOCTL_IMAGE_PREFIX=calico/ctl -ARG CALICOCTL_VERSION=v3.23.1 +ARG CALICOCTL_VERSION=v3.25.1 ARG CALICOCTL_IMAGE="${DOCKER_REGISTRY}/${CALICOCTL_IMAGE_PREFIX}:${CALICOCTL_VERSION}" FROM ${CALICOCTL_IMAGE} as stage_calicoctl diff --git a/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_focal b/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_focal index fb3ea0da..29128886 100644 --- a/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_focal +++ b/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_focal @@ -1,10 +1,10 @@ ARG FROM=docker.io/ubuntu:focal ARG DOCKER_REGISTRY=quay.io ARG CALICOCTL_IMAGE_PREFIX=tigera/calicoctl -ARG CALICOCTL_VERSION=v3.23.1 +ARG CALICOCTL_VERSION=v3.25.1 ARG CALICOCTL_IMAGE="${DOCKER_REGISTRY}/${CALICOCTL_IMAGE_PREFIX}:${CALICOCTL_VERSION}" ARG CALICOQ_IMAGE_PREFIX=tigera/calicoq -ARG CALICOQ_VERSION=v3.23.1 +ARG CALICOQ_VERSION=v3.25.1 ARG CALICOQ_IMAGE="${DOCKER_REGISTRY}/${CALICOQ_IMAGE_PREFIX}:${CALICOQ_VERSION}" FROM ${CALICOCTL_IMAGE} as stage_calicoctl