From 7948f0dae8182a7b6d710645c56e005a7776ada3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?c=C4=83t=C4=83lin?= Date: Sat, 4 Apr 2026 12:59:32 +0200 Subject: [PATCH] wip --- .woodpecker/{test.yaml => fmt.yaml} | 0 Makefile | 4 +++- k8s/playground/nfstest/pod.yaml | 19 ------------------- k8s/playground/nfstest/pvc.yaml | 14 -------------- k8s/playground/nfstest/pvwithnfs.yaml | 15 --------------- tofu/modules/authentik-app/vars.tf | 22 ---------------------- 6 files changed, 3 insertions(+), 71 deletions(-) rename .woodpecker/{test.yaml => fmt.yaml} (100%) delete mode 100644 k8s/playground/nfstest/pod.yaml delete mode 100644 k8s/playground/nfstest/pvc.yaml delete mode 100644 k8s/playground/nfstest/pvwithnfs.yaml diff --git a/.woodpecker/test.yaml b/.woodpecker/fmt.yaml similarity index 100% rename from .woodpecker/test.yaml rename to .woodpecker/fmt.yaml diff --git a/Makefile b/Makefile index e016d7e..9770437 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,9 @@ fmt--pre-commit: pre-commit run --all-files --color always fmt--kubeconform: - kubeconform -strict -ignore-missing-schemas k8s/ + kubeconform -strict -ignore-missing-schemas k8s/argo-apps + kubeconform -strict -ignore-missing-schemas k8s/services + fmt--tflint: tflint --recursive diff --git a/k8s/playground/nfstest/pod.yaml b/k8s/playground/nfstest/pod.yaml deleted file mode 100644 index 6cb0319..0000000 --- a/k8s/playground/nfstest/pod.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -kind: Pod -apiVersion: v1 -metadata: - name: pod-using-nfs - namespace: apps-fuku -spec: - containers: - - name: app - image: alpine - volumeMounts: - - name: data - mountPath: /var/nfs - command: ["/bin/sh"] - args: ["-c", "sleep 500000"] - volumes: - - name: data - persistentVolumeClaim: - claimName: myapp-nfs diff --git a/k8s/playground/nfstest/pvc.yaml b/k8s/playground/nfstest/pvc.yaml deleted file mode 100644 index 723a948..0000000 --- a/k8s/playground/nfstest/pvc.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: myapp-nfs - namespace: apps-fuku -spec: - accessModes: - - ReadWriteMany - storageClassName: "" - volumeName: nas1 - resources: - requests: - storage: 5Gi diff --git a/k8s/playground/nfstest/pvwithnfs.yaml b/k8s/playground/nfstest/pvwithnfs.yaml deleted file mode 100644 index 994fd5c..0000000 --- a/k8s/playground/nfstest/pvwithnfs.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolume -metadata: - name: nas1 - namespace: apps-fuku -spec: - capacity: - storage: 5Gi - accessModes: - - ReadWriteMany - persistentVolumeReclaimPolicy: Retain - nfs: - server: zeruel.fuku - path: /mnt/pool1/nas1 diff --git a/tofu/modules/authentik-app/vars.tf b/tofu/modules/authentik-app/vars.tf index 445710f..099440b 100644 --- a/tofu/modules/authentik-app/vars.tf +++ b/tofu/modules/authentik-app/vars.tf @@ -8,33 +8,11 @@ variable "app_slug" { type = string } - -variable "client_type" { - type = string - default = "confidential" - - validation { - condition = contains(["confidential", "public"], var.client_type) - error_message = "client_type must be 'confidential' or 'public'" - } -} - variable "app_access_group_id" { description = "ID of a group which will have access to the app" type = string } -variable "sub_mode" { - type = string - default = "user_username" - - validation { - condition = contains(["user_id", "user_username", "hashed_user_id"], var.sub_mode) - error_message = "sub_mode must be 'user_id', 'user_username' or 'hashed_user_id'" - } -} - - variable "open_in_new_tab" { type = bool description = "Open apps in a new tab"