From fef241da50247d337f2749f18b9dff4861b26c6e Mon Sep 17 00:00:00 2001
From: Sergiy Markin <smarkin@mirantis.com>
Date: Wed, 25 Sep 2024 02:05:15 +0000
Subject: [PATCH] Update calicoctl version in jammy image

Change-Id: Ib0d1b37219c76eb55d792f7a3640873011fba053
---
 .../calicoctl-utility/Dockerfile.ubuntu_jammy |  4 +--
 .../Dockerfile_calicoq_calicoctl.ubuntu_focal |  4 +--
 .../Dockerfile_calicoq_calicoctl.ubuntu_jammy |  8 +++---
 zuul.d/calicoctl-utility.yaml                 | 25 -------------------
 4 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/images/calicoctl-utility/Dockerfile.ubuntu_jammy b/images/calicoctl-utility/Dockerfile.ubuntu_jammy
index 125b9ab5..488df5e8 100644
--- a/images/calicoctl-utility/Dockerfile.ubuntu_jammy
+++ b/images/calicoctl-utility/Dockerfile.ubuntu_jammy
@@ -1,7 +1,7 @@
 ARG FROM=docker.io/ubuntu:jammy
 ARG DOCKER_REGISTRY=quay.io
 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}"
 
 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 "/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 \
     && chmod 0754 /usr/local/bin/calicoctl \
diff --git a/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_focal b/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_focal
index 792ec1c3..bd69934b 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.27.2
+ARG CALICOCTL_VERSION=v3.28.1
 ARG CALICOCTL_IMAGE="${DOCKER_REGISTRY}/${CALICOCTL_IMAGE_PREFIX}:${CALICOCTL_VERSION}"
 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}"
 
 FROM ${CALICOCTL_IMAGE} as stage_calicoctl
diff --git a/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_jammy b/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_jammy
index fe8bb595..35ba93d4 100644
--- a/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_jammy
+++ b/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_jammy
@@ -1,10 +1,10 @@
 ARG FROM=docker.io/ubuntu:jammy
 ARG DOCKER_REGISTRY=quay.io
 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 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}"
 
 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 "/rootwrap_logger.addHandler/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py
 
-COPY --from=stage_calicoctl /calicoctl /usr/local/bin/calicoctl
-COPY --from=stage_calicoq /calicoq /usr/local/bin/calicoq
+COPY --from=stage_calicoctl /usr/bin/calicoctl /usr/local/bin/calicoctl
+COPY --from=stage_calicoq /usr/bin/calicoq /usr/local/bin/calicoq
 
 RUN set -xe \
     && chmod 0754 /usr/local/bin/calicoctl \
diff --git a/zuul.d/calicoctl-utility.yaml b/zuul.d/calicoctl-utility.yaml
index 8fda1b67..3aa8544a 100644
--- a/zuul.d/calicoctl-utility.yaml
+++ b/zuul.d/calicoctl-utility.yaml
@@ -54,29 +54,4 @@
     vars:
       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
 ...
\ No newline at end of file