Merge branch 'main' into renovate/patch-rook-ceph

.vscode/extensions.json

@@ -0,0 +1,10 @@
+{
+    "recommendations": [
+        "mikestead.dotenv",
+        "redhat.ansible",
+        "redhat.vscode-yaml",
+        "signageos.signageos-vscode-sops",
+        "pkief.material-icon-theme",
+        "ms-vscode-remote.remote-ssh"
+    ]
+}

.vscode/settings.json

@@ -5,7 +5,6 @@
       "**/ansible/**/*.yaml": "ansible",
       "**/ansible/**/*.sops.yaml": "yaml",
       "**/ansible/**/inventory/**/*.yaml": "yaml",
-      "**/terraform/**/*.tf": "terraform",
       "**/kubernetes/**/*.sops.toml": "plaintext"
   },
   "material-icon-theme.folders.associations": {
@@ -14,7 +13,6 @@
       "charts": "kubernetes",
       "hack": "scripts",
       "repositories": "database",
-      "terraforms": "terraform",
       "vars": "other",
       // namespaces
       "cert-manager": "guard",
@@ -27,8 +25,7 @@
   "yaml.schemaStore.enable": true,
   "yaml.schemas": {
     "ansible": "ansible/**/*.yaml",
-    "kubernetes": "kubernetes/**/*.yaml",
+    "kubernetes": "kubernetes/**/*.yaml"
-    "schemaservice://combinedschema/ansible": "file:///home/jahanson/projects/k3s-ops/ansible/kubernetes/inventory/hosts.yaml"
   },
   "editor.fontFamily": "FiraCode Nerd Font",
   "editor.fontLigatures": true,
@@ -45,5 +42,5 @@
   "files.trimTrailingWhitespace": true,
   "ansible.python.interpreterPath": "/usr/bin/python3",
   "sops.defaults.ageKeyFile": "age.key",
-  "ansible.validation.lint.path": "~/projects/k3s-ops/.venv/bin/ansible-lint"
+  "ansible.validation.lint.path": "~/projects/valinor/.venv/bin/ansible-lint"
 }

ansible/kubernetes/inventory/group_vars/all/main.yaml

@@ -1,10 +1,10 @@
 ---
 # renovate: datasource=github-releases depName=k3s-io/k3s
-k3s_release_version: "v1.27.4+k3s1"
+k3s_release_version: "v1.27.5+k3s1"
 k3s_install_hard_links: true
 k3s_become: true
 k3s_etcd_datastore: true
-k3s_registration_address: 10.2.0.3
+k3s_registration_address: 10.2.0.6
 # /var/lib/rancher/k3s/server/manifests
 k3s_server_manifests_urls:
   # Essential Prometheus Operator CRDs (the rest are installed with the kube-prometheus-stack helm release)

ansible/kubernetes/inventory/hosts.yaml

@@ -6,23 +6,9 @@ kubernetes:
   children:
     master:
       hosts:
-        eonwe:
+        valinor-1:
-          ansible_host: 10.2.1.13
+          ansible_host: 10.2.0.3
-        arlen:
+        valinor-2:
-          ansible_host: 10.2.1.14
+          ansible_host: 10.2.0.4
-        nienna:
+        valinor-3:
-          ansible_host: 10.2.1.15
+          ansible_host: 10.2.0.5
-    worker:
-      hosts:
-        aule:
-          ansible_host: 10.2.1.10
-          ceph_drives:
-            - /dev/disk/by-id/nvme-SAMSUNG_MZQL2960HCJR-00A07_S64FNE0RA01210
-        manwe:
-          ansible_host: 10.2.1.11
-          ceph_drives:
-            - /dev/disk/by-id/nvme-SAMSUNG_MZQL2960HCJR-00A07_S64FNE0R801843
-        varda:
-          ansible_host: 10.2.1.12
-          ceph_drives:
-            - /dev/disk/by-id/nvme-SAMSUNG_MZQL2960HCJR-00A07_S64FNE0R801309

archive/database/dragonflydb/app/helmrelease.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta1.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:

kubernetes/apps/cert-manager/cert-manager/app/helmrelease.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta1.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:

kubernetes/apps/cert-manager/cert-manager/app/kustomization.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization.json
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: cert-manager

kubernetes/apps/cert-manager/cert-manager/issuers/helmrelease.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta1.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:

kubernetes/apps/cert-manager/cert-manager/issuers/kustomization.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization.json
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: cert-manager

kubernetes/apps/cert-manager/cert-manager/ks.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
@@ -13,6 +14,7 @@ spec:
     name: valinor
   wait: true
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:

kubernetes/apps/cert-manager/kustomization.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization.json
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:

kubernetes/apps/database/kustomization.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1beta1.json
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:

kubernetes/apps/flux-system/add-ons/ks.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
@@ -15,6 +16,7 @@ spec:
     name: valinor
   wait: true
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:

kubernetes/apps/flux-system/add-ons/webhooks/github/kustomization.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1beta1.json
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:

kubernetes/apps/flux-system/add-ons/webhooks/github/receiver.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/receiver-notification-v1.json
 apiVersion: notification.toolkit.fluxcd.io/v1
 kind: Receiver
 metadata:

kubernetes/apps/flux-system/kustomization.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1beta1.json
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:

kubernetes/apps/kube-system/cilium/app/helmrelease.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta1.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
@@ -9,7 +10,7 @@ spec:
   chart:
     spec:
       chart: cilium
-      version: 1.14.1
+      version: 1.14.2
       sourceRef:
         kind: HelmRepository
         name: cilium
@@ -75,7 +76,7 @@ spec:
     ipam:
       mode: kubernetes
     ipv4NativeRoutingCIDR: 10.32.0.0/16
-    k8sServiceHost: 10.2.0.3
+    k8sServiceHost: 10.2.0.6
     k8sServicePort: 6443
     kubeProxyReplacement: strict
     kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256

kubernetes/apps/kyverno/kyverno/app/helmrelease.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta1.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:

kubernetes/apps/monitoring/alertmanager/app/helmrelease.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta1.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:

kubernetes/apps/monitoring/grafana/app/helmrelease.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta1.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:

kubernetes/apps/monitoring/grafana/app/kustomization.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization.json
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: monitoring

kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml

@@ -1,4 +1,5 @@
 ---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta1.json
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:

kubernetes/apps/security/crowdsec/app/helmrelease.yaml

@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: crowdsec
-      version: 0.9.7
+      version: 0.9.8
       sourceRef:
         kind: HelmRepository
         name: crowdsec