diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 38c7531..a2ee59e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,6 +15,7 @@ repos: - --allow-multiple-documents - id: detect-private-key - id: trailing-whitespace + - repo: https://github.com/antonbabenko/pre-commit-terraform rev: v1.86.0 hooks: diff --git a/.tflint.hcl b/.tflint.hcl new file mode 100644 index 0000000..8482842 --- /dev/null +++ b/.tflint.hcl @@ -0,0 +1,4 @@ +plugin "terraform" { + enabled = true + preset = "recommended" +} diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..f6b3405 --- /dev/null +++ b/Makefile @@ -0,0 +1,16 @@ +lint--pre-commit: + pre-commit run --all-files --color always + +lint--kubeconform: + kubeconform -strict -ignore-missing-schemas k8s/ + +lint--kubescore: + kube-score score k8s/**.yaml + +lint--tflint: + tflint --recursive + +lint: + make lint--pre-commit + make lint--kubeconform + make lint--tflint diff --git a/ansible/k3s/roles/base/tasks/main.yml b/ansible/k3s/roles/base/tasks/main.yml index cbfd471..b7dd06b 100644 --- a/ansible/k3s/roles/base/tasks/main.yml +++ b/ansible/k3s/roles/base/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set same timezone on every Server community.general.timezone: name: "{{ system_timezone }}" - when: (system_timezone is defined) and (system_timezone != "Your/Timezone") + when: (system_timezone is defined) and (system_timezone != "Europe/Madrid") - name: Enable IPv4 forwarding ansible.posix.sysctl: diff --git a/tofu/adguard/main.tf b/tofu/adguard/main.tf index c4d8291..a9912bf 100644 --- a/tofu/adguard/main.tf +++ b/tofu/adguard/main.tf @@ -1,4 +1,5 @@ terraform { + required_version = ">= 1.6" backend "s3" { bucket = "fuku-terraform" key = "adguard/terraform" diff --git a/tofu/authentik/main.tf b/tofu/authentik/main.tf index 5ada1ce..efd5e0a 100644 --- a/tofu/authentik/main.tf +++ b/tofu/authentik/main.tf @@ -1,4 +1,5 @@ terraform { + required_version = ">= 1.6" backend "s3" { bucket = "fuku-terraform" key = "authentik/terraform" diff --git a/tofu/modules/authentik/main.tf b/tofu/modules/authentik/main.tf index 3a2f191..683693a 100644 --- a/tofu/modules/authentik/main.tf +++ b/tofu/modules/authentik/main.tf @@ -1,4 +1,5 @@ terraform { + required_version = ">= 1.6" required_providers { authentik = { source = "goauthentik/authentik" diff --git a/tofu/modules/proxmox-vm/main.tf b/tofu/modules/proxmox-vm/main.tf index 9e161d4..ac50cae 100644 --- a/tofu/modules/proxmox-vm/main.tf +++ b/tofu/modules/proxmox-vm/main.tf @@ -1,4 +1,5 @@ terraform { + required_version = ">= 1.6" required_providers { proxmox = { source = "thegameprofi/proxmox" diff --git a/tofu/modules/truenas-vm/.terraform.lock.hcl b/tofu/modules/truenas-vm/.terraform.lock.hcl deleted file mode 100644 index 2324926..0000000 --- a/tofu/modules/truenas-vm/.terraform.lock.hcl +++ /dev/null @@ -1,25 +0,0 @@ -# This file is maintained automatically by "tofu init". -# Manual edits may be lost in future updates. - -provider "registry.opentofu.org/dariusbakunas/truenas" { - version = "0.11.1" - constraints = "0.11.1" - hashes = [ - "h1:VZpXqjAwTxQwnSf/rBBcn5ZkcbgtZDkEu6yllNk0yQ0=", - "zh:00170d10b595cfbe78c3b1318c70bffd0a98c87ca25991d6e6d3b675f2e4ffab", - "zh:0fc0761abfc472e29649e3541af31935e0676f2c2e0ad845d1b2f6a0a45165f3", - "zh:146e8c81fd9d1b5d46300f57d06933b7c8eed139600a9b0d1b5100fc2e0967e4", - "zh:36e48d48699d9faf94288925a341b6c87294830db42bc0533ff4a58b514a741e", - "zh:40c7aa690d72a5b726d2a6c76087048db2c644b5b63140bf9af0e9328703f611", - "zh:4bcb5db073877278aff3d491093ef74c55052425afd7abafef529451ad78caf0", - "zh:64eef384c37600de1a968d3137e6d894c7ea8e67976e643c23153e9d7da36bf4", - "zh:95b68253ab3b79788d62ef6dc256354b455f3356d1fb7735f72dc84656d3bc88", - "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a7ed803e0debc70c66642049113ea344851427f1eb0b68e4a42d4e626d08b386", - "zh:af84dd19731286f967fe232a3b635611b01115814a1ee5613f91a08937d4458c", - "zh:d4850cbcac0d1dd0d665f110979bd9a2b48ec4a44764e478505da5d4f3303b82", - "zh:e5b354d783e9600935fa4be636091c36d22d9eb0c4170a8bc8341902587e2984", - "zh:f48f078e5f2a11d278f4b9e8a96349b03b9da0b4422e901788c80ea1804c956b", - "zh:fe474dedbdf57ee3d96b99e7e85a031476ddede5555ddc26268f6f50f1971e4d", - ] -} diff --git a/tofu/modules/truenas-vm/main.tf b/tofu/modules/truenas-vm/main.tf deleted file mode 100644 index 3a078b1..0000000 --- a/tofu/modules/truenas-vm/main.tf +++ /dev/null @@ -1,8 +0,0 @@ -terraform { - required_providers { - truenas = { - source = "dariusbakunas/truenas" - version = "0.11.1" - } - } -} diff --git a/tofu/modules/truenas-vm/variables.tf b/tofu/modules/truenas-vm/variables.tf deleted file mode 100644 index e69de29..0000000 diff --git a/tofu/proxmox/main.tf b/tofu/proxmox/main.tf index 2a8f1d6..a15a64f 100644 --- a/tofu/proxmox/main.tf +++ b/tofu/proxmox/main.tf @@ -1,4 +1,5 @@ terraform { + required_version = ">= 1.6" backend "s3" { bucket = "fuku-terraform" key = "vm-foundation/terraform" diff --git a/tofu/truenas/main.tf b/tofu/truenas/main.tf deleted file mode 100644 index e69de29..0000000 diff --git a/tofu/truenas/vars.tf b/tofu/truenas/vars.tf deleted file mode 100644 index e69de29..0000000