diff --git a/.github/labeler.yaml b/.github/labeler.yaml index a6f857b0..5aef1eda 100644 --- a/.github/labeler.yaml +++ b/.github/labeler.yaml @@ -1,4 +1,5 @@ --- +# Areas area/bootstrap: - changed-files: - any-glob-to-any-file: bootstrap/**/* @@ -10,5 +11,10 @@ area/kubernetes: - any-glob-to-any-file: kubernetes/**/* area/taskfile: - changed-files: - - any-glob-to-any-file: .taskfiles/**/* - - any-glob-to-any-file: Taskfile* + - any-glob-to-any-file: + - ".taskfiles/**/*" + - "Taskfile.yaml" +# Clusters +cluster/main: + - changed-files: + - any-glob-to-any-file: "kubernetes/main/**/*" diff --git a/.github/labels.yaml b/.github/labels.yaml index 6021b69c..4a356e3c 100644 --- a/.github/labels.yaml +++ b/.github/labels.yaml @@ -1,20 +1,41 @@ --- -# Area -- { name: "area/bootstrap", color: "0e8a16" } -- { name: "area/github", color: "0e8a16" } -- { name: "area/kubernetes", color: "0e8a16" } -- { name: "area/taskfile", color: "0e8a16" } +# Areas +- name: area/bootstrap + color: "0e8a16" +- name: area/github + color: "0e8a16" +- name: area/kubernetes + color: "0e8a16" +- name: area/taskfile + color: "0e8a16" # Distro -- { name: "distro/talos", color: "ffc300" } -# Renovate -- { name: "renovate/container", color: "027fa0" } -- { name: "renovate/github-action", color: "027fa0" } -- { name: "renovate/github-release", color: "027fa0" } -- { name: "renovate/helm", color: "027fa0" } -# Semantic Type -- { name: "type/patch", color: "ffec19" } -- { name: "type/minor", color: "ff9800" } -- { name: "type/major", color: "f6412d" } -- { name: "type/break", color: "f6412d" } +- name: "distro/talos" + color: "ffc300" +# Clusters +- name: cluster/main + color: "ffc300" +# Renovate Types +- name: renovate/container + color: "027fa0" +- name: renovate/github-action + color: "027fa0" +- name: renovate/grafana-dashboard + color: "027fa0" +- name: renovate/github-release + color: "027fa0" +- name: renovate/helm + color: "027fa0" +# Semantic Types +- name: type/digest + color: "ffeC19" +- name: type/patch + color: "ffeC19" +- name: type/minor + color: "ff9800" +- name: type/major + color: "f6412d" # Uncategorized -- { name: "hold/upstream", color: "ee0701" } +- name: community + color: "370fb2" +- name: hold + color: "ee0701" diff --git a/.github/workflows/flux-diff.yaml b/.github/workflows/flux-diff.yaml index 962078a5..a91144e1 100644 --- a/.github/workflows/flux-diff.yaml +++ b/.github/workflows/flux-diff.yaml @@ -6,7 +6,6 @@ on: pull_request: branches: ["main"] paths: ["kubernetes/**"] - # paths: ["kubernetes/**", "bootstrap/**"] concurrency: group: ${{ github.workflow }}-${{ github.event.number || github.ref }} @@ -36,12 +35,10 @@ jobs: id: changed-clusters uses: tj-actions/changed-files@v45 with: - files: | - kubernetes/** -# bootstrap/** + files: kubernetes/** + files_ignore: kubernetes/shared/** dir_names: true dir_names_max_depth: 2 - # dir_names_max_depth: 3 matrix: true - name: List All Changed Clusters @@ -52,12 +49,10 @@ jobs: runs-on: ubuntu-latest needs: ["changed-clusters"] permissions: - #contents: read pull-requests: write strategy: matrix: - #paths: ["kubernetes"] - paths: ${{ fromJSON(needs.changed-clusters.outputs.matrix) }} # use this once moved to cluster structure + paths: ${{ fromJSON(needs.changed-clusters.outputs.matrix) }} resources: ["helmrelease", "kustomization"] max-parallel: 4 fail-fast: false @@ -82,11 +77,8 @@ jobs: ref: "${{ github.event.repository.default_branch }}" path: default - - name: Print "matrix.paths" - run: echo ${{ matrix.paths }} - - name: Diff Resources - uses: docker://ghcr.io/allenporter/flux-local:v6.1.0 + uses: docker://ghcr.io/allenporter/flux-local:v6.1.1 with: args: >- diff ${{ matrix.resources }} diff --git a/.github/workflows/flux-image-test.yaml b/.github/workflows/flux-image-test.yaml index 53bc9d88..c9553363 100644 --- a/.github/workflows/flux-image-test.yaml +++ b/.github/workflows/flux-image-test.yaml @@ -36,6 +36,7 @@ jobs: uses: tj-actions/changed-files@v45 with: files: kubernetes/** + files_ignore: kubernetes/shared/** dir_names: true dir_names_max_depth: 2 matrix: true @@ -51,8 +52,7 @@ jobs: pull-requests: write strategy: matrix: - #paths: ["kubernetes"] - paths: ${{ fromJSON(needs.changed-clusters.outputs.matrix) }} # use this once moved to cluster structure + paths: ${{ fromJSON(needs.changed-clusters.outputs.matrix) }} max-parallel: 4 fail-fast: false outputs: @@ -86,7 +86,7 @@ jobs: path: pull - name: Gather Images in Default Branch - uses: docker://ghcr.io/allenporter/flux-local:v6.1.0 + uses: docker://ghcr.io/allenporter/flux-local:v6.1.1 with: args: >- get cluster @@ -96,7 +96,7 @@ jobs: --output-file default.yaml - name: Gather Images in Pull Request Branch - uses: docker://ghcr.io/allenporter/flux-local:v6.1.0 + uses: docker://ghcr.io/allenporter/flux-local:v6.1.1 with: args: >- get cluster diff --git a/.github/workflows/labeler.yaml b/.github/workflows/labeler.yaml index d658c1d9..ef5c43af 100644 --- a/.github/workflows/labeler.yaml +++ b/.github/workflows/labeler.yaml @@ -11,11 +11,17 @@ jobs: labeler: name: Labeler runs-on: ubuntu-latest - permissions: - contents: read - pull-requests: write + if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} 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: Labeler uses: actions/labeler@v5 with: + repo-token: "${{ steps.app-token.outputs.token }}" configuration-path: .github/labeler.yaml diff --git a/kubernetes/main/apps/default/homepage/app/helmrelease.yaml b/kubernetes/main/apps/default/homepage/app/helmrelease.yaml index df0cf688..d88d1e98 100644 --- a/kubernetes/main/apps/default/homepage/app/helmrelease.yaml +++ b/kubernetes/main/apps/default/homepage/app/helmrelease.yaml @@ -32,7 +32,7 @@ spec: app: image: repository: ghcr.io/gethomepage/homepage - tag: v0.10.4 + tag: v0.10.5 env: TZ: Europe/London envFrom: