Compare commits

..

2 Commits

Author SHA1 Message Date
t.behrendt 5669daf771 Merge branch 'main' into renovate/pin-dependencies 2026-05-13 22:36:09 +02:00
renovate-bot fe234fdf8f chore(deps): pin https://gitea.t000-n.de/t.behrendt/k_deploy_actions action to 244a648
renovate/stability-days Updates have not met minimum release age requirement
2026-04-29 18:34:22 +00:00
4 changed files with 27 additions and 41 deletions
+7 -13
View File
@@ -28,11 +28,6 @@ on:
required: false required: false
default: "{}" default: "{}"
type: string type: string
namespace:
description: "Override the default namespace (extracted from repository name)"
required: false
default: ""
type: string
jobs: jobs:
detect-service-type: detect-service-type:
@@ -41,7 +36,7 @@ jobs:
has_helmfile: ${{ steps.check-helmfile.outputs.exists }} has_helmfile: ${{ steps.check-helmfile.outputs.exists }}
has_k8s: ${{ steps.check-k8s.outputs.exists }} has_k8s: ${{ steps.check-k8s.outputs.exists }}
steps: steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Check if helmfile.yaml exists - name: Check if helmfile.yaml exists
id: check-helmfile id: check-helmfile
run: | run: |
@@ -68,7 +63,7 @@ jobs:
needs: detect-service-type needs: detect-service-type
if: inputs.skip_shared_secrets_deployment != 'true' if: inputs.skip_shared_secrets_deployment != 'true'
steps: steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: https://gitea.t000-n.de/t.behrendt/k_deploy_actions/.gitea/actions/extract-namespace-from-repo-name@244a64884838c35a5fc0dc42e0b82bb70b253dfc # 0.0.1 - uses: https://gitea.t000-n.de/t.behrendt/k_deploy_actions/.gitea/actions/extract-namespace-from-repo-name@244a64884838c35a5fc0dc42e0b82bb70b253dfc # 0.0.1
id: namespace id: namespace
with: with:
@@ -81,7 +76,7 @@ jobs:
- name: Set restic backup secret - name: Set restic backup secret
uses: azure/k8s-create-secret@5e49ad902ac755e0815974a44904c728da961747 # v6.0.0 uses: azure/k8s-create-secret@5e49ad902ac755e0815974a44904c728da961747 # v6.0.0
with: with:
namespace: ${{ inputs.namespace || steps.namespace.outputs.namespace }} namespace: ${{ steps.namespace.outputs.namespace }}
secret-name: backupsidecar-secret secret-name: backupsidecar-secret
secret-type: generic secret-type: generic
data: | data: |
@@ -97,7 +92,7 @@ jobs:
needs: detect-service-type needs: detect-service-type
if: needs.detect-service-type.outputs.has_k8s == 'true' if: needs.detect-service-type.outputs.has_k8s == 'true'
steps: steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: https://gitea.t000-n.de/t.behrendt/k_deploy_actions/.gitea/actions/extract-namespace-from-repo-name@244a64884838c35a5fc0dc42e0b82bb70b253dfc # 0.0.1 - uses: https://gitea.t000-n.de/t.behrendt/k_deploy_actions/.gitea/actions/extract-namespace-from-repo-name@244a64884838c35a5fc0dc42e0b82bb70b253dfc # 0.0.1
id: namespace id: namespace
with: with:
@@ -113,7 +108,7 @@ jobs:
action: deploy action: deploy
manifests: "${{ inputs.k8s_dir }}" manifests: "${{ inputs.k8s_dir }}"
strategy: basic strategy: basic
namespace: ${{ inputs.namespace || steps.namespace.outputs.namespace }} namespace: ${{ steps.namespace.outputs.namespace }}
deploy-helm: deploy-helm:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -123,7 +118,7 @@ jobs:
needs.detect-service-type.outputs.has_k8s == 'true' && needs.detect-service-type.outputs.has_k8s == 'true' &&
inputs.skip_helm_deployment != 'true' inputs.skip_helm_deployment != 'true'
steps: steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: https://gitea.t000-n.de/t.behrendt/k_deploy_actions/.gitea/actions/extract-namespace-from-repo-name@244a64884838c35a5fc0dc42e0b82bb70b253dfc # 0.0.1 - uses: https://gitea.t000-n.de/t.behrendt/k_deploy_actions/.gitea/actions/extract-namespace-from-repo-name@244a64884838c35a5fc0dc42e0b82bb70b253dfc # 0.0.1
id: namespace id: namespace
with: with:
@@ -135,10 +130,9 @@ jobs:
method: kubeconfig method: kubeconfig
kubeconfig: ${{ secrets.KUBECONFIG }} kubeconfig: ${{ secrets.KUBECONFIG }}
- name: Deploy Helm - name: Deploy Helm
uses: helmfile/helmfile-action@daefb3e1fa5a91b7a88d30870d20da4896944818 # v2.4.5 uses: helmfile/helmfile-action@02671705b1dda1dc4b0a4ddd4f9f1ea8f4568c6f # v2.4.3
with: with:
helmfile-args: apply helmfile-args: apply
namespace: ${{ inputs.namespace || steps.namespace.outputs.namespace }}
env: ${{ fromJSON(inputs.helmfile_env) }} env: ${{ fromJSON(inputs.helmfile_env) }}
# Summary job that always runs to show what was deployed # Summary job that always runs to show what was deployed
+2 -2
View File
@@ -14,12 +14,12 @@ jobs:
name: Release name: Release
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Increment tag - name: Increment tag
id: tag id: tag
uses: https://gitea.t000-n.de/t.behrendt/conventional-semantic-git-tag-increment@b8806ee0141a44be30e8734dff15001361be100c # 0.1.35 uses: https://gitea.t000-n.de/t.behrendt/conventional-semantic-git-tag-increment@ef0c23189db33220a73022d8c29a27709d0df440 # 0.1.32
with: with:
token: ${{ secrets.GITEA_TOKEN }} token: ${{ secrets.GITEA_TOKEN }}
- name: Push tag - name: Push tag
+5 -11
View File
@@ -23,11 +23,6 @@ on:
required: false required: false
default: "{}" default: "{}"
type: string type: string
namespace:
description: "Override the default namespace (extracted from repository name)"
required: false
default: ""
type: string
jobs: jobs:
detect-service-type: detect-service-type:
@@ -36,7 +31,7 @@ jobs:
has_helmfile: ${{ steps.check-helmfile.outputs.exists }} has_helmfile: ${{ steps.check-helmfile.outputs.exists }}
has_k8s: ${{ steps.check-k8s.outputs.exists }} has_k8s: ${{ steps.check-k8s.outputs.exists }}
steps: steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Check if helmfile.yaml exists - name: Check if helmfile.yaml exists
id: check-helmfile id: check-helmfile
run: | run: |
@@ -63,7 +58,7 @@ jobs:
needs: detect-service-type needs: detect-service-type
if: needs.detect-service-type.outputs.has_k8s == 'true' if: needs.detect-service-type.outputs.has_k8s == 'true'
steps: steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: https://gitea.t000-n.de/t.behrendt/k_deploy_actions/.gitea/actions/extract-namespace-from-repo-name@244a64884838c35a5fc0dc42e0b82bb70b253dfc # 0.0.1 - uses: https://gitea.t000-n.de/t.behrendt/k_deploy_actions/.gitea/actions/extract-namespace-from-repo-name@244a64884838c35a5fc0dc42e0b82bb70b253dfc # 0.0.1
id: namespace id: namespace
with: with:
@@ -76,7 +71,7 @@ jobs:
- name: Validate k8s manifests - name: Validate k8s manifests
uses: azure/k8s-lint@e4234c50ea835112e72b145bdecd00a94bad42fd # v4.0.0 uses: azure/k8s-lint@e4234c50ea835112e72b145bdecd00a94bad42fd # v4.0.0
with: with:
namespace: ${{ inputs.namespace || steps.namespace.outputs.namespace }} namespace: ${{ steps.namespace.outputs.namespace }}
lintType: dryrun lintType: dryrun
manifests: "${{ inputs.k8s_dir }}" manifests: "${{ inputs.k8s_dir }}"
@@ -88,7 +83,7 @@ jobs:
needs.detect-service-type.outputs.has_k8s == 'true' && needs.detect-service-type.outputs.has_k8s == 'true' &&
inputs.skip_helm_validation != 'true' inputs.skip_helm_validation != 'true'
steps: steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: https://gitea.t000-n.de/t.behrendt/k_deploy_actions/.gitea/actions/extract-namespace-from-repo-name@244a64884838c35a5fc0dc42e0b82bb70b253dfc # 0.0.1 - uses: https://gitea.t000-n.de/t.behrendt/k_deploy_actions/.gitea/actions/extract-namespace-from-repo-name@244a64884838c35a5fc0dc42e0b82bb70b253dfc # 0.0.1
id: namespace id: namespace
with: with:
@@ -100,10 +95,9 @@ jobs:
method: kubeconfig method: kubeconfig
kubeconfig: ${{ secrets.KUBECONFIG }} kubeconfig: ${{ secrets.KUBECONFIG }}
- name: Validate Helm - name: Validate Helm
uses: helmfile/helmfile-action@daefb3e1fa5a91b7a88d30870d20da4896944818 # v2.4.5 uses: helmfile/helmfile-action@02671705b1dda1dc4b0a4ddd4f9f1ea8f4568c6f # v2.4.3
with: with:
helmfile-args: diff helmfile-args: diff
namespace: ${{ inputs.namespace || steps.namespace.outputs.namespace }}
env: ${{ fromJSON(inputs.helmfile_env) }} env: ${{ fromJSON(inputs.helmfile_env) }}
# Summary job that always runs to show what was validated # Summary job that always runs to show what was validated
+2 -4
View File
@@ -51,23 +51,21 @@ jobs:
### CI (`.gitea/workflows/ci.yaml`) ### CI (`.gitea/workflows/ci.yaml`)
| Parameter | Description | Default | Required | | Parameter | Description | Default | Required |
| ---------------------- | --------------------------------------------------------------- | --------------- | -------- | | ---------------------- | -------------------------------------------- | --------------- | -------- |
| `k8s_dir` | Path to Kubernetes manifests directory | `k8s/` | No | | `k8s_dir` | Path to Kubernetes manifests directory | `k8s/` | No |
| `helmfile_path` | Path to helmfile.yaml | `helmfile.yaml` | No | | `helmfile_path` | Path to helmfile.yaml | `helmfile.yaml` | No |
| `skip_helm_validation` | Skip Helm validation even if helmfile exists | `false` | No | | `skip_helm_validation` | Skip Helm validation even if helmfile exists | `false` | No |
| `helmfile_env` | JSON object string passed as env to helmfile | `{}` | No | | `helmfile_env` | JSON object string passed as env to helmfile | `{}` | No |
| `namespace` | Override the default namespace (extracted from repository name) | `""` | No |
### CD (`.gitea/workflows/cd.yaml`) ### CD (`.gitea/workflows/cd.yaml`)
| Parameter | Description | Default | Required | | Parameter | Description | Default | Required |
| -------------------------------- | --------------------------------------------------------------- | --------------- | -------- | | -------------------------------- | -------------------------------------------- | --------------- | -------- |
| `k8s_dir` | Path to Kubernetes manifests directory | `k8s/` | No | | `k8s_dir` | Path to Kubernetes manifests directory | `k8s/` | No |
| `helmfile_path` | Path to helmfile.yaml | `helmfile.yaml` | No | | `helmfile_path` | Path to helmfile.yaml | `helmfile.yaml` | No |
| `skip_helm_deployment` | Skip Helm deployment even if helmfile exists | `false` | No | | `skip_helm_deployment` | Skip Helm deployment even if helmfile exists | `false` | No |
| `skip_shared_secrets_deployment` | Skip shared secrets deployment | `false` | No | | `skip_shared_secrets_deployment` | Skip shared secrets deployment | `false` | No |
| `helmfile_env` | JSON object string passed as env to helmfile | `{}` | No | | `helmfile_env` | JSON object string passed as env to helmfile | `{}` | No |
| `namespace` | Override the default namespace (extracted from repository name) | `""` | No |
## Directory Structure Requirements ## Directory Structure Requirements