diff --git a/.taskfiles/bootstrap/Taskfile.yaml b/.taskfiles/bootstrap/Taskfile.yaml
index 2b9eb91ac6d..4555d93b4cf 100644
--- a/.taskfiles/bootstrap/Taskfile.yaml
+++ b/.taskfiles/bootstrap/Taskfile.yaml
@@ -47,9 +47,7 @@ tasks:
flux:
desc: Bootstrap Flux into the Talos cluster
cmds:
- - '{{if eq .GITHUB_DEPLOY_KEY_EXISTS "true"}}kubectl create namespace flux-system --dry-run=client -o yaml | kubectl apply --filename -{{end}}'
- '{{if eq .GITHUB_DEPLOY_KEY_EXISTS "true"}}sops exec-file {{.GITHUB_DEPLOY_KEY_FILE}} "kubectl apply --server-side --filename {}"{{end}}'
- - kubectl apply --server-side --kustomize {{.KUBERNETES_DIR}}/bootstrap/flux
- '{{if eq .SOPS_SECRET_EXISTS "false"}}cat {{.SOPS_AGE_KEY_FILE}} | kubectl --namespace flux-system create secret generic sops-age --from-file=age.agekey=/dev/stdin{{end}}'
- sops exec-file {{.KUBERNETES_DIR}}/flux/vars/cluster-secrets.sops.yaml "kubectl apply --server-side --filename {}"
- kubectl apply --server-side --filename {{.KUBERNETES_DIR}}/flux/vars/cluster-settings.yaml
diff --git a/README.md b/README.md
index a811e9a0f16..bb14c1ec4d8 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ The features included will depend on the type of configuration you want to use.
## 🚀 Let's Go!
-There are **6 stages** outlined below for completing this project, make sure you follow the stages in order.
+There are **5 stages** outlined below for completing this project, make sure you follow the stages in order.
### Stage 1: Machine Preparation
@@ -99,10 +99,10 @@ There are **6 stages** outlined below for completing this project, make sure you
git push
```
-### Stage 4: Bootstrap Talos & Kubernetes
+### Stage 4: Bootstrap Talos, Kubernetes, and Flux
> [!IMPORTANT]
-> After running either of the next two commands it might take a while for the cluster to be setup (10+ minutes is normal). During which time you will see a variety of error messages like: "couldn't get current server API group list," "error: no matching resources found", etc. **This is a normal.** If this step gets interrupted, e.g. by pressing Ctrl + C, you likely will need to [reset the cluster](#-reset) before trying again.
+> After running the `task bootstrap:talos` command it might take a while for the cluster to be setup (10+ minutes is normal). During which time you will see a variety of error messages like: "couldn't get current server API group list," "error: no matching resources found", etc. **This is a normal.** If this step gets interrupted, e.g. by pressing Ctrl + C, you likely will need to [reset the cluster](#-reset) before trying again.
1. Install Talos. This generates secrets, generates the Talos config files for your nodes and applies them to the nodes. After it has completed a `kubeconfig` will be placed in the root of your repository.
@@ -116,7 +116,7 @@ There are **6 stages** outlined below for completing this project, make sure you
task bootstrap:apps
```
-3. Verify the nodes are online
+3. Verify the nodes are online and ready
```sh
kubectl get nodes -o wide
@@ -125,39 +125,13 @@ There are **6 stages** outlined below for completing this project, make sure you
# k8s-1 Ready worker 1h v1.30.1
```
-### Stage 5: Bootstrap Flux
-
-1. Verify Flux can be installed
-
- ```sh
- flux check --pre
- # â–º checking prerequisites
- # ✔ kubectl 1.30.1 >=1.18.0-0
- # ✔ Kubernetes 1.30.1 >=1.16.0-0
- # ✔ prerequisites checks passed
- ```
-
-2. Install Flux and sync the cluster to the Git repository
+4. Sync the cluster to the Git repository state
```sh
task bootstrap:flux
- # namespace/flux-system configured
- # customresourcedefinition.apiextensions.k8s.io/alerts.notification.toolkit.fluxcd.io created
- # ...
- ```
-
-3. Verify Flux components are running in the cluster
-
- ```sh
- kubectl -n flux-system get pods -o wide
- # NAME READY STATUS RESTARTS AGE
- # helm-controller-5bbd94c75-89sb4 1/1 Running 0 1h
- # kustomize-controller-7b67b6b77d-nqc67 1/1 Running 0 1h
- # notification-controller-7c46575844-k4bvr 1/1 Running 0 1h
- # source-controller-7d6875bcb4-zqw9f 1/1 Running 0 1h
```
-### Stage 6: Cluster Verification
+### Stage 5: Cluster Verification
_Mic check, 1, 2_ - In a few moments applications should be lighting up like Christmas in July 🎄
diff --git a/templates/config/kubernetes/apps/cert-manager/cert-manager/app/helmrelease.yaml.j2 b/templates/config/kubernetes/apps/cert-manager/cert-manager/app/helmrelease.yaml.j2
index c4610112bc5..ce35ce08dbc 100644
--- a/templates/config/kubernetes/apps/cert-manager/cert-manager/app/helmrelease.yaml.j2
+++ b/templates/config/kubernetes/apps/cert-manager/cert-manager/app/helmrelease.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
diff --git a/templates/config/kubernetes/apps/cert-manager/cert-manager/app/kustomization.yaml.j2 b/templates/config/kubernetes/apps/cert-manager/cert-manager/app/kustomization.yaml.j2
index 5dd7baca73d..17cbc72b25c 100644
--- a/templates/config/kubernetes/apps/cert-manager/cert-manager/app/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/cert-manager/cert-manager/app/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/cert-manager/cert-manager/issuers/issuers.yaml.j2 b/templates/config/kubernetes/apps/cert-manager/cert-manager/issuers/issuers.yaml.j2
index 1cf7148ac54..bbee529b9f3 100644
--- a/templates/config/kubernetes/apps/cert-manager/cert-manager/issuers/issuers.yaml.j2
+++ b/templates/config/kubernetes/apps/cert-manager/cert-manager/issuers/issuers.yaml.j2
@@ -1,3 +1,5 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/cert-manager.io/clusterissuer_v1.json
apiVersion: cert-manager.io/v1
kind: ClusterIssuer
metadata:
@@ -18,6 +20,7 @@ spec:
dnsZones:
- "${SECRET_DOMAIN}"
---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/cert-manager.io/clusterissuer_v1.json
apiVersion: cert-manager.io/v1
kind: ClusterIssuer
metadata:
diff --git a/templates/config/kubernetes/apps/cert-manager/cert-manager/issuers/kustomization.yaml.j2 b/templates/config/kubernetes/apps/cert-manager/cert-manager/issuers/kustomization.yaml.j2
index 17754be63fa..fd43d965ee7 100644
--- a/templates/config/kubernetes/apps/cert-manager/cert-manager/issuers/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/cert-manager/cert-manager/issuers/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/cert-manager/cert-manager/ks.yaml.j2 b/templates/config/kubernetes/apps/cert-manager/cert-manager/ks.yaml.j2
index 37bdfb21f36..cf70cc3c512 100644
--- a/templates/config/kubernetes/apps/cert-manager/cert-manager/ks.yaml.j2
+++ b/templates/config/kubernetes/apps/cert-manager/cert-manager/ks.yaml.j2
@@ -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:
@@ -19,6 +20,7 @@ spec:
timeout: 5m
#% if cloudflare.enabled %#
---
+# 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:
diff --git a/templates/config/kubernetes/apps/cert-manager/kustomization.yaml.j2 b/templates/config/kubernetes/apps/cert-manager/kustomization.yaml.j2
index a0a3e5edf1b..abbe7755533 100644
--- a/templates/config/kubernetes/apps/cert-manager/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/cert-manager/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/flux-system/flux/app/helm-values.yaml.j2 b/templates/config/kubernetes/apps/flux-system/flux/app/helm-values.yaml.j2
new file mode 100644
index 00000000000..ae2f31cb00c
--- /dev/null
+++ b/templates/config/kubernetes/apps/flux-system/flux/app/helm-values.yaml.j2
@@ -0,0 +1,29 @@
+---
+crds:
+ annotations:
+ helm.sh/resource-policy: keep
+
+helmController:
+ create: true
+
+imageAutomationController:
+ create: false
+
+imageReflectionController:
+ create: false
+
+kustomizeController:
+ create: true
+
+notificationController:
+ create: true
+
+sourceController:
+ create: true
+
+policies:
+ create: false
+
+prometheus:
+ podMonitor:
+ create: true
diff --git a/templates/config/kubernetes/apps/flux-system/flux/app/helmrelease.yaml.j2 b/templates/config/kubernetes/apps/flux-system/flux/app/helmrelease.yaml.j2
new file mode 100644
index 00000000000..a3c2dbf7de5
--- /dev/null
+++ b/templates/config/kubernetes/apps/flux-system/flux/app/helmrelease.yaml.j2
@@ -0,0 +1,27 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+ name: flux
+spec:
+ interval: 30m
+ chart:
+ spec:
+ chart: flux2
+ version: 2.14.0
+ sourceRef:
+ kind: HelmRepository
+ name: fluxcd-community
+ namespace: flux-system
+ install:
+ remediation:
+ retries: 3
+ upgrade:
+ cleanupOnFail: true
+ remediation:
+ strategy: rollback
+ retries: 3
+ valuesFrom:
+ - kind: ConfigMap
+ name: flux-helm-values
diff --git a/templates/config/kubernetes/apps/flux-system/flux/app/kustomization.yaml.j2 b/templates/config/kubernetes/apps/flux-system/flux/app/kustomization.yaml.j2
new file mode 100644
index 00000000000..93b4c137f5a
--- /dev/null
+++ b/templates/config/kubernetes/apps/flux-system/flux/app/kustomization.yaml.j2
@@ -0,0 +1,12 @@
+---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+ - ./helmrelease.yaml
+configMapGenerator:
+ - name: flux-helm-values
+ files:
+ - values.yaml=./helm-values.yaml
+configurations:
+ - kustomizeconfig.yaml
diff --git a/templates/config/kubernetes/apps/flux-system/flux/app/kustomizeconfig.yaml.j2 b/templates/config/kubernetes/apps/flux-system/flux/app/kustomizeconfig.yaml.j2
new file mode 100644
index 00000000000..58f92ba1530
--- /dev/null
+++ b/templates/config/kubernetes/apps/flux-system/flux/app/kustomizeconfig.yaml.j2
@@ -0,0 +1,7 @@
+---
+nameReference:
+ - kind: ConfigMap
+ version: v1
+ fieldSpecs:
+ - path: spec/valuesFrom/name
+ kind: HelmRelease
diff --git a/templates/config/kubernetes/apps/flux-system/flux/github/kustomization.yaml.j2 b/templates/config/kubernetes/apps/flux-system/flux/github/kustomization.yaml.j2
new file mode 100644
index 00000000000..b693651a5cc
--- /dev/null
+++ b/templates/config/kubernetes/apps/flux-system/flux/github/kustomization.yaml.j2
@@ -0,0 +1,6 @@
+---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+ - ./webhooks
diff --git a/templates/config/kubernetes/apps/flux-system/webhooks/app/github/ingress.yaml.j2 b/templates/config/kubernetes/apps/flux-system/flux/github/webhooks/ingress.yaml.j2
similarity index 100%
rename from templates/config/kubernetes/apps/flux-system/webhooks/app/github/ingress.yaml.j2
rename to templates/config/kubernetes/apps/flux-system/flux/github/webhooks/ingress.yaml.j2
diff --git a/templates/config/kubernetes/apps/flux-system/webhooks/app/github/kustomization.yaml.j2 b/templates/config/kubernetes/apps/flux-system/flux/github/webhooks/kustomization.yaml.j2
similarity index 71%
rename from templates/config/kubernetes/apps/flux-system/webhooks/app/github/kustomization.yaml.j2
rename to templates/config/kubernetes/apps/flux-system/flux/github/webhooks/kustomization.yaml.j2
index 95c9dfe59d5..53960f95bab 100644
--- a/templates/config/kubernetes/apps/flux-system/webhooks/app/github/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/flux-system/flux/github/webhooks/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/flux-system/webhooks/app/github/receiver.yaml.j2 b/templates/config/kubernetes/apps/flux-system/flux/github/webhooks/receiver.yaml.j2
similarity index 81%
rename from templates/config/kubernetes/apps/flux-system/webhooks/app/github/receiver.yaml.j2
rename to templates/config/kubernetes/apps/flux-system/flux/github/webhooks/receiver.yaml.j2
index cca5931bd55..3051b66cbff 100644
--- a/templates/config/kubernetes/apps/flux-system/webhooks/app/github/receiver.yaml.j2
+++ b/templates/config/kubernetes/apps/flux-system/flux/github/webhooks/receiver.yaml.j2
@@ -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:
diff --git a/templates/config/kubernetes/apps/flux-system/webhooks/app/github/secret.sops.yaml.j2 b/templates/config/kubernetes/apps/flux-system/flux/github/webhooks/secret.sops.yaml.j2
similarity index 100%
rename from templates/config/kubernetes/apps/flux-system/webhooks/app/github/secret.sops.yaml.j2
rename to templates/config/kubernetes/apps/flux-system/flux/github/webhooks/secret.sops.yaml.j2
diff --git a/templates/config/kubernetes/apps/flux-system/flux/ks.yaml.j2 b/templates/config/kubernetes/apps/flux-system/flux/ks.yaml.j2
new file mode 100644
index 00000000000..fcc3ce565c1
--- /dev/null
+++ b/templates/config/kubernetes/apps/flux-system/flux/ks.yaml.j2
@@ -0,0 +1,40 @@
+---
+# 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:
+ name: &app flux
+ namespace: flux-system
+spec:
+ targetNamespace: flux-system
+ commonMetadata:
+ labels:
+ app.kubernetes.io/name: *app
+ path: ./kubernetes/apps/flux-system/flux/app
+ prune: false # never should be deleted
+ sourceRef:
+ kind: GitRepository
+ name: home-kubernetes
+ wait: false
+ interval: 30m
+ timeout: 5m
+---
+# 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:
+ name: &app flux-github
+ namespace: flux-system
+spec:
+ targetNamespace: flux-system
+ commonMetadata:
+ labels:
+ app.kubernetes.io/name: *app
+ path: ./kubernetes/apps/flux-system/flux/github
+ prune: true
+ sourceRef:
+ kind: GitRepository
+ name: home-kubernetes
+ wait: false
+ interval: 30m
+ timeout: 5m
diff --git a/templates/config/kubernetes/apps/flux-system/kustomization.yaml.j2 b/templates/config/kubernetes/apps/flux-system/kustomization.yaml.j2
index 10587f8c9fe..85d69534c99 100644
--- a/templates/config/kubernetes/apps/flux-system/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/flux-system/kustomization.yaml.j2
@@ -1,6 +1,7 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ./namespace.yaml
- - ./webhooks/ks.yaml
+ - ./flux/ks.yaml
diff --git a/templates/config/kubernetes/apps/flux-system/webhooks/app/kustomization.yaml.j2 b/templates/config/kubernetes/apps/flux-system/webhooks/app/kustomization.yaml.j2
deleted file mode 100644
index ccd8b3eb8d0..00000000000
--- a/templates/config/kubernetes/apps/flux-system/webhooks/app/kustomization.yaml.j2
+++ /dev/null
@@ -1,5 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- - ./github
diff --git a/templates/config/kubernetes/apps/flux-system/webhooks/ks.yaml.j2 b/templates/config/kubernetes/apps/flux-system/webhooks/ks.yaml.j2
deleted file mode 100644
index 25e4b9d5f7b..00000000000
--- a/templates/config/kubernetes/apps/flux-system/webhooks/ks.yaml.j2
+++ /dev/null
@@ -1,19 +0,0 @@
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
- name: &app flux-webhooks
- namespace: flux-system
-spec:
- targetNamespace: flux-system
- commonMetadata:
- labels:
- app.kubernetes.io/name: *app
- path: ./kubernetes/apps/flux-system/webhooks/app
- prune: true
- sourceRef:
- kind: GitRepository
- name: home-kubernetes
- wait: true
- interval: 30m
- timeout: 5m
diff --git a/templates/config/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2 b/templates/config/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2
index 5339cb65017..67f1a19f40a 100644
--- a/templates/config/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
diff --git a/templates/config/kubernetes/apps/kube-system/cilium/app/kustomization.yaml.j2 b/templates/config/kubernetes/apps/kube-system/cilium/app/kustomization.yaml.j2
index b4f3860b0e2..25781ef11da 100644
--- a/templates/config/kubernetes/apps/kube-system/cilium/app/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/cilium/app/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/kube-system/cilium/config/kustomization.yaml.j2 b/templates/config/kubernetes/apps/kube-system/cilium/config/kustomization.yaml.j2
index 10d456287b2..b07720f29de 100644
--- a/templates/config/kubernetes/apps/kube-system/cilium/config/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/cilium/config/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/kube-system/cilium/ks.yaml.j2 b/templates/config/kubernetes/apps/kube-system/cilium/ks.yaml.j2
index 2b0c235c496..df26aa3cc14 100644
--- a/templates/config/kubernetes/apps/kube-system/cilium/ks.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/cilium/ks.yaml.j2
@@ -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:
@@ -18,6 +19,7 @@ spec:
interval: 30m
timeout: 5m
---
+# 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:
diff --git a/templates/config/kubernetes/apps/kube-system/coredns/app/helmrelease.yaml.j2 b/templates/config/kubernetes/apps/kube-system/coredns/app/helmrelease.yaml.j2
index dd7ab71eccd..ebe59a83837 100644
--- a/templates/config/kubernetes/apps/kube-system/coredns/app/helmrelease.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/coredns/app/helmrelease.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
diff --git a/templates/config/kubernetes/apps/kube-system/coredns/app/kustomization.yaml.j2 b/templates/config/kubernetes/apps/kube-system/coredns/app/kustomization.yaml.j2
index 691355b567d..39444bbd469 100644
--- a/templates/config/kubernetes/apps/kube-system/coredns/app/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/coredns/app/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/kube-system/coredns/ks.yaml.j2 b/templates/config/kubernetes/apps/kube-system/coredns/ks.yaml.j2
index afa7ae2f151..117b8a98a37 100644
--- a/templates/config/kubernetes/apps/kube-system/coredns/ks.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/coredns/ks.yaml.j2
@@ -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:
diff --git a/templates/config/kubernetes/apps/kube-system/kustomization.yaml.j2 b/templates/config/kubernetes/apps/kube-system/kustomization.yaml.j2
index f6f778b4385..76d8d7486d2 100644
--- a/templates/config/kubernetes/apps/kube-system/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/kube-system/metrics-server/app/helmrelease.yaml.j2 b/templates/config/kubernetes/apps/kube-system/metrics-server/app/helmrelease.yaml.j2
index 839e5868eaa..953ce4d0193 100644
--- a/templates/config/kubernetes/apps/kube-system/metrics-server/app/helmrelease.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/metrics-server/app/helmrelease.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
diff --git a/templates/config/kubernetes/apps/kube-system/metrics-server/app/kustomization.yaml.j2 b/templates/config/kubernetes/apps/kube-system/metrics-server/app/kustomization.yaml.j2
index 5dd7baca73d..17cbc72b25c 100644
--- a/templates/config/kubernetes/apps/kube-system/metrics-server/app/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/metrics-server/app/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/kube-system/metrics-server/ks.yaml.j2 b/templates/config/kubernetes/apps/kube-system/metrics-server/ks.yaml.j2
index 10828aaae2c..325ec0227e7 100644
--- a/templates/config/kubernetes/apps/kube-system/metrics-server/ks.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/metrics-server/ks.yaml.j2
@@ -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:
diff --git a/templates/config/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml.j2 b/templates/config/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml.j2
index 664bdcb088e..539d7034f15 100644
--- a/templates/config/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
diff --git a/templates/config/kubernetes/apps/kube-system/reloader/app/kustomization.yaml.j2 b/templates/config/kubernetes/apps/kube-system/reloader/app/kustomization.yaml.j2
index 5dd7baca73d..17cbc72b25c 100644
--- a/templates/config/kubernetes/apps/kube-system/reloader/app/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/reloader/app/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/kube-system/reloader/ks.yaml.j2 b/templates/config/kubernetes/apps/kube-system/reloader/ks.yaml.j2
index c0e669e2cae..781aad83332 100644
--- a/templates/config/kubernetes/apps/kube-system/reloader/ks.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/reloader/ks.yaml.j2
@@ -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:
diff --git a/templates/config/kubernetes/apps/kube-system/spegel/app/helmrelease.yaml.j2 b/templates/config/kubernetes/apps/kube-system/spegel/app/helmrelease.yaml.j2
index d6782e2d758..72297970af2 100644
--- a/templates/config/kubernetes/apps/kube-system/spegel/app/helmrelease.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/spegel/app/helmrelease.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
diff --git a/templates/config/kubernetes/apps/kube-system/spegel/app/kustomization.yaml.j2 b/templates/config/kubernetes/apps/kube-system/spegel/app/kustomization.yaml.j2
index 1e1aa1d17cf..8c7c0551dca 100644
--- a/templates/config/kubernetes/apps/kube-system/spegel/app/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/spegel/app/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/kube-system/spegel/ks.yaml.j2 b/templates/config/kubernetes/apps/kube-system/spegel/ks.yaml.j2
index 866bb6b966e..673d3715407 100644
--- a/templates/config/kubernetes/apps/kube-system/spegel/ks.yaml.j2
+++ b/templates/config/kubernetes/apps/kube-system/spegel/ks.yaml.j2
@@ -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:
diff --git a/templates/config/kubernetes/apps/network/cloudflared/app/helmrelease.yaml.j2 b/templates/config/kubernetes/apps/network/cloudflared/app/helmrelease.yaml.j2
index 8e3e7542a84..070b89fdfca 100644
--- a/templates/config/kubernetes/apps/network/cloudflared/app/helmrelease.yaml.j2
+++ b/templates/config/kubernetes/apps/network/cloudflared/app/helmrelease.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
diff --git a/templates/config/kubernetes/apps/network/cloudflared/app/kustomization.yaml.j2 b/templates/config/kubernetes/apps/network/cloudflared/app/kustomization.yaml.j2
index 891a864adf7..37b1f4e4bc7 100644
--- a/templates/config/kubernetes/apps/network/cloudflared/app/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/network/cloudflared/app/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/network/cloudflared/ks.yaml.j2 b/templates/config/kubernetes/apps/network/cloudflared/ks.yaml.j2
index 01eb3909bc6..074c9d27195 100644
--- a/templates/config/kubernetes/apps/network/cloudflared/ks.yaml.j2
+++ b/templates/config/kubernetes/apps/network/cloudflared/ks.yaml.j2
@@ -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:
diff --git a/templates/config/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2 b/templates/config/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2
index f6a8875dcef..0e2d4c5d21d 100644
--- a/templates/config/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2
+++ b/templates/config/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
diff --git a/templates/config/kubernetes/apps/network/echo-server/app/kustomization.yaml.j2 b/templates/config/kubernetes/apps/network/echo-server/app/kustomization.yaml.j2
index 5dd7baca73d..17cbc72b25c 100644
--- a/templates/config/kubernetes/apps/network/echo-server/app/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/network/echo-server/app/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/network/echo-server/ks.yaml.j2 b/templates/config/kubernetes/apps/network/echo-server/ks.yaml.j2
index 6440fc8a556..4a820b9323c 100644
--- a/templates/config/kubernetes/apps/network/echo-server/ks.yaml.j2
+++ b/templates/config/kubernetes/apps/network/echo-server/ks.yaml.j2
@@ -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:
diff --git a/templates/config/kubernetes/apps/network/external-dns/app/helmrelease.yaml.j2 b/templates/config/kubernetes/apps/network/external-dns/app/helmrelease.yaml.j2
index 8acbb26c9b0..5a94df0bc40 100644
--- a/templates/config/kubernetes/apps/network/external-dns/app/helmrelease.yaml.j2
+++ b/templates/config/kubernetes/apps/network/external-dns/app/helmrelease.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
diff --git a/templates/config/kubernetes/apps/network/external-dns/app/kustomization.yaml.j2 b/templates/config/kubernetes/apps/network/external-dns/app/kustomization.yaml.j2
index 95bf4747fd1..16a6ce304f2 100644
--- a/templates/config/kubernetes/apps/network/external-dns/app/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/network/external-dns/app/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/network/external-dns/ks.yaml.j2 b/templates/config/kubernetes/apps/network/external-dns/ks.yaml.j2
index ca5826cc93e..9255f6b459b 100644
--- a/templates/config/kubernetes/apps/network/external-dns/ks.yaml.j2
+++ b/templates/config/kubernetes/apps/network/external-dns/ks.yaml.j2
@@ -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:
diff --git a/templates/config/kubernetes/apps/network/ingress-nginx/certificates/kustomization.yaml.j2 b/templates/config/kubernetes/apps/network/ingress-nginx/certificates/kustomization.yaml.j2
index 570e0d8de2b..68da93c5d48 100644
--- a/templates/config/kubernetes/apps/network/ingress-nginx/certificates/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/network/ingress-nginx/certificates/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/network/ingress-nginx/external/helmrelease.yaml.j2 b/templates/config/kubernetes/apps/network/ingress-nginx/external/helmrelease.yaml.j2
index 78f1fec9651..32af064adae 100644
--- a/templates/config/kubernetes/apps/network/ingress-nginx/external/helmrelease.yaml.j2
+++ b/templates/config/kubernetes/apps/network/ingress-nginx/external/helmrelease.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
diff --git a/templates/config/kubernetes/apps/network/ingress-nginx/external/kustomization.yaml.j2 b/templates/config/kubernetes/apps/network/ingress-nginx/external/kustomization.yaml.j2
index 5dd7baca73d..17cbc72b25c 100644
--- a/templates/config/kubernetes/apps/network/ingress-nginx/external/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/network/ingress-nginx/external/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/network/ingress-nginx/internal/helmrelease.yaml.j2 b/templates/config/kubernetes/apps/network/ingress-nginx/internal/helmrelease.yaml.j2
index 2bb9f490ef1..6e3166f0f9e 100644
--- a/templates/config/kubernetes/apps/network/ingress-nginx/internal/helmrelease.yaml.j2
+++ b/templates/config/kubernetes/apps/network/ingress-nginx/internal/helmrelease.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
diff --git a/templates/config/kubernetes/apps/network/ingress-nginx/internal/kustomization.yaml.j2 b/templates/config/kubernetes/apps/network/ingress-nginx/internal/kustomization.yaml.j2
index 5dd7baca73d..17cbc72b25c 100644
--- a/templates/config/kubernetes/apps/network/ingress-nginx/internal/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/network/ingress-nginx/internal/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/network/ingress-nginx/ks.yaml.j2 b/templates/config/kubernetes/apps/network/ingress-nginx/ks.yaml.j2
index f7547d35156..b7446a76f32 100644
--- a/templates/config/kubernetes/apps/network/ingress-nginx/ks.yaml.j2
+++ b/templates/config/kubernetes/apps/network/ingress-nginx/ks.yaml.j2
@@ -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:
@@ -20,6 +21,7 @@ spec:
interval: 30m
timeout: 5m
---
+# 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:
@@ -41,6 +43,7 @@ spec:
interval: 30m
timeout: 5m
---
+# 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:
diff --git a/templates/config/kubernetes/apps/network/k8s-gateway/app/helmrelease.yaml.j2 b/templates/config/kubernetes/apps/network/k8s-gateway/app/helmrelease.yaml.j2
index 0d160c9725c..69b304660f3 100644
--- a/templates/config/kubernetes/apps/network/k8s-gateway/app/helmrelease.yaml.j2
+++ b/templates/config/kubernetes/apps/network/k8s-gateway/app/helmrelease.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
diff --git a/templates/config/kubernetes/apps/network/k8s-gateway/app/kustomization.yaml.j2 b/templates/config/kubernetes/apps/network/k8s-gateway/app/kustomization.yaml.j2
index 5dd7baca73d..17cbc72b25c 100644
--- a/templates/config/kubernetes/apps/network/k8s-gateway/app/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/network/k8s-gateway/app/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/network/k8s-gateway/ks.yaml.j2 b/templates/config/kubernetes/apps/network/k8s-gateway/ks.yaml.j2
index c5fcad8aadb..e83b74523a5 100644
--- a/templates/config/kubernetes/apps/network/k8s-gateway/ks.yaml.j2
+++ b/templates/config/kubernetes/apps/network/k8s-gateway/ks.yaml.j2
@@ -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:
diff --git a/templates/config/kubernetes/apps/network/kustomization.yaml.j2 b/templates/config/kubernetes/apps/network/kustomization.yaml.j2
index e6f8ddc1b83..2dc9a0dbccb 100644
--- a/templates/config/kubernetes/apps/network/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/network/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/observability/kustomization.yaml.j2 b/templates/config/kubernetes/apps/observability/kustomization.yaml.j2
index b213c83e27f..2f6a3f8ee0f 100644
--- a/templates/config/kubernetes/apps/observability/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/observability/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/observability/prometheus-operator-crds/app/helmrelease.yaml.j2 b/templates/config/kubernetes/apps/observability/prometheus-operator-crds/app/helmrelease.yaml.j2
index f5dae068d43..68a7cef0d92 100644
--- a/templates/config/kubernetes/apps/observability/prometheus-operator-crds/app/helmrelease.yaml.j2
+++ b/templates/config/kubernetes/apps/observability/prometheus-operator-crds/app/helmrelease.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
diff --git a/templates/config/kubernetes/apps/observability/prometheus-operator-crds/app/kustomization.yaml.j2 b/templates/config/kubernetes/apps/observability/prometheus-operator-crds/app/kustomization.yaml.j2
index 5dd7baca73d..17cbc72b25c 100644
--- a/templates/config/kubernetes/apps/observability/prometheus-operator-crds/app/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/observability/prometheus-operator-crds/app/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/observability/prometheus-operator-crds/ks.yaml.j2 b/templates/config/kubernetes/apps/observability/prometheus-operator-crds/ks.yaml.j2
index 8f532a12498..ce951795f5e 100644
--- a/templates/config/kubernetes/apps/observability/prometheus-operator-crds/ks.yaml.j2
+++ b/templates/config/kubernetes/apps/observability/prometheus-operator-crds/ks.yaml.j2
@@ -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:
diff --git a/templates/config/kubernetes/apps/openebs-system/kustomization.yaml.j2 b/templates/config/kubernetes/apps/openebs-system/kustomization.yaml.j2
index 9cd8d4e4f2f..2de7d673cf1 100644
--- a/templates/config/kubernetes/apps/openebs-system/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/openebs-system/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml.j2 b/templates/config/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml.j2
index 8cb7c52ef86..96012fc5a9f 100644
--- a/templates/config/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml.j2
+++ b/templates/config/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
diff --git a/templates/config/kubernetes/apps/openebs-system/openebs/app/kustomization.yaml.j2 b/templates/config/kubernetes/apps/openebs-system/openebs/app/kustomization.yaml.j2
index 5dd7baca73d..17cbc72b25c 100644
--- a/templates/config/kubernetes/apps/openebs-system/openebs/app/kustomization.yaml.j2
+++ b/templates/config/kubernetes/apps/openebs-system/openebs/app/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/apps/openebs-system/openebs/ks.yaml.j2 b/templates/config/kubernetes/apps/openebs-system/openebs/ks.yaml.j2
index 0a650df365c..56d99d9ec55 100644
--- a/templates/config/kubernetes/apps/openebs-system/openebs/ks.yaml.j2
+++ b/templates/config/kubernetes/apps/openebs-system/openebs/ks.yaml.j2
@@ -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:
diff --git a/templates/config/kubernetes/bootstrap/flux/kustomization.yaml.j2 b/templates/config/kubernetes/bootstrap/flux/kustomization.yaml.j2
deleted file mode 100644
index 30f33642170..00000000000
--- a/templates/config/kubernetes/bootstrap/flux/kustomization.yaml.j2
+++ /dev/null
@@ -1,61 +0,0 @@
-# IMPORTANT: This file is not tracked by flux and should never be. Its
-# purpose is to only install the Flux components and CRDs into your cluster.
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- - github.com/fluxcd/flux2/manifests/install?ref=v2.4.0
-patches:
- # Remove the default network policies
- - patch: |-
- $patch: delete
- apiVersion: networking.k8s.io/v1
- kind: NetworkPolicy
- metadata:
- name: not-used
- target:
- group: networking.k8s.io
- kind: NetworkPolicy
- # Resources renamed to match those installed by oci://ghcr.io/fluxcd/flux-manifests
- - target:
- kind: ResourceQuota
- name: critical-pods
- patch: |
- - op: replace
- path: /metadata/name
- value: critical-pods-flux-system
- - target:
- kind: ClusterRoleBinding
- name: cluster-reconciler
- patch: |
- - op: replace
- path: /metadata/name
- value: cluster-reconciler-flux-system
- - target:
- kind: ClusterRoleBinding
- name: crd-controller
- patch: |
- - op: replace
- path: /metadata/name
- value: crd-controller-flux-system
- - target:
- kind: ClusterRole
- name: crd-controller
- patch: |
- - op: replace
- path: /metadata/name
- value: crd-controller-flux-system
- - target:
- kind: ClusterRole
- name: flux-edit
- patch: |
- - op: replace
- path: /metadata/name
- value: flux-edit-flux-system
- - target:
- kind: ClusterRole
- name: flux-view
- patch: |
- - op: replace
- path: /metadata/name
- value: flux-view-flux-system
diff --git a/templates/config/kubernetes/bootstrap/helmfile.yaml.j2 b/templates/config/kubernetes/bootstrap/helmfile.yaml.j2
index fc7fadb4af9..84eab0f5eac 100644
--- a/templates/config/kubernetes/bootstrap/helmfile.yaml.j2
+++ b/templates/config/kubernetes/bootstrap/helmfile.yaml.j2
@@ -27,9 +27,6 @@ releases:
version: 1.16.5
values:
- ../apps/kube-system/cilium/app/helm-values.yaml
- - commonLabels:
- helm.toolkit.fluxcd.io/name: cilium
- helm.toolkit.fluxcd.io/namespace: kube-system
needs:
- observability/prometheus-operator-crds
@@ -39,9 +36,6 @@ releases:
version: 1.37.0
values:
- ../apps/kube-system/coredns/app/helm-values.yaml
- - customLabels:
- helm.toolkit.fluxcd.io/name: coredns
- helm.toolkit.fluxcd.io/namespace: kube-system
needs:
- kube-system/cilium
@@ -53,3 +47,13 @@ releases:
- ../apps/kube-system/spegel/app/helm-values.yaml
needs:
- kube-system/cilium
+
+ - name: flux
+ namespace: flux-system
+ chart: oci://ghcr.io/fluxcd-community/charts/flux2
+ version: 2.14.0
+ values:
+ - ../apps/flux-system/flux/app/helm-values.yaml
+ needs:
+ - kube-system/coredns
+ - kube-system/spegel
diff --git a/templates/config/kubernetes/flux/apps.yaml.j2 b/templates/config/kubernetes/flux/apps.yaml.j2
index c4ebba99933..a4bf20f1c0f 100644
--- a/templates/config/kubernetes/flux/apps.yaml.j2
+++ b/templates/config/kubernetes/flux/apps.yaml.j2
@@ -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:
@@ -19,13 +20,9 @@ spec:
substituteFrom:
- kind: ConfigMap
name: cluster-settings
- - kind: Secret
- name: cluster-secrets
- - kind: ConfigMap
- name: cluster-user-settings
optional: true
- kind: Secret
- name: cluster-user-secrets
+ name: cluster-secrets
optional: true
patches:
- patch: |-
@@ -42,13 +39,9 @@ spec:
substituteFrom:
- kind: ConfigMap
name: cluster-settings
- - kind: Secret
- name: cluster-secrets
- - kind: ConfigMap
- name: cluster-user-settings
optional: true
- kind: Secret
- name: cluster-user-secrets
+ name: cluster-secrets
optional: true
target:
group: kustomize.toolkit.fluxcd.io
diff --git a/templates/config/kubernetes/flux/config/cluster.yaml.j2 b/templates/config/kubernetes/flux/config/cluster.yaml.j2
index 7d999bde223..7d503c86c67 100644
--- a/templates/config/kubernetes/flux/config/cluster.yaml.j2
+++ b/templates/config/kubernetes/flux/config/cluster.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/gitrepository-source-v1.json
apiVersion: source.toolkit.fluxcd.io/v1
kind: GitRepository
metadata:
@@ -19,6 +20,7 @@ spec:
# include kubernetes directory
!/kubernetes
---
+# 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:
@@ -40,5 +42,7 @@ spec:
substituteFrom:
- kind: ConfigMap
name: cluster-settings
+ optional: true
- kind: Secret
name: cluster-secrets
+ optional: true
diff --git a/templates/config/kubernetes/flux/config/flux.yaml.j2 b/templates/config/kubernetes/flux/config/flux.yaml.j2
deleted file mode 100644
index 973cbfe5042..00000000000
--- a/templates/config/kubernetes/flux/config/flux.yaml.j2
+++ /dev/null
@@ -1,86 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: OCIRepository
-metadata:
- name: flux-manifests
- namespace: flux-system
-spec:
- interval: 10m
- url: oci://ghcr.io/fluxcd/flux-manifests
- ref:
- tag: v2.4.0
----
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
- name: flux
- namespace: flux-system
-spec:
- interval: 10m
- path: ./
- prune: true
- wait: true
- sourceRef:
- kind: OCIRepository
- name: flux-manifests
- patches:
- # Remove the network policies
- - patch: |
- $patch: delete
- apiVersion: networking.k8s.io/v1
- kind: NetworkPolicy
- metadata:
- name: not-used
- target:
- group: networking.k8s.io
- kind: NetworkPolicy
- # Increase the number of reconciliations that can be performed in parallel and bump the resources limits
- # https://fluxcd.io/flux/cheatsheets/bootstrap/#increase-the-number-of-workers
- - patch: |
- - op: add
- path: /spec/template/spec/containers/0/args/-
- value: --concurrent=8
- - op: add
- path: /spec/template/spec/containers/0/args/-
- value: --kube-api-qps=500
- - op: add
- path: /spec/template/spec/containers/0/args/-
- value: --kube-api-burst=1000
- - op: add
- path: /spec/template/spec/containers/0/args/-
- value: --requeue-dependency=5s
- target:
- kind: Deployment
- name: (kustomize-controller|helm-controller|source-controller)
- - patch: |
- apiVersion: apps/v1
- kind: Deployment
- metadata:
- name: not-used
- spec:
- template:
- spec:
- containers:
- - name: manager
- resources:
- limits:
- cpu: 2000m
- memory: 2Gi
- target:
- kind: Deployment
- name: (kustomize-controller|helm-controller|source-controller)
- # Enable Helm near OOM detection
- # https://fluxcd.io/flux/cheatsheets/bootstrap/#enable-helm-near-oom-detection
- - patch: |
- - op: add
- path: /spec/template/spec/containers/0/args/-
- value: --feature-gates=OOMWatch=true
- - op: add
- path: /spec/template/spec/containers/0/args/-
- value: --oom-watch-memory-threshold=95
- - op: add
- path: /spec/template/spec/containers/0/args/-
- value: --oom-watch-interval=500ms
- target:
- kind: Deployment
- name: helm-controller
diff --git a/templates/config/kubernetes/flux/config/kustomization.yaml.j2 b/templates/config/kubernetes/flux/config/kustomization.yaml.j2
index ef231746a31..a2c786be5df 100644
--- a/templates/config/kubernetes/flux/config/kustomization.yaml.j2
+++ b/templates/config/kubernetes/flux/config/kustomization.yaml.j2
@@ -1,6 +1,6 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- - ./flux.yaml
- ./cluster.yaml
diff --git a/templates/config/kubernetes/flux/repositories/git/kustomization.yaml.j2 b/templates/config/kubernetes/flux/repositories/git/kustomization.yaml.j2
index fe0f332a96c..8fb7c1427d8 100644
--- a/templates/config/kubernetes/flux/repositories/git/kustomization.yaml.j2
+++ b/templates/config/kubernetes/flux/repositories/git/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources: []
diff --git a/templates/config/kubernetes/flux/repositories/helm/bjw-s.yaml.j2 b/templates/config/kubernetes/flux/repositories/helm/bjw-s.yaml.j2
index a40b5d77897..e0fc3f11916 100644
--- a/templates/config/kubernetes/flux/repositories/helm/bjw-s.yaml.j2
+++ b/templates/config/kubernetes/flux/repositories/helm/bjw-s.yaml.j2
@@ -1,5 +1,6 @@
---
-apiVersion: source.toolkit.fluxcd.io/v1
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrepository-source-v1.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: bjw-s
diff --git a/templates/config/kubernetes/flux/repositories/helm/cilium.yaml.j2 b/templates/config/kubernetes/flux/repositories/helm/cilium.yaml.j2
index 3aee367887e..33ad015305f 100644
--- a/templates/config/kubernetes/flux/repositories/helm/cilium.yaml.j2
+++ b/templates/config/kubernetes/flux/repositories/helm/cilium.yaml.j2
@@ -1,5 +1,6 @@
---
-apiVersion: source.toolkit.fluxcd.io/v1
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrepository-source-v1.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: cilium
diff --git a/templates/config/kubernetes/flux/repositories/helm/coredns.yaml.j2 b/templates/config/kubernetes/flux/repositories/helm/coredns.yaml.j2
index 3bdbbafbebf..a7b618e4dc2 100644
--- a/templates/config/kubernetes/flux/repositories/helm/coredns.yaml.j2
+++ b/templates/config/kubernetes/flux/repositories/helm/coredns.yaml.j2
@@ -1,5 +1,6 @@
---
-apiVersion: source.toolkit.fluxcd.io/v1
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrepository-source-v1.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: coredns
diff --git a/templates/config/kubernetes/flux/repositories/helm/external-dns.yaml.j2 b/templates/config/kubernetes/flux/repositories/helm/external-dns.yaml.j2
index 85ebdd97706..e4d33d9c9e1 100644
--- a/templates/config/kubernetes/flux/repositories/helm/external-dns.yaml.j2
+++ b/templates/config/kubernetes/flux/repositories/helm/external-dns.yaml.j2
@@ -1,6 +1,7 @@
#% if cloudflare.enabled %#
---
-apiVersion: source.toolkit.fluxcd.io/v1
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrepository-source-v1.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: external-dns
diff --git a/templates/config/kubernetes/flux/repositories/helm/fluxcd-community.yaml.j2 b/templates/config/kubernetes/flux/repositories/helm/fluxcd-community.yaml.j2
new file mode 100644
index 00000000000..26e8cef4d57
--- /dev/null
+++ b/templates/config/kubernetes/flux/repositories/helm/fluxcd-community.yaml.j2
@@ -0,0 +1,11 @@
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrepository-source-v1.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+ name: fluxcd-community
+ namespace: flux-system
+spec:
+ type: oci
+ interval: 5m
+ url: oci://ghcr.io/fluxcd-community/charts
diff --git a/templates/config/kubernetes/flux/repositories/helm/ingress-nginx.yaml.j2 b/templates/config/kubernetes/flux/repositories/helm/ingress-nginx.yaml.j2
index a44937afe3d..1f36fd732ef 100644
--- a/templates/config/kubernetes/flux/repositories/helm/ingress-nginx.yaml.j2
+++ b/templates/config/kubernetes/flux/repositories/helm/ingress-nginx.yaml.j2
@@ -1,6 +1,7 @@
#% if cloudflare.enabled %#
---
-apiVersion: source.toolkit.fluxcd.io/v1
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrepository-source-v1.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: ingress-nginx
diff --git a/templates/config/kubernetes/flux/repositories/helm/jetstack.yaml.j2 b/templates/config/kubernetes/flux/repositories/helm/jetstack.yaml.j2
index 737e06af097..b5f6ec9ef86 100644
--- a/templates/config/kubernetes/flux/repositories/helm/jetstack.yaml.j2
+++ b/templates/config/kubernetes/flux/repositories/helm/jetstack.yaml.j2
@@ -1,5 +1,6 @@
---
-apiVersion: source.toolkit.fluxcd.io/v1
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrepository-source-v1.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: jetstack
diff --git a/templates/config/kubernetes/flux/repositories/helm/k8s-gateway.yaml.j2 b/templates/config/kubernetes/flux/repositories/helm/k8s-gateway.yaml.j2
index 1bf998ae2df..9a2abf5212e 100644
--- a/templates/config/kubernetes/flux/repositories/helm/k8s-gateway.yaml.j2
+++ b/templates/config/kubernetes/flux/repositories/helm/k8s-gateway.yaml.j2
@@ -1,6 +1,7 @@
#% if cloudflare.enabled %#
---
-apiVersion: source.toolkit.fluxcd.io/v1
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrepository-source-v1.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: k8s-gateway
diff --git a/templates/config/kubernetes/flux/repositories/helm/kustomization.yaml.j2 b/templates/config/kubernetes/flux/repositories/helm/kustomization.yaml.j2
index f4a7e29153c..853e62251b8 100644
--- a/templates/config/kubernetes/flux/repositories/helm/kustomization.yaml.j2
+++ b/templates/config/kubernetes/flux/repositories/helm/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
@@ -6,6 +7,7 @@ resources:
- ./cilium.yaml
- ./coredns.yaml
- ./external-dns.yaml
+ - ./fluxcd-community.yaml
- ./ingress-nginx.yaml
- ./jetstack.yaml
- ./k8s-gateway.yaml
diff --git a/templates/config/kubernetes/flux/repositories/helm/metrics-server.yaml.j2 b/templates/config/kubernetes/flux/repositories/helm/metrics-server.yaml.j2
index 27a44828a5c..f04205918ee 100644
--- a/templates/config/kubernetes/flux/repositories/helm/metrics-server.yaml.j2
+++ b/templates/config/kubernetes/flux/repositories/helm/metrics-server.yaml.j2
@@ -1,5 +1,6 @@
---
-apiVersion: source.toolkit.fluxcd.io/v1
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrepository-source-v1.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: metrics-server
diff --git a/templates/config/kubernetes/flux/repositories/helm/openebs.yaml.j2 b/templates/config/kubernetes/flux/repositories/helm/openebs.yaml.j2
index 4f48013ee7d..f0843d467a6 100644
--- a/templates/config/kubernetes/flux/repositories/helm/openebs.yaml.j2
+++ b/templates/config/kubernetes/flux/repositories/helm/openebs.yaml.j2
@@ -1,5 +1,6 @@
---
-apiVersion: source.toolkit.fluxcd.io/v1
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrepository-source-v1.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: openebs
diff --git a/templates/config/kubernetes/flux/repositories/helm/prometheus-community.yaml.j2 b/templates/config/kubernetes/flux/repositories/helm/prometheus-community.yaml.j2
index 318a1a51403..c190f65f687 100644
--- a/templates/config/kubernetes/flux/repositories/helm/prometheus-community.yaml.j2
+++ b/templates/config/kubernetes/flux/repositories/helm/prometheus-community.yaml.j2
@@ -1,5 +1,6 @@
---
-apiVersion: source.toolkit.fluxcd.io/v1
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrepository-source-v1.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: prometheus-community
diff --git a/templates/config/kubernetes/flux/repositories/helm/spegel.yaml.j2 b/templates/config/kubernetes/flux/repositories/helm/spegel.yaml.j2
index d9a8b2cd300..4fd2394edc2 100644
--- a/templates/config/kubernetes/flux/repositories/helm/spegel.yaml.j2
+++ b/templates/config/kubernetes/flux/repositories/helm/spegel.yaml.j2
@@ -1,5 +1,6 @@
---
-apiVersion: source.toolkit.fluxcd.io/v1
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrepository-source-v1.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: spegel
diff --git a/templates/config/kubernetes/flux/repositories/helm/stakater.yaml.j2 b/templates/config/kubernetes/flux/repositories/helm/stakater.yaml.j2
index c727f37f129..0095d0a3841 100644
--- a/templates/config/kubernetes/flux/repositories/helm/stakater.yaml.j2
+++ b/templates/config/kubernetes/flux/repositories/helm/stakater.yaml.j2
@@ -1,5 +1,6 @@
---
-apiVersion: source.toolkit.fluxcd.io/v1
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrepository-source-v1.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: stakater
diff --git a/templates/config/kubernetes/flux/repositories/kustomization.yaml.j2 b/templates/config/kubernetes/flux/repositories/kustomization.yaml.j2
index d158d426ee8..ae7e0ad4676 100644
--- a/templates/config/kubernetes/flux/repositories/kustomization.yaml.j2
+++ b/templates/config/kubernetes/flux/repositories/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
diff --git a/templates/config/kubernetes/flux/repositories/oci/kustomization.yaml.j2 b/templates/config/kubernetes/flux/repositories/oci/kustomization.yaml.j2
index fe0f332a96c..8fb7c1427d8 100644
--- a/templates/config/kubernetes/flux/repositories/oci/kustomization.yaml.j2
+++ b/templates/config/kubernetes/flux/repositories/oci/kustomization.yaml.j2
@@ -1,4 +1,5 @@
---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources: []
diff --git a/templates/config/kubernetes/flux/vars/cluster-secrets.sops.yaml.j2 b/templates/config/kubernetes/flux/vars/cluster-secrets.sops.yaml.j2
index dabb9e658d4..991eb3a6c87 100644
--- a/templates/config/kubernetes/flux/vars/cluster-secrets.sops.yaml.j2
+++ b/templates/config/kubernetes/flux/vars/cluster-secrets.sops.yaml.j2
@@ -4,11 +4,11 @@ kind: Secret
metadata:
name: cluster-secrets
namespace: flux-system
+#% if cloudflare.enabled %#
stringData:
- #% if cloudflare.enabled %#
SECRET_DOMAIN: "#{ cloudflare.domain }#"
SECRET_ACME_EMAIL: "#{ cloudflare.acme.email }#"
SECRET_CLOUDFLARE_TUNNEL_ID: "#{ cloudflare.tunnel.id }#"
- #% else %#
- SECRET_EXAMPLE: Global secrets for your cluster go in this file, this file is encrypted with sops
- #% endif %#
+#% else %#
+stringData: {}
+#% endif %#
diff --git a/templates/config/kubernetes/flux/vars/cluster-settings.yaml.j2 b/templates/config/kubernetes/flux/vars/cluster-settings.yaml.j2
index b64f194e152..8b63c343907 100644
--- a/templates/config/kubernetes/flux/vars/cluster-settings.yaml.j2
+++ b/templates/config/kubernetes/flux/vars/cluster-settings.yaml.j2
@@ -4,5 +4,4 @@ kind: ConfigMap
metadata:
name: cluster-settings
namespace: flux-system
-data:
- SETTING_EXAMPLE: Global settings for your cluster go in this file, this file is NOT encrypted
+data: {}
diff --git a/templates/config/kubernetes/flux/vars/kustomization.yaml.j2 b/templates/config/kubernetes/flux/vars/kustomization.yaml.j2
index 8db2fe91197..9ea91972ed4 100644
--- a/templates/config/kubernetes/flux/vars/kustomization.yaml.j2
+++ b/templates/config/kubernetes/flux/vars/kustomization.yaml.j2
@@ -1,3 +1,5 @@
+---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources: