diff --git a/kubernetes/apps/cert-manager/cert-manager/app/helmrelease.yaml b/kubernetes/apps/cert-manager/cert-manager/app/helmrelease.yaml index afe88bb6..d24ed37e 100644 --- a/kubernetes/apps/cert-manager/cert-manager/app/helmrelease.yaml +++ b/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: diff --git a/kubernetes/apps/cert-manager/cert-manager/ks.yaml b/kubernetes/apps/cert-manager/cert-manager/ks.yaml index 7849953e..8d35f4ec 100644 --- a/kubernetes/apps/cert-manager/cert-manager/ks.yaml +++ b/kubernetes/apps/cert-manager/cert-manager/ks.yaml @@ -10,14 +10,10 @@ spec: sourceRef: kind: GitRepository name: home-kubernetes - healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 - kind: HelmRelease - name: cert-manager - namespace: cert-manager - interval: 30m + wait: true + interval: 15m 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 diff --git a/kubernetes/apps/default/echo-server/app/helmrelease.yaml b/kubernetes/apps/default/echo-server/app/helmrelease.yaml index 200d20ee..e2142b55 100644 --- a/kubernetes/apps/default/echo-server/app/helmrelease.yaml +++ b/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: diff --git a/kubernetes/apps/default/echo-server/ks.yaml b/kubernetes/apps/default/echo-server/ks.yaml index 478e66c9..f1ca69e4 100644 --- a/kubernetes/apps/default/echo-server/ks.yaml +++ b/kubernetes/apps/default/echo-server/ks.yaml @@ -10,11 +10,7 @@ spec: sourceRef: kind: GitRepository name: home-kubernetes - healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 - kind: HelmRelease - name: echo-server - namespace: default - interval: 30m + wait: true + interval: 15m retryInterval: 1m - timeout: 3m + timeout: 30s diff --git a/kubernetes/apps/default/hajimari/app/helmrelease.yaml b/kubernetes/apps/default/hajimari/app/helmrelease.yaml index 0b53323c..e24367ab 100644 --- a/kubernetes/apps/default/hajimari/app/helmrelease.yaml +++ b/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: diff --git a/kubernetes/apps/default/hajimari/ks.yaml b/kubernetes/apps/default/hajimari/ks.yaml index d336d000..9c09cf78 100644 --- a/kubernetes/apps/default/hajimari/ks.yaml +++ b/kubernetes/apps/default/hajimari/ks.yaml @@ -10,11 +10,7 @@ spec: sourceRef: kind: GitRepository name: home-kubernetes - healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 - kind: HelmRelease - name: hajimari - namespace: default - interval: 30m + wait: true + interval: 15m retryInterval: 1m - timeout: 3m + timeout: 30s diff --git a/kubernetes/apps/flux-system/addons/ks.yaml b/kubernetes/apps/flux-system/addons/ks.yaml index ed158e02..0f8068b5 100644 --- a/kubernetes/apps/flux-system/addons/ks.yaml +++ b/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 diff --git a/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml b/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml index 69ca279c..fed5e520 100644 --- a/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml +++ b/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: diff --git a/kubernetes/apps/flux-system/weave-gitops/ks.yaml b/kubernetes/apps/flux-system/weave-gitops/ks.yaml index cc1bc1ad..f0516a32 100644 --- a/kubernetes/apps/flux-system/weave-gitops/ks.yaml +++ b/kubernetes/apps/flux-system/weave-gitops/ks.yaml @@ -10,11 +10,7 @@ spec: sourceRef: kind: GitRepository name: home-kubernetes - healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 - kind: HelmRelease - name: weave-gitops - namespace: flux-system - interval: 30m + wait: true + interval: 15m retryInterval: 1m - timeout: 3m + timeout: 30s diff --git a/kubernetes/apps/kube-system/kube-vip/ks.yaml b/kubernetes/apps/kube-system/kube-vip/ks.yaml index ebdc4428..959ae137 100644 --- a/kubernetes/apps/kube-system/kube-vip/ks.yaml +++ b/kubernetes/apps/kube-system/kube-vip/ks.yaml @@ -10,11 +10,7 @@ spec: sourceRef: kind: GitRepository name: home-kubernetes - healthChecks: - - apiVersion: apps/v1 - kind: DaemonSet - name: kube-vip - namespace: kube-system - interval: 30m + wait: true + interval: 15m retryInterval: 1m - timeout: 3m + timeout: 30s diff --git a/kubernetes/apps/kube-system/local-path-provisioner/app/helmrelease.yaml b/kubernetes/apps/kube-system/local-path-provisioner/app/helmrelease.yaml index ad92d0d4..802a189e 100644 --- a/kubernetes/apps/kube-system/local-path-provisioner/app/helmrelease.yaml +++ b/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: diff --git a/kubernetes/apps/kube-system/local-path-provisioner/ks.yaml b/kubernetes/apps/kube-system/local-path-provisioner/ks.yaml index c607f9fa..28be161e 100644 --- a/kubernetes/apps/kube-system/local-path-provisioner/ks.yaml +++ b/kubernetes/apps/kube-system/local-path-provisioner/ks.yaml @@ -12,11 +12,7 @@ spec: sourceRef: kind: GitRepository name: home-kubernetes - healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 - kind: HelmRelease - name: local-path-provisioner - namespace: kube-system - interval: 30m + wait: true + interval: 15m retryInterval: 1m - timeout: 3m + timeout: 30s diff --git a/kubernetes/apps/kube-system/metrics-server/app/helmrelease.yaml b/kubernetes/apps/kube-system/metrics-server/app/helmrelease.yaml index 5e1cdfe0..9a68692b 100644 --- a/kubernetes/apps/kube-system/metrics-server/app/helmrelease.yaml +++ b/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: diff --git a/kubernetes/apps/kube-system/metrics-server/ks.yaml b/kubernetes/apps/kube-system/metrics-server/ks.yaml index 89bd24c2..49a5ef17 100644 --- a/kubernetes/apps/kube-system/metrics-server/ks.yaml +++ b/kubernetes/apps/kube-system/metrics-server/ks.yaml @@ -10,11 +10,7 @@ spec: sourceRef: kind: GitRepository name: home-kubernetes - healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 - kind: HelmRelease - name: metrics-server - namespace: kube-system - interval: 30m + wait: true + interval: 15m retryInterval: 1m - timeout: 3m + timeout: 30s diff --git a/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml b/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml index c04b0406..6eb6cbe4 100644 --- a/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml +++ b/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: diff --git a/kubernetes/apps/kube-system/reloader/ks.yaml b/kubernetes/apps/kube-system/reloader/ks.yaml index aa78e68e..900f0a11 100644 --- a/kubernetes/apps/kube-system/reloader/ks.yaml +++ b/kubernetes/apps/kube-system/reloader/ks.yaml @@ -10,11 +10,7 @@ spec: sourceRef: kind: GitRepository name: home-kubernetes - healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 - kind: HelmRelease - name: reloader - namespace: kube-system - interval: 30m + wait: true + interval: 15m retryInterval: 1m - timeout: 3m + timeout: 30s diff --git a/kubernetes/apps/monitoring/kubernetes-dashboard/app/helmrelease.yaml b/kubernetes/apps/monitoring/kubernetes-dashboard/app/helmrelease.yaml index 7fd4d33e..933ff7e5 100644 --- a/kubernetes/apps/monitoring/kubernetes-dashboard/app/helmrelease.yaml +++ b/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: diff --git a/kubernetes/apps/monitoring/kubernetes-dashboard/ks.yaml b/kubernetes/apps/monitoring/kubernetes-dashboard/ks.yaml index 8b04f13c..cf5cb86e 100644 --- a/kubernetes/apps/monitoring/kubernetes-dashboard/ks.yaml +++ b/kubernetes/apps/monitoring/kubernetes-dashboard/ks.yaml @@ -10,11 +10,7 @@ spec: sourceRef: kind: GitRepository name: home-kubernetes - healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 - kind: HelmRelease - name: kubernetes-dashboard - namespace: monitoring - interval: 30m + wait: true + interval: 15m retryInterval: 1m - timeout: 3m + timeout: 30s diff --git a/kubernetes/apps/networking/cloudflared/app/helmrelease.yaml b/kubernetes/apps/networking/cloudflared/app/helmrelease.yaml index 3d72e6df..3fd5a7cc 100644 --- a/kubernetes/apps/networking/cloudflared/app/helmrelease.yaml +++ b/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: diff --git a/kubernetes/apps/networking/cloudflared/ks.yaml b/kubernetes/apps/networking/cloudflared/ks.yaml index 898b681a..8eafdb0c 100644 --- a/kubernetes/apps/networking/cloudflared/ks.yaml +++ b/kubernetes/apps/networking/cloudflared/ks.yaml @@ -12,11 +12,7 @@ spec: sourceRef: kind: GitRepository name: home-kubernetes - healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 - kind: HelmRelease - name: cloudflared - namespace: networking - interval: 30m + wait: true + interval: 15m retryInterval: 1m - timeout: 3m + timeout: 30s diff --git a/kubernetes/apps/networking/external-dns/app/helmrelease.yaml b/kubernetes/apps/networking/external-dns/app/helmrelease.yaml index 3f48dbf1..1053fa07 100644 --- a/kubernetes/apps/networking/external-dns/app/helmrelease.yaml +++ b/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: diff --git a/kubernetes/apps/networking/external-dns/ks.yaml b/kubernetes/apps/networking/external-dns/ks.yaml index fa62cc78..4d9bb578 100644 --- a/kubernetes/apps/networking/external-dns/ks.yaml +++ b/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: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 - kind: HelmRelease - name: external-dns - namespace: networking - interval: 30m + wait: true + interval: 15m retryInterval: 1m - timeout: 3m + timeout: 30s diff --git a/kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml b/kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml index c494d3b5..800bfdb6 100644 --- a/kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml +++ b/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: diff --git a/kubernetes/apps/networking/ingress-nginx/ks.yaml b/kubernetes/apps/networking/ingress-nginx/ks.yaml index b947da20..2d7dca32 100644 --- a/kubernetes/apps/networking/ingress-nginx/ks.yaml +++ b/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: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 - kind: HelmRelease - name: ingress-nginx - namespace: networking - interval: 30m + wait: true + interval: 15m retryInterval: 1m - timeout: 3m + timeout: 30s diff --git a/kubernetes/apps/networking/k8s-gateway/app/helmrelease.yaml b/kubernetes/apps/networking/k8s-gateway/app/helmrelease.yaml index 5f66830e..0428850a 100644 --- a/kubernetes/apps/networking/k8s-gateway/app/helmrelease.yaml +++ b/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: diff --git a/kubernetes/apps/networking/k8s-gateway/ks.yaml b/kubernetes/apps/networking/k8s-gateway/ks.yaml index 3b54eba0..17a446b9 100644 --- a/kubernetes/apps/networking/k8s-gateway/ks.yaml +++ b/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: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 - kind: HelmRelease - name: k8s-gateway - namespace: networking - interval: 30m + wait: true + interval: 15m retryInterval: 1m - timeout: 3m + timeout: 30s diff --git a/kubernetes/apps/networking/metallb/app/helmrelease.yaml b/kubernetes/apps/networking/metallb/app/helmrelease.yaml index 28066d70..149aae27 100644 --- a/kubernetes/apps/networking/metallb/app/helmrelease.yaml +++ b/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: diff --git a/kubernetes/apps/networking/metallb/ks.yaml b/kubernetes/apps/networking/metallb/ks.yaml index f4544e32..c321c499 100644 --- a/kubernetes/apps/networking/metallb/ks.yaml +++ b/kubernetes/apps/networking/metallb/ks.yaml @@ -10,14 +10,10 @@ spec: sourceRef: kind: GitRepository name: home-kubernetes - healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 - kind: HelmRelease - name: metallb - namespace: networking - interval: 30m + wait: true + interval: 15m 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 diff --git a/kubernetes/apps/system-upgrade/system-upgrade-controller/ks.yaml b/kubernetes/apps/system-upgrade/system-upgrade-controller/ks.yaml index 66803cae..6c80840e 100644 --- a/kubernetes/apps/system-upgrade/system-upgrade-controller/ks.yaml +++ b/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