From 4bb18a089beef864311d668adbe7ced8f91a4a9d Mon Sep 17 00:00:00 2001 From: jogotcha Date: Tue, 31 Dec 2024 12:13:21 +0100 Subject: [PATCH] chore(clustertool) whitespace cleanup (#30426) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Clean up some inconsistent indentation in clustertool's default manifest files ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [x] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [ ] ⬆️ I increased versions for any altered app according to semantic versioning - [x] I made sure the title starts with `feat(chart-name):`, `fix(chart-name):` or `chore(chart-name):` **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ Signed-off-by: jogotcha --- .../kubernetes-dashboard/app/namespace.yaml | 8 +- .../kubernetes/core/blocky/app/namespace.yaml | 6 +- .../core/clusterissuer/app/namespace.yaml | 6 +- .../core/metallb-config/app/namespace.yaml | 8 +- .../core/traefik/app/namespace.yaml | 6 +- .../flux/clustersettings.secret.yaml | 4 +- .../flux-system/flux/upgradesettings.yaml | 4 +- .../kube-system/cilium/app/helm-release.yaml | 150 +++++++++--------- .../descheduler/app/helm-release.yaml | 127 ++++++++------- .../app/helm-release.yaml | 26 +-- .../metrics-server/app/helm-release.yaml | 32 ++-- .../kubernetes/kube-system/namespace.yaml | 8 +- .../system/cert-manager/app/helm-release.yaml | 45 +++--- .../cloudnative-pg/app/helm-release.yaml | 45 +++--- .../app/helm-release.yaml | 52 +++--- .../system/longhorn/app/helm-release.yaml | 67 ++++---- .../system/longhorn/app/namespace.yaml | 8 +- .../system/metallb/app/helm-release.yaml | 44 ++--- .../system/metallb/app/namespace.yaml | 8 +- .../system/openebs/app/helm-release.yaml | 79 +++++---- .../system/openebs/app/namespace.yaml | 8 +- .../prometheus-operator/app/helm-release.yaml | 45 +++--- .../snapshot-controller/app/helm-release.yaml | 46 +++--- .../system/spegel/app/namespace.yaml | 8 +- .../app/namespace.yaml | 14 +- .../system/traefik-crds/app/helm-release.yaml | 54 +++---- .../system/volsync/app/helm-release.yaml | 39 +++-- .../system/volsync/app/namespace.yaml | 8 +- .../helm/kubernetes-sigs-metrics-server.yaml | 13 +- .../root/repositories/helm/metallb.yaml | 12 +- .../root/repositories/helm/truecharts.yaml | 13 +- 31 files changed, 495 insertions(+), 498 deletions(-) diff --git a/clustertool/embed/generic/kubernetes/apps/kubernetes-dashboard/app/namespace.yaml b/clustertool/embed/generic/kubernetes/apps/kubernetes-dashboard/app/namespace.yaml index 997c30f1e0f..267bf0e47ba 100644 --- a/clustertool/embed/generic/kubernetes/apps/kubernetes-dashboard/app/namespace.yaml +++ b/clustertool/embed/generic/kubernetes/apps/kubernetes-dashboard/app/namespace.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Namespace metadata: - name: kubernetes-dashboard - labels: - pod-security.kubernetes.io/enforce: privileged - topolvm.io/webhook: ignore + name: kubernetes-dashboard + labels: + pod-security.kubernetes.io/enforce: privileged + topolvm.io/webhook: ignore diff --git a/clustertool/embed/generic/kubernetes/core/blocky/app/namespace.yaml b/clustertool/embed/generic/kubernetes/core/blocky/app/namespace.yaml index 81e0716e245..63d3a1b664b 100644 --- a/clustertool/embed/generic/kubernetes/core/blocky/app/namespace.yaml +++ b/clustertool/embed/generic/kubernetes/core/blocky/app/namespace.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Namespace metadata: - name: blocky - labels: - topolvm.io/webhook: ignore + name: blocky + labels: + topolvm.io/webhook: ignore diff --git a/clustertool/embed/generic/kubernetes/core/clusterissuer/app/namespace.yaml b/clustertool/embed/generic/kubernetes/core/clusterissuer/app/namespace.yaml index 718dcb59904..53d7de6b4eb 100644 --- a/clustertool/embed/generic/kubernetes/core/clusterissuer/app/namespace.yaml +++ b/clustertool/embed/generic/kubernetes/core/clusterissuer/app/namespace.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Namespace metadata: - name: clusterissuer - labels: - topolvm.io/webhook: ignore + name: clusterissuer + labels: + topolvm.io/webhook: ignore diff --git a/clustertool/embed/generic/kubernetes/core/metallb-config/app/namespace.yaml b/clustertool/embed/generic/kubernetes/core/metallb-config/app/namespace.yaml index 6329a91c4d3..00e85a747a4 100644 --- a/clustertool/embed/generic/kubernetes/core/metallb-config/app/namespace.yaml +++ b/clustertool/embed/generic/kubernetes/core/metallb-config/app/namespace.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Namespace metadata: - name: metallb-config - labels: - pod-security.kubernetes.io/enforce: privileged - topolvm.io/webhook: ignore + name: metallb-config + labels: + pod-security.kubernetes.io/enforce: privileged + topolvm.io/webhook: ignore diff --git a/clustertool/embed/generic/kubernetes/core/traefik/app/namespace.yaml b/clustertool/embed/generic/kubernetes/core/traefik/app/namespace.yaml index 7a9332a24a3..18c3af41881 100644 --- a/clustertool/embed/generic/kubernetes/core/traefik/app/namespace.yaml +++ b/clustertool/embed/generic/kubernetes/core/traefik/app/namespace.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Namespace metadata: - name: traefik - labels: - topolvm.io/webhook: ignore + name: traefik + labels: + topolvm.io/webhook: ignore diff --git a/clustertool/embed/generic/kubernetes/flux-system/flux/clustersettings.secret.yaml b/clustertool/embed/generic/kubernetes/flux-system/flux/clustersettings.secret.yaml index c60ed55b859..034a556f3e7 100644 --- a/clustertool/embed/generic/kubernetes/flux-system/flux/clustersettings.secret.yaml +++ b/clustertool/embed/generic/kubernetes/flux-system/flux/clustersettings.secret.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: cluster-config - namespace: flux-system + name: cluster-config + namespace: flux-system data: REPLACEWITHENV diff --git a/clustertool/embed/generic/kubernetes/flux-system/flux/upgradesettings.yaml b/clustertool/embed/generic/kubernetes/flux-system/flux/upgradesettings.yaml index b8822e5304e..bb6bbaf39d2 100644 --- a/clustertool/embed/generic/kubernetes/flux-system/flux/upgradesettings.yaml +++ b/clustertool/embed/generic/kubernetes/flux-system/flux/upgradesettings.yaml @@ -1,8 +1,8 @@ apiVersion: v1 kind: ConfigMap metadata: - name: upgrade-settings - namespace: flux-system + name: upgrade-settings + namespace: flux-system data: # renovate: datasource=docker depName=ghcr.io/siderolabs/installer TALOS_VERSION: v1.9.1 diff --git a/clustertool/embed/generic/kubernetes/kube-system/cilium/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/kube-system/cilium/app/helm-release.yaml index d5f2938600a..b995b7fef34 100644 --- a/clustertool/embed/generic/kubernetes/kube-system/cilium/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/kube-system/cilium/app/helm-release.yaml @@ -1,80 +1,80 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: cilium - namespace: kube-system - annotations: - meta.helm.sh/release-name: cilium - meta.helm.sh/release-namespace: kube-system - labels: - app.kubernetes.io/managed-by: Helm + name: cilium + namespace: kube-system + annotations: + meta.helm.sh/release-name: cilium + meta.helm.sh/release-namespace: kube-system + labels: + app.kubernetes.io/managed-by: Helm spec: - interval: 15m - chart: - spec: - chart: cilium - version: 1.16.5 - sourceRef: - kind: HelmRepository - name: cilium - namespace: flux-system - interval: 15m - timeout: 20m - maxHistory: 3 - driftDetection: - mode: warn - install: - remediation: - retries: 3 - upgrade: - cleanupOnFail: true - remediation: - retries: 3 - remediateLastFailure: true - uninstall: - keepHistory: false - values: - # autoDirectNodeRoutes: true - # routingMode: native - hubble: + interval: 15m + chart: + spec: + chart: cilium + version: 1.16.5 + sourceRef: + kind: HelmRepository + name: cilium + namespace: flux-system + interval: 15m + timeout: 20m + maxHistory: 3 + driftDetection: + mode: warn + install: + remediation: + retries: 3 + upgrade: + cleanupOnFail: true + remediation: + retries: 3 + remediateLastFailure: true + uninstall: + keepHistory: false + values: + # autoDirectNodeRoutes: true + # routingMode: native + hubble: + enabled: false + cluster: + name: ${CLUSTERNAME} + id: 1 + ipv4NativeRoutingCIDR: ${PODNET} + securityContext: + privileged: true + capabilities: + ciliumAgent: + - CHOWN + - KILL + - NET_ADMIN + - NET_RAW + - IPC_LOCK + - SYS_ADMIN + - SYS_RESOURCE + - DAC_OVERRIDE + - FOWNER + - SETGID + - SETUID + cleanCiliumState: + - NET_ADMIN + - SYS_ADMIN + - SYS_RESOURCE + cgroup: + automount: enabled: false - cluster: - name: ${CLUSTERNAME} - id: 1 - ipv4NativeRoutingCIDR: ${PODNET} - securityContext: - privileged: true - capabilities: - ciliumAgent: - - CHOWN - - KILL - - NET_ADMIN - - NET_RAW - - IPC_LOCK - - SYS_ADMIN - - SYS_RESOURCE - - DAC_OVERRIDE - - FOWNER - - SETGID - - SETUID - cleanCiliumState: - - NET_ADMIN - - SYS_ADMIN - - SYS_RESOURCE - cgroup: - automount: - enabled: false - hostRoot: /sys/fs/cgroup - enableRuntimeDeviceDetection: true - endpointRoutes: - enabled: true - ipam: - mode: kubernetes - k8sServiceHost: 127.0.0.1 - k8sServicePort: 7445 - kubeProxyReplacement: true - kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256 - localRedirectPolicy: true - operator: - rollOutPods: true - rollOutCiliumPods: true + hostRoot: /sys/fs/cgroup + enableRuntimeDeviceDetection: true + endpointRoutes: + enabled: true + ipam: + mode: kubernetes + k8sServiceHost: 127.0.0.1 + k8sServicePort: 7445 + kubeProxyReplacement: true + kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256 + localRedirectPolicy: true + operator: + rollOutPods: true + rollOutCiliumPods: true diff --git a/clustertool/embed/generic/kubernetes/kube-system/descheduler/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/kube-system/descheduler/app/helm-release.yaml index 660f9a2353a..21378946550 100644 --- a/clustertool/embed/generic/kubernetes/kube-system/descheduler/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/kube-system/descheduler/app/helm-release.yaml @@ -1,68 +1,67 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: descheduler - namespace: kube-system + name: descheduler + namespace: kube-system spec: - interval: 15m - chart: - spec: - chart: descheduler - version: 0.1.0 - sourceRef: - kind: HelmRepository - name: truecharts - namespace: flux-system - interval: 15m - timeout: 20m - maxHistory: 3 - driftDetection: - mode: warn - install: - createNamespace: true - remediation: - retries: 3 - upgrade: - cleanupOnFail: true - remediation: - retries: 3 - uninstall: - keepHistory: false - values: - - kind: Deployment - deschedulerPolicy: - strategies: - RemoveDuplicates: - enabled: true - RemovePodsViolatingNodeTaints: - enabled: true - RemovePodsViolatingNodeAffinity: - enabled: true - params: - nodeAffinityType: - - requiredDuringSchedulingIgnoredDuringExecution - RemovePodsViolatingTopologySpreadConstraint: - enabled: true - params: - includeSoftConstraints: true - RemovePodsViolatingInterPodAntiAffinity: - enabled: true - params: - nodeFit: true - LowNodeUtilization: - enabled: false - RemoveFailedPods: - enabled: true - params: - failedPods: - includingInitContainers: true - excludeOwnerKinds: - - Job - minPodLifetimeSeconds: 3600 - RemovePodsHavingTooManyRestarts: - enabled: true - params: - podsHavingTooManyRestarts: - podRestartThreshold: 100 - includingInitContainers: true + interval: 15m + chart: + spec: + chart: descheduler + version: 0.1.0 + sourceRef: + kind: HelmRepository + name: truecharts + namespace: flux-system + interval: 15m + timeout: 20m + maxHistory: 3 + driftDetection: + mode: warn + install: + createNamespace: true + remediation: + retries: 3 + upgrade: + cleanupOnFail: true + remediation: + retries: 3 + uninstall: + keepHistory: false + values: + kind: Deployment + deschedulerPolicy: + strategies: + RemoveDuplicates: + enabled: true + RemovePodsViolatingNodeTaints: + enabled: true + RemovePodsViolatingNodeAffinity: + enabled: true + params: + nodeAffinityType: + - requiredDuringSchedulingIgnoredDuringExecution + RemovePodsViolatingTopologySpreadConstraint: + enabled: true + params: + includeSoftConstraints: true + RemovePodsViolatingInterPodAntiAffinity: + enabled: true + params: + nodeFit: true + LowNodeUtilization: + enabled: false + RemoveFailedPods: + enabled: true + params: + failedPods: + includingInitContainers: true + excludeOwnerKinds: + - Job + minPodLifetimeSeconds: 3600 + RemovePodsHavingTooManyRestarts: + enabled: true + params: + podsHavingTooManyRestarts: + podRestartThreshold: 100 + includingInitContainers: true diff --git a/clustertool/embed/generic/kubernetes/kube-system/kubelet-csr-approver/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/kube-system/kubelet-csr-approver/app/helm-release.yaml index b05cab9bfc8..68cb785a37a 100644 --- a/clustertool/embed/generic/kubernetes/kube-system/kubelet-csr-approver/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/kube-system/kubelet-csr-approver/app/helm-release.yaml @@ -2,17 +2,17 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: kubelet-csr-approver - namespace: kube-system + name: kubelet-csr-approver + namespace: kube-system spec: - interval: 30m - chart: - spec: - chart: kubelet-csr-approver - version: 1.3.0 - sourceRef: - kind: HelmRepository - name: truecharts - namespace: flux-system - interval: 30m - values: {} + interval: 30m + chart: + spec: + chart: kubelet-csr-approver + version: 1.3.0 + sourceRef: + kind: HelmRepository + name: truecharts + namespace: flux-system + interval: 30m + values: {} diff --git a/clustertool/embed/generic/kubernetes/kube-system/metrics-server/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/kube-system/metrics-server/app/helm-release.yaml index f930643a2d9..aa622865d5f 100644 --- a/clustertool/embed/generic/kubernetes/kube-system/metrics-server/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/kube-system/metrics-server/app/helm-release.yaml @@ -2,30 +2,30 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: metrics-server - namespace: kube-system + name: metrics-server + namespace: kube-system spec: interval: 15m chart: - spec: - chart: metrics-server - version: 0.1.0 - sourceRef: - kind: HelmRepository - name: truecharts - namespace: flux-system - interval: 15m + spec: + chart: metrics-server + version: 0.1.0 + sourceRef: + kind: HelmRepository + name: truecharts + namespace: flux-system + interval: 15m timeout: 20m maxHistory: 3 driftDetection: mode: warn install: - createNamespace: true - remediation: - retries: 3 + createNamespace: true + remediation: + retries: 3 upgrade: - remediation: - retries: 3 + remediation: + retries: 3 uninstall: - keepHistory: false + keepHistory: false values: diff --git a/clustertool/embed/generic/kubernetes/kube-system/namespace.yaml b/clustertool/embed/generic/kubernetes/kube-system/namespace.yaml index b78f22ddae4..258a7b91438 100644 --- a/clustertool/embed/generic/kubernetes/kube-system/namespace.yaml +++ b/clustertool/embed/generic/kubernetes/kube-system/namespace.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Namespace metadata: - name: kube-system - labels: - pod-security.kubernetes.io/enforce: privileged - topolvm.io/webhook: ignore + name: kube-system + labels: + pod-security.kubernetes.io/enforce: privileged + topolvm.io/webhook: ignore diff --git a/clustertool/embed/generic/kubernetes/system/cert-manager/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/system/cert-manager/app/helm-release.yaml index f7b9ba150a3..13629706d76 100644 --- a/clustertool/embed/generic/kubernetes/system/cert-manager/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/system/cert-manager/app/helm-release.yaml @@ -1,27 +1,26 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: cert-manager - namespace: cert-manager + name: cert-manager + namespace: cert-manager spec: - interval: 5m - chart: - spec: - - chart: cert-manager - version: 6.4.0 - sourceRef: - kind: HelmRepository - name: truecharts - namespace: flux-system - interval: 5m - install: - createNamespace: true - crds: CreateReplace - remediation: - retries: 3 - upgrade: - crds: CreateReplace - remediation: - retries: 3 - values: + interval: 5m + chart: + spec: + chart: cert-manager + version: 6.4.0 + sourceRef: + kind: HelmRepository + name: truecharts + namespace: flux-system + interval: 5m + install: + createNamespace: true + crds: CreateReplace + remediation: + retries: 3 + upgrade: + crds: CreateReplace + remediation: + retries: 3 + values: diff --git a/clustertool/embed/generic/kubernetes/system/cloudnative-pg/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/system/cloudnative-pg/app/helm-release.yaml index 0d870a6cee5..fd7fcc513f0 100644 --- a/clustertool/embed/generic/kubernetes/system/cloudnative-pg/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/system/cloudnative-pg/app/helm-release.yaml @@ -1,27 +1,26 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: cloudnative-pg - namespace: cloudnative-pg + name: cloudnative-pg + namespace: cloudnative-pg spec: - interval: 5m - chart: - spec: - - chart: cloudnative-pg - version: 8.2.0 - sourceRef: - kind: HelmRepository - name: truecharts - namespace: flux-system - interval: 5m - install: - createNamespace: true - crds: CreateReplace - remediation: - retries: 3 - upgrade: - crds: CreateReplace - remediation: - retries: 3 - values: + interval: 5m + chart: + spec: + chart: cloudnative-pg + version: 8.2.0 + sourceRef: + kind: HelmRepository + name: truecharts + namespace: flux-system + interval: 5m + install: + createNamespace: true + crds: CreateReplace + remediation: + retries: 3 + upgrade: + crds: CreateReplace + remediation: + retries: 3 + values: diff --git a/clustertool/embed/generic/kubernetes/system/kubernetes-reflector/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/system/kubernetes-reflector/app/helm-release.yaml index 2e884fcd7f2..d5f0f0d820a 100644 --- a/clustertool/embed/generic/kubernetes/system/kubernetes-reflector/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/system/kubernetes-reflector/app/helm-release.yaml @@ -2,30 +2,30 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: kubernetes-reflector - namespace: snapshot-controller + name: kubernetes-reflector + namespace: snapshot-controller spec: - interval: 15m - chart: - spec: - chart: kubernetes-reflector - version: 6.4.0 - sourceRef: - kind: HelmRepository - name: truecharts - namespace: flux-system - interval: 15m - timeout: 20m - maxHistory: 3 - driftDetection: - mode: warn - install: - createNamespace: true - remediation: - retries: 3 - upgrade: - cleanupOnFail: true - remediation: - retries: 3 - uninstall: - keepHistory: false + interval: 15m + chart: + spec: + chart: kubernetes-reflector + version: 6.4.0 + sourceRef: + kind: HelmRepository + name: truecharts + namespace: flux-system + interval: 15m + timeout: 20m + maxHistory: 3 + driftDetection: + mode: warn + install: + createNamespace: true + remediation: + retries: 3 + upgrade: + cleanupOnFail: true + remediation: + retries: 3 + uninstall: + keepHistory: false diff --git a/clustertool/embed/generic/kubernetes/system/longhorn/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/system/longhorn/app/helm-release.yaml index 93e5e341bd0..5e9e743a52d 100644 --- a/clustertool/embed/generic/kubernetes/system/longhorn/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/system/longhorn/app/helm-release.yaml @@ -1,38 +1,37 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: longhorn - namespace: longhorn-system + name: longhorn + namespace: longhorn-system spec: - interval: 5m - releaseName: longhorn - chart: - spec: - - chart: longhorn - version: 1.7.2 - sourceRef: - kind: HelmRepository - name: longhorn - namespace: flux-system - install: - createNamespace: true - crds: CreateReplace - remediation: - retries: 3 - upgrade: - crds: CreateReplace - remediation: - retries: 3 - values: - defaultSettings: - # Increase to 3 for a multi-node cluster - defaultReplicaCount: 1 - # Overprovisioning might be needed when using volsync - storageOverProvisioningPercentage: 100000 - # v2DataEngine: true - persistence: - # Set to false to pick another CSI as default - defaultClass: true - # Increase to 3 for a multi-node cluster - defaultClassReplicaCount: 1 + interval: 5m + releaseName: longhorn + chart: + spec: + chart: longhorn + version: 1.7.2 + sourceRef: + kind: HelmRepository + name: longhorn + namespace: flux-system + install: + createNamespace: true + crds: CreateReplace + remediation: + retries: 3 + upgrade: + crds: CreateReplace + remediation: + retries: 3 + values: + defaultSettings: + # Increase to 3 for a multi-node cluster + defaultReplicaCount: 1 + # Overprovisioning might be needed when using volsync + storageOverProvisioningPercentage: 100000 + # v2DataEngine: true + persistence: + # Set to false to pick another CSI as default + defaultClass: true + # Increase to 3 for a multi-node cluster + defaultClassReplicaCount: 1 diff --git a/clustertool/embed/generic/kubernetes/system/longhorn/app/namespace.yaml b/clustertool/embed/generic/kubernetes/system/longhorn/app/namespace.yaml index d1d13dd1492..c9700242081 100644 --- a/clustertool/embed/generic/kubernetes/system/longhorn/app/namespace.yaml +++ b/clustertool/embed/generic/kubernetes/system/longhorn/app/namespace.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Namespace metadata: - name: longhorn-system - labels: - pod-security.kubernetes.io/enforce: privileged - topolvm.io/webhook: ignore + name: longhorn-system + labels: + pod-security.kubernetes.io/enforce: privileged + topolvm.io/webhook: ignore diff --git a/clustertool/embed/generic/kubernetes/system/metallb/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/system/metallb/app/helm-release.yaml index b5fdf72ecdc..fc8e082aec5 100644 --- a/clustertool/embed/generic/kubernetes/system/metallb/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/system/metallb/app/helm-release.yaml @@ -1,26 +1,26 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: metallb - namespace: metallb + name: metallb + namespace: metallb spec: - interval: 5m - chart: - spec: - chart: metallb - version: 0.14.9 - sourceRef: - kind: HelmRepository - name: metallb - namespace: flux-system - interval: 5m - install: - createNamespace: true - remediation: - retries: 3 - upgrade: - remediation: - retries: 3 - values: - speaker: - ignoreExcludeLB: true + interval: 5m + chart: + spec: + chart: metallb + version: 0.14.9 + sourceRef: + kind: HelmRepository + name: metallb + namespace: flux-system + interval: 5m + install: + createNamespace: true + remediation: + retries: 3 + upgrade: + remediation: + retries: 3 + values: + speaker: + ignoreExcludeLB: true diff --git a/clustertool/embed/generic/kubernetes/system/metallb/app/namespace.yaml b/clustertool/embed/generic/kubernetes/system/metallb/app/namespace.yaml index 8fa433d39c0..7d3f5315e25 100644 --- a/clustertool/embed/generic/kubernetes/system/metallb/app/namespace.yaml +++ b/clustertool/embed/generic/kubernetes/system/metallb/app/namespace.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Namespace metadata: - name: metallb - labels: - pod-security.kubernetes.io/enforce: privileged - topolvm.io/webhook: ignore + name: metallb + labels: + pod-security.kubernetes.io/enforce: privileged + topolvm.io/webhook: ignore diff --git a/clustertool/embed/generic/kubernetes/system/openebs/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/system/openebs/app/helm-release.yaml index 7d03689f4ee..5140f028830 100644 --- a/clustertool/embed/generic/kubernetes/system/openebs/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/system/openebs/app/helm-release.yaml @@ -1,45 +1,44 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: openebs - namespace: openebs + name: openebs + namespace: openebs spec: - interval: 5m - releaseName: openebs - chart: - spec: + interval: 5m + releaseName: openebs + chart: + spec: + chart: openebs + version: 4.1.1 + sourceRef: + kind: HelmRepository + name: openebs + namespace: flux-system + install: + createNamespace: true + crds: CreateReplace + remediation: + retries: 3 + upgrade: + crds: CreateReplace + remediation: + retries: 3 + values: + openebs-crds: + csi: + volumeSnapshots: + enabled: false + keep: false - chart: openebs - version: 4.1.1 - sourceRef: - kind: HelmRepository - name: openebs - namespace: flux-system - install: - createNamespace: true - crds: CreateReplace - remediation: - retries: 3 - upgrade: - crds: CreateReplace - remediation: - retries: 3 - values: - openebs-crds: - csi: - volumeSnapshots: - enabled: false - keep: false - - engines: - local: - # The lvm-localpv backend contains a duplicate of snapshot controller which will cause conflicts - lvm: - enabled: false - # The ZFS backend contains a duplicate of snapshot controller which will cause conflicts - zfs: - enabled: false - replicated: - # The Mayastor backend contains a duplicate of snapshot controller which will cause conflicts - mayastor: - enabled: false + engines: + local: + # The lvm-localpv backend contains a duplicate of snapshot controller which will cause conflicts + lvm: + enabled: false + # The ZFS backend contains a duplicate of snapshot controller which will cause conflicts + zfs: + enabled: false + replicated: + # The Mayastor backend contains a duplicate of snapshot controller which will cause conflicts + mayastor: + enabled: false diff --git a/clustertool/embed/generic/kubernetes/system/openebs/app/namespace.yaml b/clustertool/embed/generic/kubernetes/system/openebs/app/namespace.yaml index bb543052adb..a7c84fed8dc 100644 --- a/clustertool/embed/generic/kubernetes/system/openebs/app/namespace.yaml +++ b/clustertool/embed/generic/kubernetes/system/openebs/app/namespace.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Namespace metadata: - name: openebs - labels: - pod-security.kubernetes.io/enforce: privileged - topolvm.io/webhook: ignore + name: openebs + labels: + pod-security.kubernetes.io/enforce: privileged + topolvm.io/webhook: ignore diff --git a/clustertool/embed/generic/kubernetes/system/prometheus-operator/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/system/prometheus-operator/app/helm-release.yaml index 9050fd4e60a..8971953e7d8 100644 --- a/clustertool/embed/generic/kubernetes/system/prometheus-operator/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/system/prometheus-operator/app/helm-release.yaml @@ -1,27 +1,26 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: prometheus-operator - namespace: prometheus-operator + name: prometheus-operator + namespace: prometheus-operator spec: - interval: 5m - chart: - spec: - - chart: prometheus-operator - version: 9.1.0 - sourceRef: - kind: HelmRepository - name: truecharts - namespace: flux-system - interval: 5m - install: - createNamespace: true - crds: CreateReplace - remediation: - retries: 3 - upgrade: - crds: CreateReplace - remediation: - retries: 3 - values: {} + interval: 5m + chart: + spec: + chart: prometheus-operator + version: 9.1.0 + sourceRef: + kind: HelmRepository + name: truecharts + namespace: flux-system + interval: 5m + install: + createNamespace: true + crds: CreateReplace + remediation: + retries: 3 + upgrade: + crds: CreateReplace + remediation: + retries: 3 + values: {} diff --git a/clustertool/embed/generic/kubernetes/system/snapshot-controller/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/system/snapshot-controller/app/helm-release.yaml index 35f6e210f7e..ab1a170b9ec 100644 --- a/clustertool/embed/generic/kubernetes/system/snapshot-controller/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/system/snapshot-controller/app/helm-release.yaml @@ -1,27 +1,27 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: snapshot-controller - namespace: snapshot-controller + name: snapshot-controller + namespace: snapshot-controller spec: - interval: 5m - chart: - spec: - chart: snapshot-controller - version: 3.6.0 - sourceRef: - kind: HelmRepository - name: truecharts - namespace: flux-system - interval: 5m - install: - createNamespace: true - remediation: - retries: 3 - upgrade: - cleanupOnFail: true - crds: CreateReplace - remediation: - strategy: rollback - retries: 3 - values: + interval: 5m + chart: + spec: + chart: snapshot-controller + version: 3.6.0 + sourceRef: + kind: HelmRepository + name: truecharts + namespace: flux-system + interval: 5m + install: + createNamespace: true + remediation: + retries: 3 + upgrade: + cleanupOnFail: true + crds: CreateReplace + remediation: + strategy: rollback + retries: 3 + values: diff --git a/clustertool/embed/generic/kubernetes/system/spegel/app/namespace.yaml b/clustertool/embed/generic/kubernetes/system/spegel/app/namespace.yaml index c275d6eff84..975731fc07c 100644 --- a/clustertool/embed/generic/kubernetes/system/spegel/app/namespace.yaml +++ b/clustertool/embed/generic/kubernetes/system/spegel/app/namespace.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Namespace metadata: - name: spegel - labels: - pod-security.kubernetes.io/enforce: privileged - topolvm.io/webhook: ignore + name: spegel + labels: + pod-security.kubernetes.io/enforce: privileged + topolvm.io/webhook: ignore diff --git a/clustertool/embed/generic/kubernetes/system/system-upgrade-controller/app/namespace.yaml b/clustertool/embed/generic/kubernetes/system/system-upgrade-controller/app/namespace.yaml index 1a1d3c42162..e2bb4150014 100644 --- a/clustertool/embed/generic/kubernetes/system/system-upgrade-controller/app/namespace.yaml +++ b/clustertool/embed/generic/kubernetes/system/system-upgrade-controller/app/namespace.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Namespace metadata: - name: system-upgrade - annotations: - volsync.backube/privileged-movers: "true" - labels: - kustomize.toolkit.fluxcd.io/prune: disabled - goldilocks.fairwinds.com/enabled: "true" - pod-security.kubernetes.io/enforce: privileged + name: system-upgrade + annotations: + volsync.backube/privileged-movers: "true" + labels: + kustomize.toolkit.fluxcd.io/prune: disabled + goldilocks.fairwinds.com/enabled: "true" + pod-security.kubernetes.io/enforce: privileged diff --git a/clustertool/embed/generic/kubernetes/system/traefik-crds/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/system/traefik-crds/app/helm-release.yaml index 42daa2c4d52..60e8fd4637c 100644 --- a/clustertool/embed/generic/kubernetes/system/traefik-crds/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/system/traefik-crds/app/helm-release.yaml @@ -2,31 +2,31 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: traefik-crds - namespace: system + name: traefik-crds + namespace: system spec: - interval: 15m - chart: - spec: - chart: traefik-crds - version: 3.4.0 - sourceRef: - kind: HelmRepository - name: truecharts - namespace: flux-system - interval: 15m - timeout: 20m - maxHistory: 3 - driftDetection: - mode: warn - install: - createNamespace: true - remediation: - retries: 3 - upgrade: - cleanupOnFail: true - remediation: - retries: 3 - uninstall: - keepHistory: false - values: {} + interval: 15m + chart: + spec: + chart: traefik-crds + version: 3.4.0 + sourceRef: + kind: HelmRepository + name: truecharts + namespace: flux-system + interval: 15m + timeout: 20m + maxHistory: 3 + driftDetection: + mode: warn + install: + createNamespace: true + remediation: + retries: 3 + upgrade: + cleanupOnFail: true + remediation: + retries: 3 + uninstall: + keepHistory: false + values: {} diff --git a/clustertool/embed/generic/kubernetes/system/volsync/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/system/volsync/app/helm-release.yaml index 6255038a656..f1b662715ff 100644 --- a/clustertool/embed/generic/kubernetes/system/volsync/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/system/volsync/app/helm-release.yaml @@ -1,24 +1,23 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: volsync - namespace: volsync + name: volsync + namespace: volsync spec: - interval: 5m - chart: - spec: - - chart: volsync - version: 2.7.0 - sourceRef: - kind: HelmRepository - name: truecharts - namespace: flux-system - interval: 5m - install: - createNamespace: true - remediation: - retries: 3 - upgrade: - remediation: - retries: 3 + interval: 5m + chart: + spec: + chart: volsync + version: 2.7.0 + sourceRef: + kind: HelmRepository + name: truecharts + namespace: flux-system + interval: 5m + install: + createNamespace: true + remediation: + retries: 3 + upgrade: + remediation: + retries: 3 diff --git a/clustertool/embed/generic/kubernetes/system/volsync/app/namespace.yaml b/clustertool/embed/generic/kubernetes/system/volsync/app/namespace.yaml index 76e5bdb5abb..ba5549b0ffa 100644 --- a/clustertool/embed/generic/kubernetes/system/volsync/app/namespace.yaml +++ b/clustertool/embed/generic/kubernetes/system/volsync/app/namespace.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Namespace metadata: - name: volsync - labels: - pod-security.kubernetes.io/enforce: privileged - topolvm.io/webhook: ignore + name: volsync + labels: + pod-security.kubernetes.io/enforce: privileged + topolvm.io/webhook: ignore diff --git a/clustertool/embed/generic/root/repositories/helm/kubernetes-sigs-metrics-server.yaml b/clustertool/embed/generic/root/repositories/helm/kubernetes-sigs-metrics-server.yaml index 76ceb47e133..927bf0ff91e 100644 --- a/clustertool/embed/generic/root/repositories/helm/kubernetes-sigs-metrics-server.yaml +++ b/clustertool/embed/generic/root/repositories/helm/kubernetes-sigs-metrics-server.yaml @@ -1,10 +1,11 @@ -# yaml-language-server: $schema=https://kubernetes-schemas.zinn.ca/source.toolkit.fluxcd.io/helmrepository_v1beta2.json +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: - name: kubernetes-sigs-metrics-server - namespace: flux-system + name: kubernetes-sigs-metrics-server + namespace: flux-system spec: - interval: 30m - url: https://kubernetes-sigs.github.io/metrics-server/ - timeout: 3m + interval: 30m + url: https://kubernetes-sigs.github.io/metrics-server/ + timeout: 3m diff --git a/clustertool/embed/generic/root/repositories/helm/metallb.yaml b/clustertool/embed/generic/root/repositories/helm/metallb.yaml index 582103f6ba6..70110d4cb2c 100644 --- a/clustertool/embed/generic/root/repositories/helm/metallb.yaml +++ b/clustertool/embed/generic/root/repositories/helm/metallb.yaml @@ -1,9 +1,11 @@ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: - name: metallb - namespace: flux-system + name: metallb + namespace: flux-system spec: - interval: 10m - url: https://metallb.github.io/metallb - timeout: 3m + interval: 10m + url: https://metallb.github.io/metallb + timeout: 3m diff --git a/clustertool/embed/generic/root/repositories/helm/truecharts.yaml b/clustertool/embed/generic/root/repositories/helm/truecharts.yaml index f6b21705549..b9f1d39b1ed 100644 --- a/clustertool/embed/generic/root/repositories/helm/truecharts.yaml +++ b/clustertool/embed/generic/root/repositories/helm/truecharts.yaml @@ -1,10 +1,11 @@ -# yaml-language-server: $schema=https://kubernetes-schemas.zinn.ca/source.toolkit.fluxcd.io/helmrepository_v1beta2.json +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json apiVersion: source.toolkit.fluxcd.io/v1 kind: HelmRepository metadata: - name: truecharts - namespace: flux-system + name: truecharts + namespace: flux-system spec: - type: oci - interval: 5m - url: oci://tccr.io/truecharts + type: oci + interval: 5m + url: oci://tccr.io/truecharts