From 81f98f2b5b08bd5052893d8807bcf16943e8ae1b Mon Sep 17 00:00:00 2001 From: Boemeltrein <130394941+Boemeltrein@users.noreply.github.com> Date: Thu, 3 Apr 2025 22:33:20 +0200 Subject: [PATCH] fix(clustertool): indent corrections (#33919) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Correct some indent details. Already was irritating on my cluster, so why not change upstream. Also it is matching with the indent of the `.Values` in the same file ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [x] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code - [ ] 📜 Documentation Changes **🧪 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 changes to the documentation - [ ] 🧪 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):`, `chore(chart-name):`, `docs(chart-name):` or `fix(docs):` **➕ 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._ --- .../descheduler/app/helm-release.yaml | 144 +++++++++--------- .../system/cert-manager/app/helm-release.yaml | 52 +++---- .../cloudnative-pg/app/helm-release.yaml | 58 +++---- 3 files changed, 127 insertions(+), 127 deletions(-) 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 aa83e140a74..8a5b026eab5 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,76 +1,76 @@ 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.32.2 - sourceRef: - kind: HelmRepository - name: home-ops-mirror - namespace: flux-system - interval: 15m - timeout: 20m - maxHistory: 3 - install: - createNamespace: true - remediation: - retries: 3 - upgrade: - cleanupOnFail: true - remediation: - retries: 3 - uninstall: - keepHistory: false - values: - replicas: 2 - kind: Deployment - deschedulerPolicyAPIVersion: descheduler/v1alpha2 - deschedulerPolicy: - profiles: - - name: Default - pluginConfig: - - name: DefaultEvictor - args: - evictFailedBarePods: true - evictLocalStoragePods: true - evictSystemCriticalPods: true - - name: RemoveFailedPods - args: - reasons: - - ContainerStatusUnknown - - NodeAffinity - - NodeShutdown - - Terminated - - UnexpectedAdmissionError - includingInitContainers: true - excludeOwnerKinds: - - Job - minPodLifetimeSeconds: 1800 - - name: RemovePodsViolatingInterPodAntiAffinity - - name: RemovePodsViolatingNodeAffinity - args: - nodeAffinityType: - - requiredDuringSchedulingIgnoredDuringExecution - - name: RemovePodsViolatingNodeTaints - - name: RemovePodsViolatingTopologySpreadConstraint - plugins: - balance: - enabled: - - RemovePodsViolatingTopologySpreadConstraint - deschedule: - enabled: - - RemoveFailedPods - - RemovePodsViolatingInterPodAntiAffinity - - RemovePodsViolatingNodeAffinity - - RemovePodsViolatingNodeTaints - service: - enabled: true - serviceMonitor: - enabled: false - leaderElection: - enabled: true + interval: 15m + chart: + spec: + chart: descheduler + version: 0.32.2 + sourceRef: + kind: HelmRepository + name: home-ops-mirror + namespace: flux-system + interval: 15m + timeout: 20m + maxHistory: 3 + install: + createNamespace: true + remediation: + retries: 3 + upgrade: + cleanupOnFail: true + remediation: + retries: 3 + uninstall: + keepHistory: false + values: + replicas: 2 + kind: Deployment + deschedulerPolicyAPIVersion: descheduler/v1alpha2 + deschedulerPolicy: + profiles: + - name: Default + pluginConfig: + - name: DefaultEvictor + args: + evictFailedBarePods: true + evictLocalStoragePods: true + evictSystemCriticalPods: true + - name: RemoveFailedPods + args: + reasons: + - ContainerStatusUnknown + - NodeAffinity + - NodeShutdown + - Terminated + - UnexpectedAdmissionError + includingInitContainers: true + excludeOwnerKinds: + - Job + minPodLifetimeSeconds: 1800 + - name: RemovePodsViolatingInterPodAntiAffinity + - name: RemovePodsViolatingNodeAffinity + args: + nodeAffinityType: + - requiredDuringSchedulingIgnoredDuringExecution + - name: RemovePodsViolatingNodeTaints + - name: RemovePodsViolatingTopologySpreadConstraint + plugins: + balance: + enabled: + - RemovePodsViolatingTopologySpreadConstraint + deschedule: + enabled: + - RemoveFailedPods + - RemovePodsViolatingInterPodAntiAffinity + - RemovePodsViolatingNodeAffinity + - RemovePodsViolatingNodeTaints + service: + enabled: true + serviceMonitor: + enabled: false + leaderElection: + enabled: true 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 1b7091e8fed..a163b348b9c 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,30 +1,30 @@ 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: v1.17.1 - sourceRef: - kind: HelmRepository - name: home-ops-mirror - namespace: flux-system - interval: 5m - install: - createNamespace: true - crds: CreateReplace - remediation: - retries: 3 - upgrade: - crds: CreateReplace - remediation: - retries: 3 - values: - dns01RecursiveNameservers: "1.1.1.1:53,1.0.0.1:53" - dns01RecursiveNameserversOnly: false - installCRDs: true - enableCertificateOwnerRef: true + interval: 5m + chart: + spec: + chart: cert-manager + version: v1.17.1 + sourceRef: + kind: HelmRepository + name: home-ops-mirror + namespace: flux-system + interval: 5m + install: + createNamespace: true + crds: CreateReplace + remediation: + retries: 3 + upgrade: + crds: CreateReplace + remediation: + retries: 3 + values: + dns01RecursiveNameservers: "1.1.1.1:53,1.0.0.1:53" + dns01RecursiveNameserversOnly: false + installCRDs: true + enableCertificateOwnerRef: true 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 69ddc730bdb..23fa02cff39 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,33 +1,33 @@ 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: 0.23.2 - sourceRef: - kind: HelmRepository - name: cloudnative-pg - namespace: flux-system - interval: 5m - install: - createNamespace: true - crds: CreateReplace - remediation: - retries: 3 - upgrade: - crds: CreateReplace - remediation: - retries: 3 - values: - crds: - create: true - replicaCount: 2 - # monitoring: - # podMonitorEnabled: false - # grafanaDashboard: - # create: true + interval: 5m + chart: + spec: + chart: cloudnative-pg + version: 0.23.2 + sourceRef: + kind: HelmRepository + name: cloudnative-pg + namespace: flux-system + interval: 5m + install: + createNamespace: true + crds: CreateReplace + remediation: + retries: 3 + upgrade: + crds: CreateReplace + remediation: + retries: 3 + values: + crds: + create: true + replicaCount: 2 + # monitoring: + # podMonitorEnabled: false + # grafanaDashboard: + # create: true