diff --git a/.forgejo/workflows/deploy-kaniko.yaml b/.forgejo/workflows/deploy-kaniko.yaml deleted file mode 100644 index f04bfcc..0000000 --- a/.forgejo/workflows/deploy-kaniko.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -name: Kaniko deployments - -on: # yamllint disable-line rule:truthy - push: - branches: - - 'main' - - 'ci/debug' - -jobs: - nextcloud: - runs-on: ubuntu-22.04 - steps: - - uses: https://code.forgejo.org/actions/checkout@v4 - - name: Kaniko build - uses: aevea/action-kaniko@v0.13.0 - with: - image: catalin/fukuops - username: kaniko - password: ${{ secrets.REGISTRY_PASSWORD }} - cache: true - registry: git.roboces.dev - tag: nextcloud-30.0.0 - path: docker/nextcloud diff --git a/.forgejo/workflows/deploy-tofu.yaml b/.forgejo/workflows/deploy-tofu.yaml index 85808a7..211d8db 100644 --- a/.forgejo/workflows/deploy-tofu.yaml +++ b/.forgejo/workflows/deploy-tofu.yaml @@ -5,6 +5,7 @@ on: # yamllint disable-line rule:truthy push: branches: - 'main' + - 'ci/debug' jobs: authentik: @@ -27,9 +28,7 @@ jobs: TF_VAR_portainer_client_id: ${{ secrets.TF_VAR_portainer_client_id }} TF_VAR_portainer_client_secret: ${{ secrets.TF_VAR_portainer_client_secret }} TF_VAR_paperless_client_id: ${{ secrets.TF_VAR_paperless_client_id }} - TF_VAR_paperless_client_secret: ${{ secrets.TF_VAR_paperless_secret }} - TF_VAR_netbird_client_id: ${{ secrets.TF_VAR_netbird_client_id }} - TF_VAR_netbird_client_secret: ${{ secrets.TF_VAR_netbird_client_secret }} + TF_VAR_paperless_client_secret: ${{ secrets.TF_VAR_paperless_client_secret }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} run: | diff --git a/Makefile b/Makefile index 737fe9b..95f8fbe 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,16 @@ lint--pre-commit: lint--kubeconform: kubeconform -strict -ignore-missing-schemas k8s/ +SHELl=/bin/bash +lint--kubescore: + kube-score score $$(find k8s -type f -print -name "*.yaml") + lint--tflint: tflint --recursive + lint: make lint--pre-commit make lint--kubeconform + make lint--kube make lint--tflint diff --git a/README.md b/README.md index 0ac9c44..4706caa 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,3 @@ [![Last build status](https://git.roboces.dev/catalin/fukuops/badges/workflows/ci.yaml/badge.svg)](https://git.roboces.dev/catalin/fukuops/actions) [![Tofu deployments](https://git.roboces.dev/catalin/fukuops/badges/workflows/deploy-tofu.yaml/badge.svg)](https://git.roboces.dev/catalin/fukuops/actions) -[![Kaniko deployments](https://git.roboces.dev/catalin/fukuops/badges/workflows/deploy-kaniko.yaml/badge.svg)](https://git.roboces.dev/catalin/fukuops/actions) diff --git a/k8s/argo-apps/factorio.yaml b/k8s/argo-apps/factorio.yaml index 50a35d3..e9517ef 100644 --- a/k8s/argo-apps/factorio.yaml +++ b/k8s/argo-apps/factorio.yaml @@ -20,7 +20,7 @@ spec: nodeSelector: kubernetes.io/hostname: agent1 image: - tag: 1.1.110 + tag: 1.1.101 factorioServer: save_name: fukurokuju admin_list: diff --git a/k8s/argo-apps/renovate.yaml b/k8s/argo-apps/renovate.yaml index 54d0ea8..89846b3 100644 --- a/k8s/argo-apps/renovate.yaml +++ b/k8s/argo-apps/renovate.yaml @@ -13,7 +13,7 @@ spec: sources: - chart: renovate repoURL: https://docs.renovatebot.com/helm-charts - targetRevision: 38.105.* + targetRevision: 38.101.* helm: valuesObject: renovate: