From 12c6c9158668ca9f90502d6276095c4497d5e199 Mon Sep 17 00:00:00 2001
From: Tomofumi Hayashi <tohayash@redhat.com>
Date: Thu, 25 Aug 2022 23:07:32 +0900
Subject: [PATCH] Fix container tags for thick plugin

---
 .github/workflows/image-push-master.yml  | 35 +++++++++++++++++-------
 .github/workflows/image-push-release.yml | 20 +++++++++++++-
 deployments/multus-daemonset-thick.yml   |  4 +--
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/image-push-master.yml b/.github/workflows/image-push-master.yml
index 441225724..833a03ebc 100644
--- a/.github/workflows/image-push-master.yml
+++ b/.github/workflows/image-push-master.yml
@@ -40,7 +40,8 @@ jobs:
           context: .
           push: true
           tags: |
-            ghcr.io/${{ github.repository }}:thick-amd64
+            ghcr.io/${{ github.repository }}:latest-thick-amd64
+            ghcr.io/${{ github.repository }}:snapshot-thick-amd64
           file: images/Dockerfile.thick
 
   push-arm64:
@@ -208,22 +209,27 @@ jobs:
       - name: Create manifest for multi-arch images
         if: github.repository_owner == 'k8snetworkplumbingwg'
         run: |
+          # snapshot-thick
           # get artifacts from previous steps
-          docker pull ${{ env.REPOSITORY }}:thick-amd64
-          docker manifest create ${{ env.REPOSITORY }}:thick ${{ env.REPOSITORY }}:thick-amd64
-          docker manifest annotate ${{ env.REPOSITORY }}:thick ${{ env.REPOSITORY }}:thick-amd64 --arch amd64
-          docker manifest push ${{ env.REPOSITORY }}:thick
+          docker pull ${{ env.REPOSITORY }}:snapshot-thick-amd64
+          docker manifest create ${{ env.REPOSITORY }}:snapshot-thick ${{ env.REPOSITORY }}:snapshot-thick-amd64
+          docker manifest annotate ${{ env.REPOSITORY }}:snapshot-thick ${{ env.REPOSITORY }}:snapshot-thick-amd64 --arch amd64
+          docker manifest push ${{ env.REPOSITORY }}:snapshot-thick
 
+          # latest-thick
+          # get artifacts from previous steps
+          docker pull ${{ env.REPOSITORY }}:latest-thick-amd64
+          docker manifest create ${{ env.REPOSITORY }}:latest-thick ${{ env.REPOSITORY }}:latest-thick-amd64
+          docker manifest annotate ${{ env.REPOSITORY }}:latest-thick ${{ env.REPOSITORY }}:latest-thick-amd64 --arch amd64
+          docker manifest push ${{ env.REPOSITORY }}:latest-thick
+
+          # snapshot
+          # get artifacts from previous steps
           docker pull ${{ env.REPOSITORY }}:snapshot-amd64
           docker pull ${{ env.REPOSITORY }}:snapshot-arm64
           docker pull ${{ env.REPOSITORY }}:snapshot-arm32
           docker pull ${{ env.REPOSITORY }}:snapshot-ppc64le
           docker pull ${{ env.REPOSITORY }}:snapshot-s390x
-          docker pull ${{ env.REPOSITORY }}:latest-amd64
-          docker pull ${{ env.REPOSITORY }}:latest-arm64
-          docker pull ${{ env.REPOSITORY }}:latest-arm32
-          docker pull ${{ env.REPOSITORY }}:latest-ppc64le
-          docker pull ${{ env.REPOSITORY }}:latest-s390x
           docker manifest create ${{ env.REPOSITORY }}:snapshot ${{ env.REPOSITORY }}:snapshot-amd64 ${{ env.REPOSITORY }}:snapshot-arm64 ${{ env.REPOSITORY }}:snapshot-arm32 ${{ env.REPOSITORY }}:snapshot-ppc64le ${{ env.REPOSITORY }}:snapshot-s390x
           docker manifest annotate ${{ env.REPOSITORY }}:snapshot ${{ env.REPOSITORY }}:snapshot-amd64 --arch amd64
           docker manifest annotate ${{ env.REPOSITORY }}:snapshot ${{ env.REPOSITORY }}:snapshot-arm64 --arch arm64
@@ -231,6 +237,15 @@ jobs:
           docker manifest annotate ${{ env.REPOSITORY }}:snapshot ${{ env.REPOSITORY }}:snapshot-ppc64le --arch ppc64le
           docker manifest annotate ${{ env.REPOSITORY }}:snapshot ${{ env.REPOSITORY }}:snapshot-s390x --arch s390x
           docker manifest push ${{ env.REPOSITORY }}:snapshot
