Merge branch 'main' into renovate/main-docker.io-rancher-kubectl-1.x

onedr0p · Dec 20, 2023 · 3eddada · 3eddada
2 parents ad99005 + 17dc8a1
commit 3eddada
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 52 deletions.
diff --git a/.github/workflows/aqua-test.yaml b/.github/workflows/aqua-test.yaml
@@ -9,9 +9,6 @@ on:
 
 env:
   AQUA_CONFIG: ./.github/aqua.yaml
-  DEBCONF_NONINTERACTIVE_SEEN: "true"
-  DEBIAN_FRONTEND: noninteractive
-  APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE: DontWarn
 
 jobs:
   aqua:

diff --git a/.github/workflows/flux-diff.yaml b/.github/workflows/flux-diff.yaml
@@ -8,10 +8,7 @@ on:
     paths: ["kubernetes/**"]
 
 env:
-  AQUA_CONFIG: ./.github/aqua.yaml
-  DEBCONF_NONINTERACTIVE_SEEN: "true"
-  DEBIAN_FRONTEND: noninteractive
-  APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE: DontWarn
+  AQUA_GLOBAL_CONFIG: ./.github/aqua.yaml
 
 jobs:
   flux-diff:
@@ -40,19 +37,19 @@ jobs:
         shell: bash
         run: sudo apt-get -qq update && sudo apt-get -qq install --no-install-recommends -y curl git jo
 
-      - name: Cache Aqua
-        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
-        with:
-          path: ~/.local/share/aquaproj-aqua
-          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/aqua.yaml')}}
-          restore-keys: |
-            v1-aqua-installer-${{runner.os}}-${{runner.arch}}-
+      # - name: Cache Aqua
+      #   uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      #   with:
+      #     path: ~/.local/share/aquaproj-aqua
+      #     key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/aqua.yaml')}}
+      #     restore-keys: |
+      #       v1-aqua-installer-${{runner.os}}-${{runner.arch}}-
 
       - name: Install Aqua and CLI Tools
         uses: aquaproj/aqua-installer@928a2ee4243a9ee8312d80dc8cbaca88fb602a91 # v2.2.0
         with:
           aqua_version: v2.21.3
-          aqua_opts: ""
+          aqua_opts: -a
         env:
           GITHUB_TOKEN: "${{ steps.app-token.outputs.token }}"
 

diff --git a/.github/workflows/flux-hr-image-test.yaml b/.github/workflows/flux-hr-image-test.yaml
@@ -9,9 +9,6 @@ on:
 
 env:
   AQUA_CONFIG: ./.github/aqua.yaml
-  DEBCONF_NONINTERACTIVE_SEEN: "true"
-  DEBIAN_FRONTEND: noninteractive
-  APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE: DontWarn
   KUBERNETES_DIR: ./kubernetes
 
 jobs:

diff --git a/.github/workflows/flux-hr-sync.yaml b/.github/workflows/flux-hr-sync.yaml
@@ -22,9 +22,6 @@ on:
 
 env:
   AQUA_CONFIG: ./.github/aqua.yaml
-  DEBCONF_NONINTERACTIVE_SEEN: "true"
-  DEBIAN_FRONTEND: noninteractive
-  APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE: DontWarn
 
 jobs:
   sync:

diff --git a/.github/workflows/flux-ks-sync.yaml b/.github/workflows/flux-ks-sync.yaml
@@ -9,9 +9,6 @@ on:
 
 env:
   AQUA_CONFIG: ./.github/aqua.yaml
-  DEBCONF_NONINTERACTIVE_SEEN: "true"
-  DEBIAN_FRONTEND: noninteractive
-  APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE: DontWarn
 
 jobs:
   sync:

diff --git a/.github/workflows/kubeconform.yaml b/.github/workflows/kubeconform.yaml
@@ -10,9 +10,6 @@ on:
 
 env:
   AQUA_CONFIG: ./.github/aqua.yaml
