gh/workflows: Use cilium-cli GHA to install CLI exec

This reduces not only the boilerplate, but allows with a few cmds to change the CLI vsn to test WIP changes. For example, to use a custom CLI CI build for all workflows: $ CI_BUILD_VSN=foobar $ git grep -l cilium_cli_version: | xargs sed -i 's/cilium_cli_version: .*/cilium_cli_version:/g' $ git grep -l cilium_cli_ci_version: | xargs sed -i 's/cilium_cli_ci_version: .*/cilium_cli_ci_version: $CI_BUILD_VSN/g' Signed-off-by: Martynas Pumputis <m@lambda.lt>
cilium · May 2, 2023 · 8f08c42 · 8f08c42
1 parent eff26cf
commit 8f08c42
Show file tree

Hide file tree

Showing 40 changed files with 215 additions and 253 deletions.
diff --git a/.github/workflows/conformance-aks-v1.11.yaml b/.github/workflows/conformance-aks-v1.11.yaml
@@ -72,6 +72,7 @@ env:
   k8s_version: 1.23
   # renovate: datasource=github-releases depName=cilium/cilium-cli
   cilium_cli_version: v0.13.2
+  cilium_cli_ci_version:
   check_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
 jobs:
@@ -196,12 +197,10 @@ jobs:
           target_url: ${{ env.check_url }}
 
       - name: Install Cilium CLI
-        run: |
-          curl -sSL --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${{ env.cilium_cli_version }}/cilium-linux-amd64.tar.gz{,.sha256sum}
-          sha256sum --check cilium-linux-amd64.tar.gz.sha256sum
-          sudo tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
-          rm cilium-linux-amd64.tar.gz{,.sha256sum}
-          cilium version
+        uses: cilium/cilium-cli@d3c7168e26e2897bae563eb41aa9692db3fa0962
+        with:
+          release-version: ${{ env.cilium_cli_version }}
+          ci-version: ${{ env.cilium_cli_ci_version }}
 
       - name: Login to Azure
         uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7

diff --git a/.github/workflows/conformance-aks-v1.12.yaml b/.github/workflows/conformance-aks-v1.12.yaml
@@ -72,6 +72,7 @@ env:
   k8s_version: 1.24
   # renovate: datasource=github-releases depName=cilium/cilium-cli
   cilium_cli_version: v0.13.2
+  cilium_cli_ci_version:
   check_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
 jobs:
@@ -196,12 +197,10 @@ jobs:
           target_url: ${{ env.check_url }}
 
       - name: Install Cilium CLI
-        run: |
-          curl -sSL --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${{ env.cilium_cli_version }}/cilium-linux-amd64.tar.gz{,.sha256sum}
-          sha256sum --check cilium-linux-amd64.tar.gz.sha256sum
-          sudo tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
-          rm cilium-linux-amd64.tar.gz{,.sha256sum}
-          cilium version
+        uses: cilium/cilium-cli@d3c7168e26e2897bae563eb41aa9692db3fa0962
+        with:
+          release-version: ${{ env.cilium_cli_version }}
+          ci-version: ${{ env.cilium_cli_ci_version }}
 
       - name: Login to Azure
         uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7

diff --git a/.github/workflows/conformance-aks-v1.13.yaml b/.github/workflows/conformance-aks-v1.13.yaml
@@ -72,6 +72,7 @@ env:
   k8s_version: 1.24
   # renovate: datasource=github-releases depName=cilium/cilium-cli
   cilium_cli_version: v0.13.2
+  cilium_cli_ci_version:
   check_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
 jobs:
@@ -196,12 +197,10 @@ jobs:
           target_url: ${{ env.check_url }}
 
       - name: Install Cilium CLI
-        run: |
-          curl -sSL --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${{ env.cilium_cli_version }}/cilium-linux-amd64.tar.gz{,.sha256sum}
-          sha256sum --check cilium-linux-amd64.tar.gz.sha256sum
-          sudo tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
-          rm cilium-linux-amd64.tar.gz{,.sha256sum}
-          cilium version
+        uses: cilium/cilium-cli@d3c7168e26e2897bae563eb41aa9692db3fa0962
+        with:
+          release-version: ${{ env.cilium_cli_version }}
+          ci-version: ${{ env.cilium_cli_ci_version }}
 
       - name: Login to Azure
         uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7

diff --git a/.github/workflows/conformance-aks.yaml b/.github/workflows/conformance-aks.yaml
@@ -71,6 +71,7 @@ env:
   cost_reduction: --node-vm-size Standard_B2s --node-osdisk-size 30
   # renovate: datasource=github-releases depName=cilium/cilium-cli
   cilium_cli_version: v0.13.2
+  cilium_cli_ci_version:
   check_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
 jobs:
@@ -193,12 +194,10 @@ jobs:
           target_url: ${{ env.check_url }}
 
       - name: Install Cilium CLI
-        run: |
-          curl -sSL --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${{ env.cilium_cli_version }}/cilium-linux-amd64.tar.gz{,.sha256sum}
-          sha256sum --check cilium-linux-amd64.tar.gz.sha256sum
-          sudo tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
-          rm cilium-linux-amd64.tar.gz{,.sha256sum}
-          cilium version
+        uses: cilium/cilium-cli@d3c7168e26e2897bae563eb41aa9692db3fa0962
+        with:
+          release-version: ${{ env.cilium_cli_version }}
+          ci-version: ${{ env.cilium_cli_ci_version }}
 
       - name: Login to Azure
         uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7

diff --git a/.github/workflows/conformance-aws-cni-v1.11.yaml b/.github/workflows/conformance-aws-cni-v1.11.yaml
@@ -69,6 +69,7 @@ env:
   k8s_version: 1.23
   # renovate: datasource=github-releases depName=cilium/cilium-cli
   cilium_cli_version: v0.13.2
+  cilium_cli_ci_version:
   check_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
   eksctl_version: v0.122.0
   kubectl_version: v1.23.6
@@ -203,12 +204,10 @@ jobs:
           target_url: ${{ env.check_url }}
 
       - name: Install Cilium CLI
-        run: |
-          curl -sSL --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${{ env.cilium_cli_version }}/cilium-linux-amd64.tar.gz{,.sha256sum}
-          sha256sum --check cilium-linux-amd64.tar.gz.sha256sum
-          sudo tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
-          rm cilium-linux-amd64.tar.gz{,.sha256sum}
-          cilium version
+        uses: cilium/cilium-cli@d3c7168e26e2897bae563eb41aa9692db3fa0962
+        with:
+          release-version: ${{ env.cilium_cli_version }}
+          ci-version: ${{ env.cilium_cli_ci_version }}
 
       - name: Install kubectl
         run: |

diff --git a/.github/workflows/conformance-aws-cni-v1.12.yaml b/.github/workflows/conformance-aws-cni-v1.12.yaml
@@ -69,6 +69,7 @@ env:
   k8s_version: 1.24
   # renovate: datasource=github-releases depName=cilium/cilium-cli
   cilium_cli_version: v0.13.2
+  cilium_cli_ci_version:
   check_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
   eksctl_version: v0.122.0
   kubectl_version: v1.23.6
@@ -203,12 +204,10 @@ jobs:
           target_url: ${{ env.check_url }}
 
       - name: Install Cilium CLI
-        run: |
-          curl -sSL --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${{ env.cilium_cli_version }}/cilium-linux-amd64.tar.gz{,.sha256sum}
-          sha256sum --check cilium-linux-amd64.tar.gz.sha256sum
-          sudo tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
-          rm cilium-linux-amd64.tar.gz{,.sha256sum}
-          cilium version
+        uses: cilium/cilium-cli@d3c7168e26e2897bae563eb41aa9692db3fa0962
+        with:
+          release-version: ${{ env.cilium_cli_version }}
+          ci-version: ${{ env.cilium_cli_ci_version }}
 
       - name: Install kubectl
         run: |

diff --git a/.github/workflows/conformance-aws-cni-v1.13.yaml b/.github/workflows/conformance-aws-cni-v1.13.yaml
@@ -69,6 +69,7 @@ env:
   k8s_version: 1.24
   # renovate: datasource=github-releases depName=cilium/cilium-cli
   cilium_cli_version: v0.13.2
+  cilium_cli_ci_version:
   check_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
   eksctl_version: v0.122.0
   kubectl_version: v1.23.6
@@ -203,12 +204,10 @@ jobs:
           target_url: ${{ env.check_url }}
 
       - name: Install Cilium CLI
-        run: |
-          curl -sSL --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${{ env.cilium_cli_version }}/cilium-linux-amd64.tar.gz{,.sha256sum}
-          sha256sum --check cilium-linux-amd64.tar.gz.sha256sum
-          sudo tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
-          rm cilium-linux-amd64.tar.gz{,.sha256sum}
-          cilium version
+        uses: cilium/cilium-cli@d3c7168e26e2897bae563eb41aa9692db3fa0962
+        with:
+          release-version: ${{ env.cilium_cli_version }}
+          ci-version: ${{ env.cilium_cli_ci_version }}
 
       - name: Install kubectl
         run: |

diff --git a/.github/workflows/conformance-aws-cni.yaml b/.github/workflows/conformance-aws-cni.yaml
@@ -68,6 +68,7 @@ env:
   region: us-east-2
   # renovate: datasource=github-releases depName=cilium/cilium-cli
   cilium_cli_version: v0.13.2
+  cilium_cli_ci_version:
   check_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
   eksctl_version: v0.122.0
   kubectl_version: v1.23.6
@@ -198,12 +199,10 @@ jobs:
           target_url: ${{ env.check_url }}
 
       - name: Install Cilium CLI
-        run: |
-          curl -sSL --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${{ env.cilium_cli_version }}/cilium-linux-amd64.tar.gz{,.sha256sum}
-          sha256sum --check cilium-linux-amd64.tar.gz.sha256sum
-          sudo tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
-          rm cilium-linux-amd64.tar.gz{,.sha256sum}
-          cilium version
+        uses: cilium/cilium-cli@d3c7168e26e2897bae563eb41aa9692db3fa0962
+        with:
+          release-version: ${{ env.cilium_cli_version }}
+          ci-version: ${{ env.cilium_cli_ci_version }}
 
       - name: Install kubectl
         run: |

diff --git a/.github/workflows/conformance-clustermesh-v1.11.yaml b/.github/workflows/conformance-clustermesh-v1.11.yaml
@@ -68,6 +68,7 @@ env:
   k8s_version: v1.23.17
   # renovate: datasource=github-releases depName=cilium/cilium-cli
   cilium_cli_version: v0.13.2
+  cilium_cli_ci_version:
   clusterName1: cluster1-${{ github.run_id }}
   clusterName2: cluster2-${{ github.run_id }}
   contextName1: kind-cluster1-${{ github.run_id }}
@@ -354,12 +355,10 @@ jobs:
         echo kind_svc_cidr_2=${KIND_SVC_CIDR_2} >> $GITHUB_OUTPUT
 
     - name: Install Cilium CLI
-      run: |
-        curl -sSL --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${{ env.cilium_cli_version }}/cilium-linux-amd64.tar.gz{,.sha256sum}
-        sha256sum --check cilium-linux-amd64.tar.gz.sha256sum
-        sudo tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
-        rm cilium-linux-amd64.tar.gz{,.sha256sum}
-        cilium version
+      uses: cilium/cilium-cli@d3c7168e26e2897bae563eb41aa9692db3fa0962
+      with:
+        release-version: ${{ env.cilium_cli_version }}
+        ci-version: ${{ env.cilium_cli_ci_version }}
 
     - name: Generate Kind configuration files
       run: |

diff --git a/.github/workflows/conformance-clustermesh-v1.12.yaml b/.github/workflows/conformance-clustermesh-v1.12.yaml
@@ -68,6 +68,7 @@ env:
   k8s_version: v1.24.12
   # renovate: datasource=github-releases depName=cilium/cilium-cli
   cilium_cli_version: v0.13.2
+  cilium_cli_ci_version:
   clusterName1: cluster1-${{ github.run_id }}
   clusterName2: cluster2-${{ github.run_id }}
   contextName1: kind-cluster1-${{ github.run_id }}
@@ -349,12 +350,10 @@ jobs:
         echo kind_svc_cidr_2=${KIND_SVC_CIDR_2} >> $GITHUB_OUTPUT
 
     - name: Install Cilium CLI
-      run: |
-        curl -sSL --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${{ env.cilium_cli_version }}/cilium-linux-amd64.tar.gz{,.sha256sum}
-        sha256sum --check cilium-linux-amd64.tar.gz.sha256sum
-        sudo tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
-        rm cilium-linux-amd64.tar.gz{,.sha256sum}
-        cilium version
+      uses: cilium/cilium-cli@d3c7168e26e2897bae563eb41aa9692db3fa0962
+      with:
+        release-version: ${{ env.cilium_cli_version }}
+        ci-version: ${{ env.cilium_cli_ci_version }}
 
     - name: Generate Kind configuration files
       run: |

diff --git a/.github/workflows/conformance-clustermesh-v1.13.yaml b/.github/workflows/conformance-clustermesh-v1.13.yaml
@@ -68,6 +68,7 @@ env:
   k8s_version: v1.24.12
   # renovate: datasource=github-releases depName=cilium/cilium-cli
   cilium_cli_version: v0.13.2
+  cilium_cli_ci_version:
   clusterName1: cluster1-${{ github.run_id }}
   clusterName2: cluster2-${{ github.run_id }}
   contextName1: kind-cluster1-${{ github.run_id }}
@@ -349,12 +350,10 @@ jobs:
         echo kind_svc_cidr_2=${KIND_SVC_CIDR_2} >> $GITHUB_OUTPUT
 
     - name: Install Cilium CLI
-      run: |
-        curl -sSL --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${{ env.cilium_cli_version }}/cilium-linux-amd64.tar.gz{,.sha256sum}
-        sha256sum --check cilium-linux-amd64.tar.gz.sha256sum
-        sudo tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
-        rm cilium-linux-amd64.tar.gz{,.sha256sum}
-        cilium version
+      uses: cilium/cilium-cli@d3c7168e26e2897bae563eb41aa9692db3fa0962
+      with:
+        release-version: ${{ env.cilium_cli_version }}
+        ci-version: ${{ env.cilium_cli_ci_version }}
 
     - name: Generate Kind configuration files
       run: |

diff --git a/.github/workflows/conformance-clustermesh.yaml b/.github/workflows/conformance-clustermesh.yaml
@@ -68,6 +68,7 @@ env:
   k8s_version: v1.27.1
   # renovate: datasource=github-releases depName=cilium/cilium-cli
   cilium_cli_version: v0.13.2
+  cilium_cli_ci_version:
   clusterName1: cluster1-${{ github.run_id }}
   clusterName2: cluster2-${{ github.run_id }}
   contextName1: kind-cluster1-${{ github.run_id }}
@@ -340,12 +341,10 @@ jobs:
         echo kind_svc_cidr_2=${KIND_SVC_CIDR_2} >> $GITHUB_OUTPUT
 
     - name: Install Cilium CLI
-      run: |
-        curl -sSL --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${{ env.cilium_cli_version }}/cilium-linux-amd64.tar.gz{,.sha256sum}
-        sha256sum --check cilium-linux-amd64.tar.gz.sha256sum
-        sudo tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
-        rm cilium-linux-amd64.tar.gz{,.sha256sum}
-        cilium version
+      uses: cilium/cilium-cli@d3c7168e26e2897bae563eb41aa9692db3fa0962
+      with:
+        release-version: ${{ env.cilium_cli_version }}
+        ci-version: ${{ env.cilium_cli_ci_version }}
 
     - name: Generate Kind configuration files
       run: |

diff --git a/.github/workflows/conformance-e2e-v1.13.yaml b/.github/workflows/conformance-e2e-v1.13.yaml
@@ -66,6 +66,7 @@ concurrency:
 env:
   # renovate: datasource=github-releases depName=cilium/cilium-cli
   cilium_cli_version: v0.13.2
+  cilium_cli_ci_version:
   check_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
 jobs:
@@ -297,17 +298,13 @@ jobs:
           ref: ${{ needs.setup-report.outputs.sha }}
           persist-credentials: false
 
-      - name: Install cilium-cli
-        shell: bash
-        run: |
-          curl -sSL --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${{ env.cilium_cli_version }}/cilium-linux-amd64.tar.gz{,.sha256sum}
-          sha256sum --check cilium-linux-amd64.tar.gz.sha256sum
-          mkdir cilium-cli-tmp
-          tar xzvfC cilium-linux-amd64.tar.gz cilium-cli-tmp
-          mv ./cilium-cli-tmp/cilium cilium-cli
-          rm cilium-linux-amd64.tar.gz{,.sha256sum}
-          rmdir cilium-cli-tmp
-          ./cilium-cli version
+      - name: Install Cilium CLI-cli
+        uses: cilium/cilium-cli@d3c7168e26e2897bae563eb41aa9692db3fa0962
+        with:
+          release-version: ${{ env.cilium_cli_version }}
+          ci-version: ${{ env.cilium_cli_ci_version }}
+          binary-name: cilium-cli
+          binary-dir: ./
 
       - name: Provision LVH VMs
         uses: cilium/little-vm-helper@0b7d7157dae56a44dc531c852e7756dc671071af # v0.0.3

diff --git a/.github/workflows/conformance-e2e.yaml b/.github/workflows/conformance-e2e.yaml
@@ -66,6 +66,7 @@ concurrency:
 env:
   # renovate: datasource=github-releases depName=cilium/cilium-cli
   cilium_cli_version: v0.13.2
+  cilium_cli_ci_version:
   check_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
 jobs:
@@ -397,17 +398,13 @@ jobs:
           ref: ${{ needs.setup-report.outputs.sha }}
           persist-credentials: false
 
-      - name: Install cilium-cli
-        shell: bash
-        run: |
-          curl -sSL --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${{ env.cilium_cli_version }}/cilium-linux-amd64.tar.gz{,.sha256sum}
-          sha256sum --check cilium-linux-amd64.tar.gz.sha256sum
-          mkdir cilium-cli-tmp
-          tar xzvfC cilium-linux-amd64.tar.gz cilium-cli-tmp
-          mv ./cilium-cli-tmp/cilium cilium-cli
-          rm cilium-linux-amd64.tar.gz{,.sha256sum}
-          rmdir cilium-cli-tmp
-          ./cilium-cli version
+      - name: Install Cilium CLI-cli
+        uses: cilium/cilium-cli@d3c7168e26e2897bae563eb41aa9692db3fa0962
+        with:
+          release-version: ${{ env.cilium_cli_version }}
+          ci-version: ${{ env.cilium_cli_ci_version }}
+          binary-name: cilium-cli
+          binary-dir: ./
 
       - name: Provision LVH VMs
         uses: cilium/little-vm-helper@0b7d7157dae56a44dc531c852e7756dc671071af # v0.0.3

diff --git a/.github/workflows/conformance-eks-v1.11.yaml b/.github/workflows/conformance-eks-v1.11.yaml
@@ -69,6 +69,7 @@ env:
   k8s_version: 1.23
   # renovate: datasource=github-releases depName=cilium/cilium-cli
   cilium_cli_version: v0.13.2
+  cilium_cli_ci_version:
   check_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
   eksctl_version: v0.122.0
   kubectl_version: v1.23.6
@@ -193,12 +194,10 @@ jobs:
           target_url: ${{ env.check_url }}
 
       - name: Install Cilium CLI
-        run: |
-          curl -sSL --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${{ env.cilium_cli_version }}/cilium-linux-amd64.tar.gz{,.sha256sum}
-          sha256sum --check cilium-linux-amd64.tar.gz.sha256sum
-          sudo tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
-          rm cilium-linux-amd64.tar.gz{,.sha256sum}
-          cilium version
+        uses: cilium/cilium-cli@d3c7168e26e2897bae563eb41aa9692db3fa0962
+        with:
+          release-version: ${{ env.cilium_cli_version }}
+          ci-version: ${{ env.cilium_cli_ci_version }}
 
       - name: Install kubectl
         run: |