Compare commits

..

8 Commits

4 changed files with 23 additions and 47 deletions
+4 -19
View File
@@ -28,11 +28,6 @@ on:
required: false
default: "{}"
type: string
namespace:
description: "Override the default namespace (extracted from repository name)"
required: false
default: ""
type: string
jobs:
detect-service-type:
@@ -69,19 +64,10 @@ jobs:
if: inputs.skip_shared_secrets_deployment != 'true'
steps:
- 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@0.0.1
id: namespace
with:
repo: ${{ github.repository }}
- uses: azure/setup-kubectl@829323503d1be3d00ca8346e5391ca0b07a9ab0d # v5.1.0
- uses: azure/k8s-set-context@89b837d75b40a7bd2ddafde837473c212db8b313 # v5.0.0
with:
method: kubeconfig
kubeconfig: ${{ secrets.KUBECONFIG }}
- name: Set restic backup secret
uses: azure/k8s-create-secret@5e49ad902ac755e0815974a44904c728da961747 # v6.0.0
uses: azure/k8s-create-secret@6e0ba8047235646753f2a3a3b359b4d0006ff218 # v5.0.1
with:
namespace: ${{ inputs.namespace || steps.namespace.outputs.namespace }}
namespace: ${{ steps.namespace.outputs.namespace }}
secret-name: backupsidecar-secret
secret-type: generic
data: |
@@ -113,7 +99,7 @@ jobs:
action: deploy
manifests: "${{ inputs.k8s_dir }}"
strategy: basic
namespace: ${{ inputs.namespace || steps.namespace.outputs.namespace }}
namespace: ${{ steps.namespace.outputs.namespace }}
deploy-helm:
runs-on: ubuntu-latest
@@ -135,10 +121,9 @@ jobs:
method: kubeconfig
kubeconfig: ${{ secrets.KUBECONFIG }}
- name: Deploy Helm
uses: helmfile/helmfile-action@f6f7844b9e6d9f5ac8cf4cdae8ada1a42755c036 # v2.4.4
uses: helmfile/helmfile-action@02671705b1dda1dc4b0a4ddd4f9f1ea8f4568c6f # v2.4.3
with:
helmfile-args: apply
namespace: ${{ inputs.namespace || steps.namespace.outputs.namespace }}
env: ${{ fromJSON(inputs.helmfile_env) }}
# Summary job that always runs to show what was deployed
+3 -4
View File
@@ -5,9 +5,8 @@ on:
branches:
- main
paths:
- ".gitea/workflows/deploy.yaml"
- ".gitea/workflows/validate.yaml"
workflow_dispatch:
- ".gitea/workflows/cd.yaml"
- ".gitea/workflows/ci.yaml"
jobs:
release:
@@ -23,6 +22,6 @@ jobs:
with:
token: ${{ secrets.GITEA_TOKEN }}
- name: Push tag
uses: https://gitea.t000-n.de/t.behrendt/actions/release-git-tag@38c1bbd8bad3e7965744d03de85faa4a5b808d1b # 0.2.4
uses: https://gitea.t000-n.de/t.behrendt/actions/release-git-tag@47a1c635cfc76cfb4eeee3db0d0b89bf19007c7a # 0.2.3
with:
tag: ${{ steps.tag.outputs.new-tag }}
+3 -9
View File
@@ -23,11 +23,6 @@ on:
required: false
default: "{}"
type: string
namespace:
description: "Override the default namespace (extracted from repository name)"
required: false
default: ""
type: string
jobs:
detect-service-type:
@@ -74,9 +69,9 @@ jobs:
method: kubeconfig
kubeconfig: ${{ secrets.KUBECONFIG }}
- name: Validate k8s manifests
uses: azure/k8s-lint@e4234c50ea835112e72b145bdecd00a94bad42fd # v4.0.0
uses: azure/k8s-lint@6aefe5066f95e73d2b140d8835cc95583b886989 # v3.0.1
with:
namespace: ${{ inputs.namespace || steps.namespace.outputs.namespace }}
namespace: ${{ steps.namespace.outputs.namespace }}
lintType: dryrun
manifests: "${{ inputs.k8s_dir }}"
@@ -100,10 +95,9 @@ jobs:
method: kubeconfig
kubeconfig: ${{ secrets.KUBECONFIG }}
- name: Validate Helm
uses: helmfile/helmfile-action@f6f7844b9e6d9f5ac8cf4cdae8ada1a42755c036 # v2.4.4
uses: helmfile/helmfile-action@02671705b1dda1dc4b0a4ddd4f9f1ea8f4568c6f # v2.4.3
with:
helmfile-args: diff
namespace: ${{ inputs.namespace || steps.namespace.outputs.namespace }}
env: ${{ fromJSON(inputs.helmfile_env) }}
# Summary job that always runs to show what was validated
+2 -4
View File
@@ -51,23 +51,21 @@ jobs:
### CI (`.gitea/workflows/ci.yaml`)
| Parameter | Description | Default | Required |
| ---------------------- | --------------------------------------------------------------- | --------------- | -------- |
| ---------------------- | -------------------------------------------- | --------------- | -------- |
| `k8s_dir` | Path to Kubernetes manifests directory | `k8s/` | No |
| `helmfile_path` | Path to helmfile.yaml | `helmfile.yaml` | No |
| `skip_helm_validation` | Skip Helm validation even if helmfile exists | `false` | 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`)
| Parameter | Description | Default | Required |
| -------------------------------- | --------------------------------------------------------------- | --------------- | -------- |
| -------------------------------- | -------------------------------------------- | --------------- | -------- |
| `k8s_dir` | Path to Kubernetes manifests directory | `k8s/` | No |
| `helmfile_path` | Path to helmfile.yaml | `helmfile.yaml` | No |
| `skip_helm_deployment` | Skip Helm deployment even if helmfile exists | `false` | No |
| `skip_shared_secrets_deployment` | Skip shared secrets deployment | `false` | 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