From 73e8f2e9650b4237f8d31fc70f8efe169ddb9b35 Mon Sep 17 00:00:00 2001
From: Raiko Koosaar <rkoosaar@gmail.com>
Date: Tue, 5 Nov 2024 22:29:06 +0000
Subject: [PATCH] renovate again - fixes

---
 .../workflows => .archive}/flux-hr-sync.yaml  |  0
 .github/workflows/flux-diff.yaml              | 78 +++++++++----------
 2 files changed, 35 insertions(+), 43 deletions(-)
 rename {.github/workflows => .archive}/flux-hr-sync.yaml (100%)

diff --git a/.github/workflows/flux-hr-sync.yaml b/.archive/flux-hr-sync.yaml
similarity index 100%
rename from .github/workflows/flux-hr-sync.yaml
rename to .archive/flux-hr-sync.yaml
diff --git a/.github/workflows/flux-diff.yaml b/.github/workflows/flux-diff.yaml
index 3e04c755..c6abbdc4 100644
--- a/.github/workflows/flux-diff.yaml
+++ b/.github/workflows/flux-diff.yaml
@@ -12,47 +12,48 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  changed-clusters:
-    name: Changed Clusters
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.changed-clusters.outputs.all_changed_and_modified_files }}
-    steps:
-      - name: Generate Token
-        uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: "${{ secrets.BOT_APP_ID }}"
-          private-key: "${{ secrets.BOT_APP_PRIVATE_KEY }}"
+  # changed-clusters:
+  #   name: Changed Clusters
+  #   runs-on: ubuntu-latest
+  #   outputs:
+  #     matrix: ${{ steps.changed-clusters.outputs.all_changed_and_modified_files }}
+  #   steps:
+  #     - name: Generate Token
+  #       uses: actions/create-github-app-token@v1
+  #       id: app-token
+  #       with:
+  #         app-id: "${{ secrets.BOT_APP_ID }}"
+  #         private-key: "${{ secrets.BOT_APP_PRIVATE_KEY }}"
 
-      - name: Checkout Default Branch
-        uses: actions/checkout@v4
-        with:
-          token: "${{ steps.app-token.outputs.token }}"
-          fetch-depth: 0
+  #     - name: Checkout Default Branch
+  #       uses: actions/checkout@v4
+  #       with:
+  #         token: "${{ steps.app-token.outputs.token }}"
+  #         fetch-depth: 0
 
-      - name: Get Changed Clusters
-        id: changed-clusters
-        uses: tj-actions/changed-files@v45
-        with:
-          files: kubernetes/**
-          dir_names: true
-          dir_names_max_depth: 2
-          matrix: true
+  #     - name: Get Changed Clusters
+  #       id: changed-clusters
+  #       uses: tj-actions/changed-files@v45
+  #       with:
+  #         files: kubernetes/**
+  #         dir_names: true
+  #         dir_names_max_depth: 2
+  #         matrix: true
 
-      - name: List All Changed Clusters
-        run: echo "${{ steps.changed-clusters.outputs.all_changed_and_modified_files }}"
+  #     - name: List All Changed Clusters
+  #       run: echo "${{ steps.changed-clusters.outputs.all_changed_and_modified_files }}"
 
   flux-diff:
     name: Flux Diff
     runs-on: ubuntu-latest
-    needs: ["changed-clusters"]
+    #needs: ["changed-clusters"]
     permissions:
+      contents: read
       pull-requests: write
     strategy:
       matrix:
-        #paths: ${{ fromJSON(needs.changed-clusters.outputs.matrix) }}
         paths: ["kubernetes"]
+        #paths: ${{ fromJSON(needs.changed-clusters.outputs.matrix) }}
         resources: ["helmrelease", "kustomization"]
       max-parallel: 4
       fail-fast: false
@@ -64,11 +65,11 @@ jobs:
           app-id: "${{ secrets.BOT_APP_ID }}"
           private-key: "${{ secrets.BOT_APP_PRIVATE_KEY }}"
 
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          token: "${{ steps.app-token.outputs.token }}"
-          path: pull
+      # - name: Checkout
+      #   uses: actions/checkout@v4
+      #   with:
+      #     token: "${{ steps.app-token.outputs.token }}"
+      #     path: pull
 
       - name: Checkout Default Branch
         uses: actions/checkout@v4
@@ -80,15 +81,6 @@ jobs:
       - name: Print "matrix.paths"
         run: echo ${{ matrix.paths }}
 
-      - name: Print "matrix.paths2"
-        run: echo ${{ fromJSON(needs.changed-clusters.outputs.matrix) }}
-
-      - name: Print "matrix.resources"
-        run: echo ${{ matrix.resources }}
-      # --path /github/workspace/pull/${{ matrix.paths }}/flux < use this if using matrix: true
-      # --path-orig /github/workspace/default/${{ matrix.paths }}/flux < use this if using matrix: true
-      #             --path-orig /github/workspace/default/kubernetes/flux
-      #            --path /github/workspace/pull/kubernetes/flux
       - name: Diff Resources
         uses: docker://ghcr.io/allenporter/flux-local:v6.0.1
         with: