feat: renovate aqua config file and move scripts to .github

Signed-off-by: Devin Buhl <[email protected]>
onedr0p · Dec 20, 2023 · 139f07f · 139f07f
1 parent a18f9c6
commit 139f07f
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 21 deletions.
diff --git a/.github/workflows/resources/aqua.yaml → .github/aqua.yaml b/.github/workflows/resources/aqua.yaml → .github/aqua.yaml
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -11,6 +11,7 @@
     ":semanticCommits",
     ":skipStatusChecks",
     ":timezone(America/New_York)",
+    "github>aquaproj/aqua-renovate-config:file#1.13.0(.github/aqua.yaml)",
     "github>onedr0p/home-ops//.github/renovate/allowedVersions.json5",
     "github>onedr0p/home-ops//.github/renovate/autoMerge.json5",
     "github>onedr0p/home-ops//.github/renovate/clusters.json5",

diff --git a/...ub/workflows/resources/extract-images.mjs → .github/scripts/extract-images.mjs b/...ub/workflows/resources/extract-images.mjs → .github/scripts/extract-images.mjs
diff --git a/.github/workflows/resources/kubeconform.sh → .github/scripts/kubeconform.sh b/.github/workflows/resources/kubeconform.sh → .github/scripts/kubeconform.sh
diff --git a/.github/workflows/aqua-test.yaml b/.github/workflows/aqua-test.yaml
@@ -8,7 +8,7 @@ on:
     branches: ["main"]
 
 env:
-  AQUA_CONFIG: ./.github/workflows/resources/aqua.yaml
+  AQUA_CONFIG: ./.github/aqua.yaml
   DEBCONF_NONINTERACTIVE_SEEN: "true"
   DEBIAN_FRONTEND: noninteractive
   APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE: DontWarn
@@ -39,7 +39,7 @@ jobs:
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: ~/.local/share/aquaproj-aqua
-          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/workflows/resources/aqua.yaml')}}
+          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/aqua.yaml')}}
           restore-keys: |
             v1-aqua-installer-${{runner.os}}-${{runner.arch}}-
 

diff --git a/.github/workflows/flux-diff.yaml b/.github/workflows/flux-diff.yaml
@@ -8,7 +8,7 @@ on:
     paths: ["kubernetes/**"]
 
 env:
-  AQUA_CONFIG: ./.github/workflows/resources/aqua.yaml
+  AQUA_CONFIG: ./.github/aqua.yaml
   DEBCONF_NONINTERACTIVE_SEEN: "true"
   DEBIAN_FRONTEND: noninteractive
   APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE: DontWarn
@@ -44,7 +44,7 @@ jobs:
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: ~/.local/share/aquaproj-aqua
-          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/workflows/resources/aqua.yaml')}}
+          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/aqua.yaml')}}
           restore-keys: |
             v1-aqua-installer-${{runner.os}}-${{runner.arch}}-
 

diff --git a/.github/workflows/flux-hr-image-test.yaml b/.github/workflows/flux-hr-image-test.yaml
@@ -8,7 +8,7 @@ on:
     paths: ["kubernetes/**/helmrelease.yaml"]
 
 env:
-  AQUA_CONFIG: ./.github/workflows/resources/aqua.yaml
+  AQUA_CONFIG: ./.github/aqua.yaml
   DEBCONF_NONINTERACTIVE_SEEN: "true"
   DEBIAN_FRONTEND: noninteractive
   APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE: DontWarn
@@ -79,7 +79,7 @@ jobs:
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: ~/.local/share/aquaproj-aqua
-          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/workflows/resources/aqua.yaml')}}
+          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/aqua.yaml')}}
           restore-keys: |
             v1-aqua-installer-${{runner.os}}-${{runner.arch}}-
 
@@ -94,7 +94,7 @@ jobs:
       - name: Extract Images from Helm Release
         id: extract-images
         run: |
-          images=$(npx zx ./.github/workflows/resources/extract-images.mjs --kubernetes-dir "${{ env.KUBERNETES_DIR }}" --helmrelease "${{ matrix.files }}")
+          images=$(npx zx ./.github/scripts/extract-images.mjs --kubernetes-dir "${{ env.KUBERNETES_DIR }}" --helmrelease "${{ matrix.files }}")
           echo "images=${images}" >> $GITHUB_OUTPUT
           echo "${images}"
 

diff --git a/.github/workflows/flux-hr-sync.yaml b/.github/workflows/flux-hr-sync.yaml
@@ -21,7 +21,7 @@ on:
     paths: ["kubernetes/**/helmrelease.yaml"]
 
 env:
-  AQUA_CONFIG: ./.github/workflows/resources/aqua.yaml
+  AQUA_CONFIG: ./.github/aqua.yaml
   DEBCONF_NONINTERACTIVE_SEEN: "true"
   DEBIAN_FRONTEND: noninteractive
   APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE: DontWarn
@@ -52,7 +52,7 @@ jobs:
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: ~/.local/share/aquaproj-aqua
-          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/workflows/resources/aqua.yaml')}}
+          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/aqua.yaml')}}
           restore-keys: |
             v1-aqua-installer-${{runner.os}}-${{runner.arch}}-
 

diff --git a/.github/workflows/flux-ks-sync.yaml b/.github/workflows/flux-ks-sync.yaml
@@ -8,11 +8,10 @@ on:
     paths: ["kubernetes/storage/**"]
 
 env:
-  AQUA_CONFIG: ./.github/workflows/resources/aqua.yaml
+  AQUA_CONFIG: ./.github/aqua.yaml
   DEBCONF_NONINTERACTIVE_SEEN: "true"
   DEBIAN_FRONTEND: noninteractive
   APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE: DontWarn
-  WORKFLOW_RESOURCE_DIR: ./.github/workflows/resources
 
 jobs:
   sync:
@@ -43,7 +42,7 @@ jobs:
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: ~/.local/share/aquaproj-aqua
-          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/workflows/resources/aqua.yaml')}}
+          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/aqua.yaml')}}
           restore-keys: |
             v1-aqua-installer-${{runner.os}}-${{runner.arch}}-
 

diff --git a/.github/workflows/kubeconform.yaml b/.github/workflows/kubeconform.yaml
@@ -9,11 +9,10 @@ on:
     paths: ["kubernetes/**"]
 
 env:
-  AQUA_CONFIG: ./.github/workflows/resources/aqua.yaml
+  AQUA_CONFIG: ./.github/aqua.yaml
   DEBCONF_NONINTERACTIVE_SEEN: "true"
   DEBIAN_FRONTEND: noninteractive
   APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE: DontWarn
-  WORKFLOW_RESOURCE_DIR: ./.github/workflows/resources
 
 jobs:
   kubeconform:
@@ -43,7 +42,7 @@ jobs:
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: ~/.local/share/aquaproj-aqua
-          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/workflows/resources/aqua.yaml')}}
+          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/aqua.yaml')}}
           restore-keys: |
             v1-aqua-installer-${{runner.os}}-${{runner.arch}}-
 
@@ -57,4 +56,4 @@ jobs:
 
       - name: Run kubeconform
         shell: bash
-        run: bash ${{ env.WORKFLOW_RESOURCE_DIR }}/kubeconform.sh ${{ matrix.path }}
+        run: bash ./.github/scripts/kubeconform.sh ${{ matrix.path }}
diff --git a/.github/workflows/publish-schemas.yaml b/.github/workflows/publish-schemas.yaml
@@ -11,7 +11,7 @@ on:
     paths: [".github/workflows/publish-schemas.yaml"]
 
 env:
-  AQUA_CONFIG: ./.github/workflows/resources/aqua.yaml
+  AQUA_CONFIG: ./.github/aqua.yaml
   DEBCONF_NONINTERACTIVE_SEEN: "true"
   DEBIAN_FRONTEND: noninteractive
   APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE: DontWarn
@@ -45,7 +45,7 @@ jobs:
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: ~/.local/share/aquaproj-aqua
-          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/workflows/resources/aqua.yaml')}}
+          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/aqua.yaml')}}
           restore-keys: |
             v1-aqua-installer-${{runner.os}}-${{runner.arch}}-
 

diff --git a/.github/workflows/publish-terraform.yaml b/.github/workflows/publish-terraform.yaml
@@ -9,11 +9,10 @@ on:
     paths: ["terraform/**"]
 
 env:
-  AQUA_CONFIG: ./.github/workflows/resources/aqua.yaml
+  AQUA_CONFIG: ./.github/aqua.yaml
   DEBCONF_NONINTERACTIVE_SEEN: "true"
   DEBIAN_FRONTEND: noninteractive
   APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE: DontWarn
-  WORKFLOW_RESOURCE_DIR: ./.github/workflows/resources
 
 jobs:
   publish-terraform:
@@ -43,7 +42,7 @@ jobs:
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: ~/.local/share/aquaproj-aqua
-          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/workflows/resources/aqua.yaml')}}
+          key: v1-aqua-installer-${{runner.os}}-${{runner.arch}}-${{hashFiles('./.github/aqua.yaml')}}
           restore-keys: |
             v1-aqua-installer-${{runner.os}}-${{runner.arch}}-