airship/porthole
Code Issues Proposed changes

Update calicoctl version in jammy image

Browse Source 
Change-Id: Ib0d1b37219c76eb55d792f7a3640873011fba053
This commit is contained in:
Sergiy Markin 2024-09-25 02:05:15 +00:00
parent b475486d96
commit fef241da50
4 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
images/calicoctl-utility/Dockerfile.ubuntu_jammy
View File

@ -1,7 +1,7 @@
ARG FROM=docker.io/ubuntu:jammy ARG FROM=docker.io/ubuntu:jammy
ARG DOCKER_REGISTRY=quay.io ARG DOCKER_REGISTRY=quay.io
ARG CALICOCTL_IMAGE_PREFIX=calico/ctl ARG CALICOCTL_IMAGE_PREFIX=calico/ctl
ARG CALICOCTL_VERSION=v3.27.3 ARG CALICOCTL_VERSION=v3.28.1
ARG CALICOCTL_IMAGE="${DOCKER_REGISTRY}/${CALICOCTL_IMAGE_PREFIX}:${CALICOCTL_VERSION}" ARG CALICOCTL_IMAGE="${DOCKER_REGISTRY}/${CALICOCTL_IMAGE_PREFIX}:${CALICOCTL_VERSION}"
FROM ${CALICOCTL_IMAGE} as stage_calicoctl FROM ${CALICOCTL_IMAGE} as stage_calicoctl
@ -42,7 +42,7 @@ RUN PYTHON_LOCATION=$(pip3 show oslo.rootwrap|grep Location|awk '{print $2}') \
&& sed -i "/os.path.basename/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py \ && sed -i "/os.path.basename/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py \
&& sed -i "/rootwrap_logger.addHandler/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py && sed -i "/rootwrap_logger.addHandler/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py
COPY --from=stage_calicoctl /calicoctl /usr/local/bin/calicoctl COPY --from=stage_calicoctl /usr/bin/calicoctl /usr/local/bin/calicoctl
RUN set -xe \ RUN set -xe \
&& chmod 0754 /usr/local/bin/calicoctl \ && chmod 0754 /usr/local/bin/calicoctl \

4
images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_focal
View File

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

8
images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_jammy
View File

@ -1,10 +1,10 @@
ARG FROM=docker.io/ubuntu:jammy ARG FROM=docker.io/ubuntu:jammy
ARG DOCKER_REGISTRY=quay.io ARG DOCKER_REGISTRY=quay.io
ARG CALICOCTL_IMAGE_PREFIX=tigera/calicoctl ARG CALICOCTL_IMAGE_PREFIX=tigera/calicoctl
ARG CALICOCTL_VERSION=v3.27.3 ARG CALICOCTL_VERSION=v3.28.1
ARG CALICOCTL_IMAGE="${DOCKER_REGISTRY}/${CALICOCTL_IMAGE_PREFIX}:${CALICOCTL_VERSION}" ARG CALICOCTL_IMAGE="${DOCKER_REGISTRY}/${CALICOCTL_IMAGE_PREFIX}:${CALICOCTL_VERSION}"
ARG CALICOQ_IMAGE_PREFIX=tigera/calicoq ARG CALICOQ_IMAGE_PREFIX=tigera/calicoq
ARG CALICOQ_VERSION=v3.27.3 ARG CALICOQ_VERSION=v3.28.1
ARG CALICOQ_IMAGE="${DOCKER_REGISTRY}/${CALICOQ_IMAGE_PREFIX}:${CALICOQ_VERSION}" ARG CALICOQ_IMAGE="${DOCKER_REGISTRY}/${CALICOQ_IMAGE_PREFIX}:${CALICOQ_VERSION}"
FROM ${CALICOCTL_IMAGE} as stage_calicoctl FROM ${CALICOCTL_IMAGE} as stage_calicoctl
@ -48,8 +48,8 @@ RUN PYTHON_LOCATION=$(pip3 show oslo.rootwrap|grep Location|awk '{print $2}') \
&& sed -i "/os.path.basename/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py \ && sed -i "/os.path.basename/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py \
&& sed -i "/rootwrap_logger.addHandler/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py && sed -i "/rootwrap_logger.addHandler/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py
COPY --from=stage_calicoctl /calicoctl /usr/local/bin/calicoctl COPY --from=stage_calicoctl /usr/bin/calicoctl /usr/local/bin/calicoctl
COPY --from=stage_calicoq /calicoq /usr/local/bin/calicoq COPY --from=stage_calicoq /usr/bin/calicoq /usr/local/bin/calicoq
RUN set -xe \ RUN set -xe \
&& chmod 0754 /usr/local/bin/calicoctl \ && chmod 0754 /usr/local/bin/calicoctl \

25
zuul.d/calicoctl-utility.yaml
View File

@ -54,29 +54,4 @@
vars: vars:
distro_suffix: ubuntu_jammy distro_suffix: ubuntu_jammy
- job:
name: airship-porthole-images-focal-build-calicoctl-utility
parent: airship-porthole-images-build-calicoctl-utility
vars:
distro_suffix: ubuntu_focal
- job:
name: airship-porthole-images-focal-publish-calicoctl-utility
parent: airship-porthole-images-publish-calicoctl-utility
secrets: *secrets
vars:
distro_suffix: ubuntu_focal
- job:
name: airship-porthole-images-bionic-build-calicoctl-utility
parent: airship-porthole-images-build-calicoctl-utility
vars:
distro_suffix: ubuntu_bionic
- job:
name: airship-porthole-images-bionic-publish-calicoctl-utility
parent: airship-porthole-images-publish-calicoctl-utility
secrets: *secrets
vars:
distro_suffix: ubuntu_bionic
... ...