From 474a76547251bf933356541b7dde3761041f0f54 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Tue, 18 Feb 2025 02:22:08 +0100 Subject: [PATCH] Adjusted interval/timeouts/dependencies --- clusters/titan.lan.huizinga.dev/infra/rook-ceph-cluster.yaml | 2 +- clusters/titan.lan.huizinga.dev/infra/traefik-middleware.yaml | 2 +- clusters/titan.lan.huizinga.dev/infra/traefik.yaml | 2 ++ infra/cert-manager/helm-release.yaml | 3 ++- infra/cert-manager/helm-repository.yaml | 3 ++- infra/cnpg/helm-release.yaml | 3 ++- infra/cnpg/helm-repository.yaml | 3 ++- infra/rook-ceph-cluster/helm-release.yaml | 4 ++-- infra/rook-ceph/helm-release.yaml | 3 ++- infra/rook-ceph/helm-repository.yaml | 3 ++- infra/topolvm/helm-release.yaml | 3 ++- infra/topolvm/helm-repository.yaml | 3 ++- infra/traefik/helm-release.yaml | 3 ++- infra/traefik/helm-repository.yaml | 3 ++- infra/velero/helm-release.yaml | 3 ++- infra/velero/helm-repository.yaml | 3 ++- 16 files changed, 30 insertions(+), 16 deletions(-) diff --git a/clusters/titan.lan.huizinga.dev/infra/rook-ceph-cluster.yaml b/clusters/titan.lan.huizinga.dev/infra/rook-ceph-cluster.yaml index c211cac..b495594 100644 --- a/clusters/titan.lan.huizinga.dev/infra/rook-ceph-cluster.yaml +++ b/clusters/titan.lan.huizinga.dev/infra/rook-ceph-cluster.yaml @@ -7,7 +7,7 @@ spec: interval: 15m path: ./infra/rook-ceph-cluster dependsOn: - - name: cert-manager + - name: rook-ceph prune: true timeout: 2m sourceRef: diff --git a/clusters/titan.lan.huizinga.dev/infra/traefik-middleware.yaml b/clusters/titan.lan.huizinga.dev/infra/traefik-middleware.yaml index a8dc028..a7474c3 100644 --- a/clusters/titan.lan.huizinga.dev/infra/traefik-middleware.yaml +++ b/clusters/titan.lan.huizinga.dev/infra/traefik-middleware.yaml @@ -9,7 +9,7 @@ spec: dependsOn: - name: traefik prune: true - timeout: 10m + timeout: 2m sourceRef: kind: GitRepository name: flux-system diff --git a/clusters/titan.lan.huizinga.dev/infra/traefik.yaml b/clusters/titan.lan.huizinga.dev/infra/traefik.yaml index 9305d07..c51433e 100644 --- a/clusters/titan.lan.huizinga.dev/infra/traefik.yaml +++ b/clusters/titan.lan.huizinga.dev/infra/traefik.yaml @@ -6,6 +6,8 @@ metadata: spec: interval: 15m path: ./infra/traefik + dependsOn: + - name: letsencrypt prune: true timeout: 2m sourceRef: diff --git a/infra/cert-manager/helm-release.yaml b/infra/cert-manager/helm-release.yaml index 6ed5678..bf99b5c 100644 --- a/infra/cert-manager/helm-release.yaml +++ b/infra/cert-manager/helm-release.yaml @@ -11,7 +11,8 @@ spec: kind: HelmRepository name: jetstack version: v1.15.3 - interval: 1m0s + interval: 15m + timeout: 5m values: installCRDs: true replicaCount: 2 diff --git a/infra/cert-manager/helm-repository.yaml b/infra/cert-manager/helm-repository.yaml index b012dc9..085cdd3 100644 --- a/infra/cert-manager/helm-repository.yaml +++ b/infra/cert-manager/helm-repository.yaml @@ -3,5 +3,6 @@ kind: HelmRepository metadata: name: jetstack spec: - interval: 1m0s + interval: 15m + timeout: 2m url: https://charts.jetstack.io diff --git a/infra/cnpg/helm-release.yaml b/infra/cnpg/helm-release.yaml index 4af04fa..4509119 100644 --- a/infra/cnpg/helm-release.yaml +++ b/infra/cnpg/helm-release.yaml @@ -12,6 +12,7 @@ spec: kind: HelmRepository name: cnpg version: 0.22.0 - interval: 1m0s + interval: 15m + timeout: 5m values: replicaCount: 2 diff --git a/infra/cnpg/helm-repository.yaml b/infra/cnpg/helm-repository.yaml index 7b3732d..e587f77 100644 --- a/infra/cnpg/helm-repository.yaml +++ b/infra/cnpg/helm-repository.yaml @@ -4,5 +4,6 @@ metadata: name: cnpg namespace: cnpg-system spec: - interval: 1m0s + interval: 15m + timeout: 2m url: https://cloudnative-pg.github.io/charts diff --git a/infra/rook-ceph-cluster/helm-release.yaml b/infra/rook-ceph-cluster/helm-release.yaml index 640d888..63832c9 100644 --- a/infra/rook-ceph-cluster/helm-release.yaml +++ b/infra/rook-ceph-cluster/helm-release.yaml @@ -12,8 +12,8 @@ spec: kind: HelmRepository name: rook-release version: 1.16.3 - interval: 1m0s - timeout: 10m + interval: 15m + timeout: 5m values: toolbox: enabled: true diff --git a/infra/rook-ceph/helm-release.yaml b/infra/rook-ceph/helm-release.yaml index b1556c1..c960a70 100644 --- a/infra/rook-ceph/helm-release.yaml +++ b/infra/rook-ceph/helm-release.yaml @@ -11,4 +11,5 @@ spec: kind: HelmRepository name: rook-release version: 1.16.3 - interval: 1m0s + interval: 15m + timeout: 5m diff --git a/infra/rook-ceph/helm-repository.yaml b/infra/rook-ceph/helm-repository.yaml index 02effe4..2110510 100644 --- a/infra/rook-ceph/helm-repository.yaml +++ b/infra/rook-ceph/helm-repository.yaml @@ -3,5 +3,6 @@ kind: HelmRepository metadata: name: rook-release spec: - interval: 1m0s + interval: 15m + timeout: 2m url: https://charts.rook.io/release diff --git a/infra/topolvm/helm-release.yaml b/infra/topolvm/helm-release.yaml index 867d46f..23e3368 100644 --- a/infra/topolvm/helm-release.yaml +++ b/infra/topolvm/helm-release.yaml @@ -11,7 +11,8 @@ spec: kind: HelmRepository name: topolvm version: 15.5.1 - interval: 1m0s + interval: 15m + timeout: 5m values: lvmd: deviceClasses: diff --git a/infra/topolvm/helm-repository.yaml b/infra/topolvm/helm-repository.yaml index 44a3e05..6028c09 100644 --- a/infra/topolvm/helm-repository.yaml +++ b/infra/topolvm/helm-repository.yaml @@ -3,5 +3,6 @@ kind: HelmRepository metadata: name: topolvm spec: - interval: 1m0s + interval: 15m + timeout: 2m url: https://topolvm.github.io/topolvm diff --git a/infra/traefik/helm-release.yaml b/infra/traefik/helm-release.yaml index 5ffe735..a8a5e3d 100644 --- a/infra/traefik/helm-release.yaml +++ b/infra/traefik/helm-release.yaml @@ -12,7 +12,8 @@ spec: kind: HelmRepository name: traefik version: 31.1.1 - interval: 1m0s + interval: 15m + timeout: 5m values: deployment: kind: DaemonSet diff --git a/infra/traefik/helm-repository.yaml b/infra/traefik/helm-repository.yaml index c1ac1bc..2de0a02 100644 --- a/infra/traefik/helm-repository.yaml +++ b/infra/traefik/helm-repository.yaml @@ -3,5 +3,6 @@ kind: HelmRepository metadata: name: traefik spec: - interval: 1m0s + interval: 15m + timeout: 2m url: https://traefik.github.io/charts diff --git a/infra/velero/helm-release.yaml b/infra/velero/helm-release.yaml index 5b5e454..bac7a5c 100644 --- a/infra/velero/helm-release.yaml +++ b/infra/velero/helm-release.yaml @@ -11,7 +11,8 @@ spec: kind: HelmRepository name: velero version: 8.3.0 - interval: 1m0s + interval: 15m + timeout: 5m values: credentials: useSecret: false diff --git a/infra/velero/helm-repository.yaml b/infra/velero/helm-repository.yaml index da9fccb..7eaf5be 100644 --- a/infra/velero/helm-repository.yaml +++ b/infra/velero/helm-repository.yaml @@ -3,5 +3,6 @@ kind: HelmRepository metadata: name: velero spec: - interval: 1m0s + interval: 15m + timeout: 2m url: https://vmware-tanzu.github.io/helm-charts