+
+          # latest
+          # get artifacts from previous steps
+          docker pull ${{ env.REPOSITORY }}:latest-amd64
+          docker pull ${{ env.REPOSITORY }}:latest-arm64
+          docker pull ${{ env.REPOSITORY }}:latest-arm32
+          docker pull ${{ env.REPOSITORY }}:latest-ppc64le
+          docker pull ${{ env.REPOSITORY }}:latest-s390x
+
           docker manifest create ${{ env.REPOSITORY }}:latest ${{ env.REPOSITORY }}:latest-amd64 ${{ env.REPOSITORY }}:latest-arm64 ${{ env.REPOSITORY }}:latest-arm32 ${{ env.REPOSITORY }}:latest-ppc64le ${{ env.REPOSITORY }}:latest-s390x
           docker manifest annotate ${{ env.REPOSITORY }}:latest ${{ env.REPOSITORY }}:latest-amd64 --arch amd64
           docker manifest annotate ${{ env.REPOSITORY }}:latest ${{ env.REPOSITORY }}:latest-arm64 --arch arm64
diff --git a/.github/workflows/image-push-release.yml b/.github/workflows/image-push-release.yml
index 5c569171e..7214d2b70 100644
--- a/.github/workflows/image-push-release.yml
+++ b/.github/workflows/image-push-release.yml
@@ -47,7 +47,7 @@ jobs:
           context: .
           push: true
           tags: |
-            ghcr.io/${{ github.repository }}:thick-amd64
+            ghcr.io/${{ github.repository }}:stable-thick-amd64
             ${{ steps.docker_meta.outputs.tags }}-thick-amd64
           file: images/Dockerfile.thick
 
@@ -258,6 +258,21 @@ jobs:
       - name: Create manifest for multi-arch images
         if: github.repository_owner == 'k8snetworkplumbingwg'
         run: |
+          # <tag>-thick
+          # get artifacts from previous steps
+          docker pull ${{ steps.docker_meta.outputs.tags }}-thick-amd64
+          docker manifest create ${{ steps.docker_meta.outputs.tags }}-thick ${{ steps.docker_meta.outputs.tags }}-thick-amd64
+          docker manifest annotate ${{ steps.docker_meta.outputs.tags }}-thick ${{ steps.docker_meta.outputs.tags }}-thick-amd64 --arch amd64
+          docker manifest push ${{ steps.docker_meta.outputs.tags }}-thick
+
+          # stable-thick
+          # get artifacts from previous steps
+          docker pull ${{ env.REPOSITORY }}:stable-thick-amd64
+          docker manifest create ${{ env.REPOSITORY }}:stable-thick ${{ env.REPOSITORY }}:stable-thick-amd64
+          docker manifest annotate ${{ env.REPOSITORY }}:stable-thick ${{ env.REPOSITORY }}:stable-thick-amd64 --arch amd64
+          docker manifest push ${{ env.REPOSITORY }}:stable-thick
+
+          # <tag>
           # get artifacts from previous steps
           docker pull ${{ steps.docker_meta.outputs.tags }}-amd64
           docker pull ${{ steps.docker_meta.outputs.tags }}-arm64
@@ -271,6 +286,9 @@ jobs:
           docker manifest annotate ${{ steps.docker_meta.outputs.tags }} ${{ steps.docker_meta.outputs.tags }}-ppc64le --arch ppc64le
           docker manifest annotate ${{ steps.docker_meta.outputs.tags }} ${{ steps.docker_meta.outputs.tags }}-s390x --arch s390x
           docker manifest push ${{ steps.docker_meta.outputs.tags }}
+
+          # stable
+          # get artifacts from previous steps
           docker pull ${{ env.REPOSITORY }}:stable-amd64
           docker pull ${{ env.REPOSITORY }}:stable-arm64
           docker pull ${{ env.REPOSITORY }}:stable-arm32
diff --git a/deployments/multus-daemonset-thick.yml b/deployments/multus-daemonset-thick.yml
index ee436be72..37a30f39c 100644
--- a/deployments/multus-daemonset-thick.yml
+++ b/deployments/multus-daemonset-thick.yml
@@ -144,7 +144,7 @@ spec:
       serviceAccountName: multus
       containers:
         - name: kube-multus
-          image: ghcr.io/k8snetworkplumbingwg/multus-cni:thick
+          image: ghcr.io/k8snetworkplumbingwg/multus-cni:snapshot-thick
           command: [ "/usr/src/multus-cni/bin/multus-daemon" ]
           args:
             - "-cni-version=0.3.1"
@@ -183,7 +183,7 @@ spec:
               mountPropagation: HostToContainer
       initContainers:
         - name: install-multus-binary
-          image: ghcr.io/k8snetworkplumbingwg/multus-cni:thick
+          image: ghcr.io/k8snetworkplumbingwg/multus-cni:snapshot-thick
           command:
             - "cp"
             - "/usr/src/multus-cni/bin/multus-shim"