feat: use wait instead of healthchecks and lower timings on flux ks

Signed-off-by: Devin Buhl <devin@buhl.casa>

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

@@ -14,7 +14,7 @@ spec:
         kind: HelmRepository
         name: jetstack
         namespace: flux-system
-  maxHistory: 3
+  maxHistory: 2
   install:
     createNamespace: true
     remediation:

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

@@ -10,14 +10,10 @@ spec:
   sourceRef:
     kind: GitRepository
     name: home-kubernetes
-  healthChecks:
+  wait: true
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+  interval: 15m
-      kind: HelmRelease
-      name: cert-manager
-      namespace: cert-manager
-  interval: 30m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
@@ -32,6 +28,6 @@ spec:
   sourceRef:
     kind: GitRepository
     name: home-kubernetes
-  interval: 30m
+  interval: 15m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s

kubernetes/apps/default/echo-server/app/helmrelease.yaml

@@ -14,7 +14,7 @@ spec:
         kind: HelmRepository
         name: bjw-s
         namespace: flux-system
-  maxHistory: 3
+  maxHistory: 2
   install:
     createNamespace: true
     remediation:

kubernetes/apps/default/echo-server/ks.yaml

@@ -10,11 +10,7 @@ spec:
   sourceRef:
     kind: GitRepository
     name: home-kubernetes
-  healthChecks:
+  wait: true
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+  interval: 15m
-      kind: HelmRelease
-      name: echo-server
-      namespace: default
-  interval: 30m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s

kubernetes/apps/default/hajimari/app/helmrelease.yaml

@@ -14,7 +14,7 @@ spec:
         kind: HelmRepository
         name: hajimari
         namespace: flux-system
-  maxHistory: 3
+  maxHistory: 2
   install:
     createNamespace: true
     remediation:

kubernetes/apps/default/hajimari/ks.yaml

@@ -10,11 +10,7 @@ spec:
   sourceRef:
     kind: GitRepository
     name: home-kubernetes
-  healthChecks:
+  wait: true
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+  interval: 15m
-      kind: HelmRelease
-      name: hajimari
-      namespace: default
-  interval: 30m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s

kubernetes/apps/flux-system/addons/ks.yaml

@@ -11,6 +11,6 @@ spec:
     kind: GitRepository
     name: home-kubernetes
   wait: true
-  interval: 30m
+  interval: 15m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s

kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml

@@ -14,7 +14,7 @@ spec:
         kind: HelmRepository
         name: weave-gitops
         namespace: flux-system
-  maxHistory: 3
+  maxHistory: 2
   install:
     createNamespace: true
     remediation:

kubernetes/apps/flux-system/weave-gitops/ks.yaml

@@ -10,11 +10,7 @@ spec:
   sourceRef:
     kind: GitRepository
     name: home-kubernetes
-  healthChecks:
+  wait: true
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+  interval: 15m
-      kind: HelmRelease
-      name: weave-gitops
-      namespace: flux-system
-  interval: 30m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s

kubernetes/apps/kube-system/kube-vip/ks.yaml

@@ -10,11 +10,7 @@ spec:
   sourceRef:
     kind: GitRepository
     name: home-kubernetes
-  healthChecks:
+  wait: true
-    - apiVersion: apps/v1
+  interval: 15m
-      kind: DaemonSet
-      name: kube-vip
-      namespace: kube-system
-  interval: 30m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s

kubernetes/apps/kube-system/local-path-provisioner/app/helmrelease.yaml

@@ -13,7 +13,7 @@ spec:
         kind: GitRepository
         name: local-path-provisioner
         namespace: flux-system
-  maxHistory: 3
+  maxHistory: 2
   install:
     createNamespace: true
     remediation:

kubernetes/apps/kube-system/local-path-provisioner/ks.yaml

@@ -12,11 +12,7 @@ spec:
   sourceRef:
     kind: GitRepository
     name: home-kubernetes
-  healthChecks:
+  wait: true
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+  interval: 15m
-      kind: HelmRelease
-      name: local-path-provisioner
-      namespace: kube-system
-  interval: 30m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s

kubernetes/apps/kube-system/metrics-server/app/helmrelease.yaml

@@ -14,7 +14,7 @@ spec:
         kind: HelmRepository
         name: metrics-server
         namespace: flux-system
-  maxHistory: 3
+  maxHistory: 2
   install:
     createNamespace: true
     remediation:

kubernetes/apps/kube-system/metrics-server/ks.yaml

@@ -10,11 +10,7 @@ spec:
   sourceRef:
     kind: GitRepository
     name: home-kubernetes
-  healthChecks:
+  wait: true
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+  interval: 15m
-      kind: HelmRelease
-      name: metrics-server
-      namespace: kube-system
-  interval: 30m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s

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

@@ -14,7 +14,7 @@ spec:
         kind: HelmRepository
         name: stakater
         namespace: flux-system
-  maxHistory: 3
+  maxHistory: 2
   install:
     createNamespace: true
     remediation:

kubernetes/apps/kube-system/reloader/ks.yaml

@@ -10,11 +10,7 @@ spec:
   sourceRef:
     kind: GitRepository
     name: home-kubernetes
-  healthChecks:
+  wait: true
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+  interval: 15m
-      kind: HelmRelease
-      name: reloader
-      namespace: kube-system
-  interval: 30m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s

kubernetes/apps/monitoring/kubernetes-dashboard/app/helmrelease.yaml

