fix(kyak): remove tools ns

Signed-off-by: Tyler Witlin <[email protected]>
coolguy1771 · Aug 25, 2024 · ebeffd6 · ebeffd6
1 parent a779e5c
commit ebeffd6
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 33 deletions.
diff --git a/...ps/tools/descheduler/app/helmrelease.yaml → ...e-system/descheduler/app/helmrelease.yaml b/...ps/tools/descheduler/app/helmrelease.yaml → ...e-system/descheduler/app/helmrelease.yaml
@@ -14,16 +14,14 @@ spec:
         kind: HelmRepository
         name: descheduler
         namespace: flux-system
-  maxHistory: 2
   install:
     remediation:
       retries: 3
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
-  uninstall:
-    keepHistory: false
   values:
     replicas: 2
     kind: Deployment

diff --git a/.../tools/descheduler/app/kustomization.yaml → ...system/descheduler/app/kustomization.yaml b/.../tools/descheduler/app/kustomization.yaml → ...system/descheduler/app/kustomization.yaml
diff --git a/...netes/kyak/apps/tools/descheduler/ks.yaml → ...kyak/apps/kube-system/descheduler/ks.yaml b/...netes/kyak/apps/tools/descheduler/ks.yaml → ...kyak/apps/kube-system/descheduler/ks.yaml
@@ -6,11 +6,11 @@ metadata:
   name: &app descheduler
   namespace: flux-system
 spec:
-  targetNamespace: tools
+  targetNamespace: kube-system
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/kyak/apps/tools/descheduler/app
+  path: ./kubernetes/kyak/apps/kube-system/descheduler/app
   prune: true
   sourceRef:
     kind: GitRepository

diff --git a/kubernetes/kyak/apps/kube-system/kustomization.yaml b/kubernetes/kyak/apps/kube-system/kustomization.yaml
@@ -9,7 +9,9 @@ resources:
   # Flux-Kustomizations
   - ./cilium/ks.yaml
   - ./coredns/ks.yaml
+  - ./descheduler/ks.yaml
   - ./fstrim/ks.yaml
   - ./kubelet-csr-approver/ks.yaml
   - ./metrics-server/ks.yaml
   - ./node-feature-discovery/ks.yaml
+  - ./reloader/ks.yaml
diff --git a/kubernetes/kyak/apps/kube-system/namespace.yaml b/kubernetes/kyak/apps/kube-system/namespace.yaml
@@ -5,5 +5,4 @@ metadata:
   name: kube-system
   labels:
     istio.io/dataplane-mode: ambient
-
     kustomize.toolkit.fluxcd.io/prune: disabled
diff --git a/.../apps/tools/reloader/app/helmrelease.yaml → ...kube-system/reloader/app/helmrelease.yaml b/.../apps/tools/reloader/app/helmrelease.yaml → ...kube-system/reloader/app/helmrelease.yaml
diff --git a/...pps/tools/reloader/app/kustomization.yaml → ...be-system/reloader/app/kustomization.yaml b/...pps/tools/reloader/app/kustomization.yaml → ...be-system/reloader/app/kustomization.yaml
diff --git a/kubernetes/kyak/apps/tools/reloader/ks.yaml → ...es/kyak/apps/kube-system/reloader/ks.yaml b/kubernetes/kyak/apps/tools/reloader/ks.yaml → ...es/kyak/apps/kube-system/reloader/ks.yaml
@@ -6,11 +6,11 @@ metadata:
   name: &app reloader
   namespace: flux-system
 spec:
-  targetNamespace: tools
+  targetNamespace: kube-system
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/kyak/apps/tools/reloader/app
+  path: ./kubernetes/kyak/apps/kube-system/reloader/app
   prune: true
   sourceRef:
     kind: GitRepository

diff --git a/kubernetes/kyak/apps/monitoring/kromgo/ks.yaml b/kubernetes/kyak/apps/monitoring/kromgo/ks.yaml
@@ -22,4 +22,4 @@ spec:
   postBuild:
     substitute:
       APP: *app
-      GATUS_STATUS: "404"
+      GATUS_PATH: /-/ready
diff --git a/kubernetes/kyak/apps/monitoring/smartctl-exporter/app/helmrelease.yaml b/kubernetes/kyak/apps/monitoring/smartctl-exporter/app/helmrelease.yaml
@@ -1,5 +1,5 @@
 ---
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta1.json
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
@@ -14,21 +14,24 @@ spec:
         kind: HelmRepository
         name: prometheus-community
         namespace: flux-system
-  maxHistory: 2
   install:
     remediation:
       retries: 3
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
-  uninstall:
-    keepHistory: false
+  dependsOn:
+    - name: kube-prometheus-stack
+      namespace: monitoring
   values:
     fullnameOverride: *app
     config:
       devices:
         - /dev/sda
+        - /dev/sdb
+        - /dev/sdc
         - /dev/nvme0n1
     serviceMonitor:
       enabled: true

diff --git a/kubernetes/kyak/apps/monitoring/smartctl-exporter/app/prometheusrule.yaml b/kubernetes/kyak/apps/monitoring/smartctl-exporter/app/prometheusrule.yaml
@@ -38,7 +38,7 @@ spec:
           labels:
             severity: critical
         #
-        # https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus-smartctl-exporter/rules/rules.txt
+        # Ref: https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus-smartctl-exporter/rules/rules.txt
         #
         - alert: SmartDeviceMediaErrors
           annotations:

diff --git a/kubernetes/kyak/apps/tools/kustomization.yaml b/kubernetes/kyak/apps/tools/kustomization.yaml
diff --git a/kubernetes/kyak/apps/tools/namespace.yaml b/kubernetes/kyak/apps/tools/namespace.yaml