Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions .github/workflows/build-and-prepare-release-reusable-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,15 @@ on:
workflow-token:
required: true

permissions:
packages: read
contents: read
pull-requests: read

jobs:
build_and_push:
name: Build and Push Container
runs-on: isisbusapps-proxmox-dind
runs-on: fase-self-hosted-dind
timeout-minutes: 30
permissions:
packages: write
Expand Down Expand Up @@ -115,8 +120,8 @@ jobs:

update_gitops:
name: Update GitOps Repository
runs-on: isisbusapps-proxmox
container: ghcr.io/catthehacker/ubuntu:act-24.04
runs-on: fase-self-hosted
container: ghcr.io/isisbusapps/fase-gh-runner-container:latest
timeout-minutes: 10
needs: build_and_push
outputs:
Expand Down Expand Up @@ -178,8 +183,8 @@ jobs:

trigger_pr:
name: Trigger PR Creation
runs-on: isisbusapps-proxmox
container: ghcr.io/catthehacker/ubuntu:act-24.04
runs-on: fase-self-hosted
container: ghcr.io/isisbusapps/fase-gh-runner-container:latest
timeout-minutes: 5
needs: update_gitops
steps:
Expand All @@ -197,8 +202,8 @@ jobs:

create_tags:
name: Create Git Tags
runs-on: isisbusapps-proxmox
container: ghcr.io/catthehacker/ubuntu:act-24.04
runs-on: fase-self-hosted
container: ghcr.io/isisbusapps/fase-gh-runner-container:latest
timeout-minutes: 5
needs: build_and_push
permissions:
Expand All @@ -216,8 +221,8 @@ jobs:

create_release:
name: Create GitHub Pre-Release
runs-on: isisbusapps-proxmox
container: ghcr.io/catthehacker/ubuntu:act-24.04
runs-on: fase-self-hosted
container: ghcr.io/isisbusapps/fase-gh-runner-container:latest
timeout-minutes: 10
needs: create_tags
permissions:
Expand Down Expand Up @@ -249,8 +254,8 @@ jobs:

open_hotfix_pr:
name: Open Hotfix PR
runs-on: isisbusapps-proxmox
container: ghcr.io/catthehacker/ubuntu:act-24.04
runs-on: fase-self-hosted
container: ghcr.io/isisbusapps/fase-gh-runner-container:latest
timeout-minutes: 5
needs: create_tags
if: inputs.is-hotfix
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/dev-build-cm-reusable-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ on:
type: string
default: 'isisbusapps/gitops'
runner_label:
description: 'isisbusapps-proxmox runner label to target e.g. isisbusapps-proxmox or k8s-prod-runner)'
description: 'fase-self-hosted runner label to target e.g. fase-self-hosted or k8s-prod-runner)'
type: string
required: false
default: 'isisbusapps-proxmox'
default: 'fase-self-hosted'
secrets:
workflow-token:
description: 'PAT with repo+workflow scope for the GitOps repo'
Expand All @@ -37,11 +37,16 @@ on:
description: 'The .data key the file was stored under'
value: ${{ jobs.generate-configmap.outputs.data_key_used }}

permissions:
packages: read
contents: read
pull-requests: read

jobs:
generate-configmap:
name: Generate & Commit ConfigMap
runs-on: ${{ inputs.runner_label }}
container: ghcr.io/catthehacker/ubuntu:act-24.04
container: ghcr.io/isisbusapps/fase-gh-runner-container:latest
timeout-minutes: 30
permissions:
packages: write
Expand Down Expand Up @@ -104,8 +109,8 @@ jobs:

update_gitops:
name: Update GitOps Repository
runs-on: ghcr.io/catthehacker/ubuntu:act-24.04
container: ghcr.io/catthehacker/ubuntu:act-24.04
runs-on: fase-self-hosted
container: ghcr.io/isisbusapps/fase-gh-runner-container:latest
timeout-minutes: 10
needs: generate-configmap
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/dev-build-reusable-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,15 @@ on:
description: 'PAT with repo+workflow scope for the GitOps repo'
required: true

permissions:
packages: read
contents: read
pull-requests: read

jobs:
build_and_push:
name: Build and Push Container
runs-on: isisbusapps-proxmox-dind
runs-on: fase-self-hosted-dind
timeout-minutes: 30
permissions:
packages: write
Expand Down Expand Up @@ -107,8 +112,8 @@ jobs:

update_gitops:
name: Update GitOps Repository
runs-on: isisbusapps-proxmox
container: ghcr.io/catthehacker/ubuntu:act-24.04
runs-on: fase-self-hosted
container: ghcr.io/isisbusapps/fase-gh-runner-container:latest
timeout-minutes: 10
needs: build_and_push
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
Expand Down