@@ -14,7 +14,7 @@ spec:
         kind: HelmRepository
         name: kubernetes-dashboard
         namespace: flux-system
-  maxHistory: 3
+  maxHistory: 2
   install:
     createNamespace: true
     remediation:

kubernetes/apps/monitoring/kubernetes-dashboard/ks.yaml

@@ -10,11 +10,7 @@ spec:
   sourceRef:
     kind: GitRepository
     name: home-kubernetes
-  healthChecks:
+  wait: true
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+  interval: 15m
-      kind: HelmRelease
-      name: kubernetes-dashboard
-      namespace: monitoring
-  interval: 30m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s

kubernetes/apps/networking/cloudflared/app/helmrelease.yaml

@@ -2,7 +2,7 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: &app cloudflared
+  name: cloudflared
   namespace: networking
 spec:
   interval: 15m
@@ -14,7 +14,7 @@ spec:
         kind: HelmRepository
         name: bjw-s
         namespace: flux-system
-  maxHistory: 3
+  maxHistory: 2
   install:
     createNamespace: true
     remediation:

kubernetes/apps/networking/cloudflared/ks.yaml

@@ -12,11 +12,7 @@ spec:
   sourceRef:
     kind: GitRepository
     name: home-kubernetes
-  healthChecks:
+  wait: true
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+  interval: 15m
-      kind: HelmRelease
-      name: cloudflared
-      namespace: networking
-  interval: 30m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s

kubernetes/apps/networking/external-dns/app/helmrelease.yaml

@@ -14,7 +14,7 @@ spec:
         kind: HelmRepository
         name: external-dns
         namespace: flux-system
-  maxHistory: 3
+  maxHistory: 2
   install:
     createNamespace: true
     remediation:

kubernetes/apps/networking/external-dns/ks.yaml

@@ -5,16 +5,14 @@ metadata:
   name: cluster-apps-external-dns
   namespace: flux-system
 spec:
+  dependsOn:
+    - name: cluster-apps-cloudflared
   path: ./kubernetes/apps/networking/external-dns/app
   prune: true
   sourceRef:
     kind: GitRepository
     name: home-kubernetes
-  healthChecks:
+  wait: true
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+  interval: 15m
-      kind: HelmRelease
-      name: external-dns
-      namespace: networking
-  interval: 30m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s

kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml

@@ -14,7 +14,7 @@ spec:
         kind: HelmRepository
         name: ingress-nginx
         namespace: flux-system
-  maxHistory: 3
+  maxHistory: 2
   install:
     createNamespace: true
     remediation:

kubernetes/apps/networking/ingress-nginx/ks.yaml

@@ -13,9 +13,9 @@ spec:
     kind: GitRepository
     name: home-kubernetes
   wait: true
-  interval: 30m
+  interval: 15m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
@@ -31,11 +31,7 @@ spec:
   sourceRef:
     kind: GitRepository
     name: home-kubernetes
-  healthChecks:
+  wait: true
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+  interval: 15m
-      kind: HelmRelease
-      name: ingress-nginx
-      namespace: networking
-  interval: 30m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s

kubernetes/apps/networking/k8s-gateway/app/helmrelease.yaml

@@ -14,7 +14,7 @@ spec:
         kind: HelmRepository
         name: k8s-gateway
         namespace: flux-system
-  maxHistory: 3
+  maxHistory: 2
   install:
     createNamespace: true
     remediation:

kubernetes/apps/networking/k8s-gateway/ks.yaml

@@ -6,18 +6,13 @@ metadata:
   namespace: flux-system
 spec:
   dependsOn:
-    - name: cluster-apps-metallb
     - name: cluster-apps-metallb-config
   path: ./kubernetes/apps/networking/k8s-gateway/app
   prune: true
   sourceRef:
     kind: GitRepository
     name: home-kubernetes
-  healthChecks:
+  wait: true
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+  interval: 15m
-      kind: HelmRelease
-      name: k8s-gateway
-      namespace: networking
-  interval: 30m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s

kubernetes/apps/networking/metallb/app/helmrelease.yaml

@@ -14,7 +14,7 @@ spec:
         kind: HelmRepository
         name: metallb
         namespace: flux-system
-  maxHistory: 3
+  maxHistory: 2
   install:
     createNamespace: true
     remediation:

kubernetes/apps/networking/metallb/ks.yaml

@@ -10,14 +10,10 @@ spec:
   sourceRef:
     kind: GitRepository
     name: home-kubernetes
-  healthChecks:
+  wait: true
-    - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+  interval: 15m
-      kind: HelmRelease
-      name: metallb
-      namespace: networking
-  interval: 30m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
@@ -33,6 +29,6 @@ spec:
     kind: GitRepository
     name: home-kubernetes
   wait: true
-  interval: 30m
+  interval: 15m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s

kubernetes/apps/system-upgrade/system-upgrade-controller/ks.yaml

@@ -11,9 +11,9 @@ spec:
     kind: GitRepository
     name: home-kubernetes
   wait: true
-  interval: 30m
+  interval: 15m
   retryInterval: 1m
-  timeout: 3m
+  timeout: 30s
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
@@ -29,6 +29,6 @@ spec:
     kind: GitRepository
     name: home-kubernetes
   wait: true
-  interval: 30m
+  interval: 15m
   retryInterval: 1m
-  timeout: 5m
+  timeout: 30s