-  DEBCONF_NONINTERACTIVE_SEEN: "true"
-  DEBIAN_FRONTEND: noninteractive
-  APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE: DontWarn
 
 jobs:
   kubeconform:

diff --git a/.github/workflows/publish-schemas.yaml b/.github/workflows/publish-schemas.yaml
@@ -11,10 +11,7 @@ on:
     paths: [".github/workflows/publish-schemas.yaml"]
 
 env:
-  AQUA_CONFIG: ./.github/aqua.yaml
-  DEBCONF_NONINTERACTIVE_SEEN: "true"
-  DEBIAN_FRONTEND: noninteractive
-  APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE: DontWarn
+  AQUA_GLOBAL_CONFIG: ./.github/aqua.yaml
   SCHEMAS_DIR: /home/runner/crds
 
 jobs:
@@ -41,38 +38,36 @@ jobs:
         shell: bash
         run: sudo apt-get -qq update && sudo apt-get -qq install --no-install-recommends -y curl git jo
 
-      - name: Cache Aqua
-        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
-        with:
-          path: ~/.local/share/aquaproj-aqua
-          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/aqua.yaml')}}
-          restore-keys: |
-            v1-aqua-installer-${{runner.os}}-${{runner.arch}}-
+      # - name: Cache Aqua
+      #   uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      #   with:
+      #     path: ~/.local/share/aquaproj-aqua
+      #     key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/aqua.yaml')}}
+      #     restore-keys: |
+      #       v1-aqua-installer-${{runner.os}}-${{runner.arch}}-
 
       - name: Install Aqua and CLI Tools
         uses: aquaproj/aqua-installer@928a2ee4243a9ee8312d80dc8cbaca88fb602a91 # v2.2.0
         with:
           aqua_version: v2.21.3
-          aqua_opts: ""
+          aqua_opts: -a
         env:
           GITHUB_TOKEN: "${{ steps.app-token.outputs.token }}"
 
-      - name: Setup Node
-        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
+      - name: Write kubeconfig
+        id: kubeconfig
+        uses: timheuer/base64-to-file@784a1a4a994315802b7d8e2084e116e783d157be # v1.2.4
         with:
-          node-version: 18.x
+          encodedString: "${{ secrets.KUBECONFIG }}"
+          fileName: kubeconfig
 
       - name: Setup Python
         uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
         with:
           python-version: 3.x
 
-      - name: Write kubeconfig
-        id: kubeconfig
-        uses: timheuer/base64-to-file@784a1a4a994315802b7d8e2084e116e783d157be # v1.2.4
-        with:
-          encodedString: "${{ secrets.KUBECONFIG }}"
-          fileName: kubeconfig
+      - name: Test
+        run: command -v kubectl && kubectl version --client
 
       - name: Download and run crd-extractor
         env:
@@ -82,10 +77,15 @@ jobs:
           mkdir -p ${{ env.SCHEMAS_DIR }}
           curl -fsSL -o $GITHUB_WORKSPACE/crd-extractor.sh \
               https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/Utilities/crd-extractor.sh
-          chmod +x $GITHUB_WORKSPACE/crd-extractor.sh
+          chmod u+x $GITHUB_WORKSPACE/crd-extractor.sh
           bash $GITHUB_WORKSPACE/crd-extractor.sh
           mv /home/runner/.datree/crdSchemas/* ${{ env.SCHEMAS_DIR }}
 
+      - name: Setup Node
+        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
+        with:
+          node-version: 18.x
+
       - name: Deploy to Cloudflare Pages
         uses: cloudflare/wrangler-action@a8be0ea72a399752dd2735fa16ea0d424f2335ca # v3.4.0
         with:

diff --git a/.github/workflows/publish-terraform.yaml b/.github/workflows/publish-terraform.yaml
@@ -10,9 +10,6 @@ on:
 
 env:
   AQUA_CONFIG: ./.github/aqua.yaml
-  DEBCONF_NONINTERACTIVE_SEEN: "true"
-  DEBIAN_FRONTEND: noninteractive
-  APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE: DontWarn
 
 jobs:
   publish-terraform: