From f2de4c7fab29db049bb90928fc392b5d8072f0c2 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Thu, 3 Oct 2024 10:03:24 -0400 Subject: [PATCH] fix: remove retryInterval from all flux ks Signed-off-by: Devin Buhl --- .../kubernetes/apps/cert-manager/cert-manager/ks.yaml.j2 | 2 -- .../templates/kubernetes/apps/flux-system/webhooks/ks.yaml.j2 | 1 - .../templates/kubernetes/apps/kube-system/cilium/ks.yaml.j2 | 2 -- .../templates/kubernetes/apps/kube-system/coredns/ks.yaml.j2 | 1 - .../apps/kube-system/kubelet-csr-approver/ks.yaml.j2 | 1 - .../kubernetes/apps/kube-system/metrics-server/ks.yaml.j2 | 1 - .../templates/kubernetes/apps/kube-system/reloader/ks.yaml.j2 | 1 - .../templates/kubernetes/apps/kube-system/spegel/ks.yaml.j2 | 1 - .../templates/kubernetes/apps/network/cloudflared/ks.yaml.j2 | 1 - .../templates/kubernetes/apps/network/echo-server/ks.yaml.j2 | 1 - .../templates/kubernetes/apps/network/external-dns/ks.yaml.j2 | 1 - .../templates/kubernetes/apps/network/ingress-nginx/ks.yaml.j2 | 3 --- .../templates/kubernetes/apps/network/k8s-gateway/ks.yaml.j2 | 1 - .../apps/observability/prometheus-operator-crds/ks.yaml.j2 | 1 - .../kubernetes/apps/openebs-system/openebs/ks.yaml.j2 | 1 - 15 files changed, 19 deletions(-) diff --git a/bootstrap/templates/kubernetes/apps/cert-manager/cert-manager/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/cert-manager/cert-manager/ks.yaml.j2 index 3efe99d8..a26f1852 100644 --- a/bootstrap/templates/kubernetes/apps/cert-manager/cert-manager/ks.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/cert-manager/cert-manager/ks.yaml.j2 @@ -16,7 +16,6 @@ spec: name: home-kubernetes wait: true interval: 30m - retryInterval: 1m timeout: 5m #% if bootstrap_cloudflare.enabled %# --- @@ -39,6 +38,5 @@ spec: name: home-kubernetes wait: true interval: 30m - retryInterval: 1m timeout: 5m #% endif %# diff --git a/bootstrap/templates/kubernetes/apps/flux-system/webhooks/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/flux-system/webhooks/ks.yaml.j2 index e80c50b2..25e4b9d5 100644 --- a/bootstrap/templates/kubernetes/apps/flux-system/webhooks/ks.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/flux-system/webhooks/ks.yaml.j2 @@ -16,5 +16,4 @@ spec: name: home-kubernetes wait: true interval: 30m - retryInterval: 1m timeout: 5m diff --git a/bootstrap/templates/kubernetes/apps/kube-system/cilium/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/cilium/ks.yaml.j2 index 2522f1df..2b0c235c 100644 --- a/bootstrap/templates/kubernetes/apps/kube-system/cilium/ks.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/kube-system/cilium/ks.yaml.j2 @@ -16,7 +16,6 @@ spec: name: home-kubernetes wait: true interval: 30m - retryInterval: 1m timeout: 5m --- apiVersion: kustomize.toolkit.fluxcd.io/v1 @@ -38,5 +37,4 @@ spec: name: home-kubernetes wait: false interval: 30m - retryInterval: 1m timeout: 5m diff --git a/bootstrap/templates/kubernetes/apps/kube-system/coredns/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/coredns/ks.yaml.j2 index bf2a537e..afa7ae2f 100644 --- a/bootstrap/templates/kubernetes/apps/kube-system/coredns/ks.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/kube-system/coredns/ks.yaml.j2 @@ -16,5 +16,4 @@ spec: name: home-kubernetes wait: false interval: 30m - retryInterval: 1m timeout: 5m diff --git a/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/ks.yaml.j2 index adfb4940..8fc9282f 100644 --- a/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/ks.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/ks.yaml.j2 @@ -16,5 +16,4 @@ spec: name: home-kubernetes wait: false interval: 30m - retryInterval: 1m timeout: 5m diff --git a/bootstrap/templates/kubernetes/apps/kube-system/metrics-server/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/metrics-server/ks.yaml.j2 index 244f53c1..10828aaa 100644 --- a/bootstrap/templates/kubernetes/apps/kube-system/metrics-server/ks.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/kube-system/metrics-server/ks.yaml.j2 @@ -16,5 +16,4 @@ spec: name: home-kubernetes wait: false interval: 30m - retryInterval: 1m timeout: 5m diff --git a/bootstrap/templates/kubernetes/apps/kube-system/reloader/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/reloader/ks.yaml.j2 index 9aa42993..c0e669e2 100644 --- a/bootstrap/templates/kubernetes/apps/kube-system/reloader/ks.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/kube-system/reloader/ks.yaml.j2 @@ -16,5 +16,4 @@ spec: name: home-kubernetes wait: false interval: 30m - retryInterval: 1m timeout: 5m diff --git a/bootstrap/templates/kubernetes/apps/kube-system/spegel/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/spegel/ks.yaml.j2 index 83c730b0..866bb6b9 100644 --- a/bootstrap/templates/kubernetes/apps/kube-system/spegel/ks.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/kube-system/spegel/ks.yaml.j2 @@ -16,5 +16,4 @@ spec: name: home-kubernetes wait: false interval: 30m - retryInterval: 1m timeout: 5m diff --git a/bootstrap/templates/kubernetes/apps/network/cloudflared/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/cloudflared/ks.yaml.j2 index eb8d8da0..01eb3909 100644 --- a/bootstrap/templates/kubernetes/apps/network/cloudflared/ks.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/network/cloudflared/ks.yaml.j2 @@ -18,5 +18,4 @@ spec: name: home-kubernetes wait: false interval: 30m - retryInterval: 1m timeout: 5m diff --git a/bootstrap/templates/kubernetes/apps/network/echo-server/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/echo-server/ks.yaml.j2 index 2984f219..6440fc8a 100644 --- a/bootstrap/templates/kubernetes/apps/network/echo-server/ks.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/network/echo-server/ks.yaml.j2 @@ -16,5 +16,4 @@ spec: name: home-kubernetes wait: false interval: 30m - retryInterval: 1m timeout: 5m diff --git a/bootstrap/templates/kubernetes/apps/network/external-dns/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/external-dns/ks.yaml.j2 index eaed4b56..ca5826cc 100644 --- a/bootstrap/templates/kubernetes/apps/network/external-dns/ks.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/network/external-dns/ks.yaml.j2 @@ -16,5 +16,4 @@ spec: name: home-kubernetes wait: true interval: 30m - retryInterval: 1m timeout: 5m diff --git a/bootstrap/templates/kubernetes/apps/network/ingress-nginx/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/ingress-nginx/ks.yaml.j2 index 99b1abb5..f7547d35 100644 --- a/bootstrap/templates/kubernetes/apps/network/ingress-nginx/ks.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/network/ingress-nginx/ks.yaml.j2 @@ -18,7 +18,6 @@ spec: name: home-kubernetes wait: true interval: 30m - retryInterval: 1m timeout: 5m --- apiVersion: kustomize.toolkit.fluxcd.io/v1 @@ -40,7 +39,6 @@ spec: name: home-kubernetes wait: false interval: 30m - retryInterval: 1m timeout: 5m --- apiVersion: kustomize.toolkit.fluxcd.io/v1 @@ -62,5 +60,4 @@ spec: name: home-kubernetes wait: false interval: 30m - retryInterval: 1m timeout: 5m diff --git a/bootstrap/templates/kubernetes/apps/network/k8s-gateway/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/k8s-gateway/ks.yaml.j2 index 06f44255..c5fcad8a 100644 --- a/bootstrap/templates/kubernetes/apps/network/k8s-gateway/ks.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/network/k8s-gateway/ks.yaml.j2 @@ -16,5 +16,4 @@ spec: name: home-kubernetes wait: false interval: 30m - retryInterval: 1m timeout: 5m diff --git a/bootstrap/templates/kubernetes/apps/observability/prometheus-operator-crds/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/observability/prometheus-operator-crds/ks.yaml.j2 index ffbb5dcb..8f532a12 100644 --- a/bootstrap/templates/kubernetes/apps/observability/prometheus-operator-crds/ks.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/observability/prometheus-operator-crds/ks.yaml.j2 @@ -16,5 +16,4 @@ spec: name: home-kubernetes wait: false interval: 30m - retryInterval: 1m timeout: 5m diff --git a/bootstrap/templates/kubernetes/apps/openebs-system/openebs/ks.yaml.j2 b/bootstrap/templates/kubernetes/apps/openebs-system/openebs/ks.yaml.j2 index 170feca9..0a650df3 100644 --- a/bootstrap/templates/kubernetes/apps/openebs-system/openebs/ks.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/openebs-system/openebs/ks.yaml.j2 @@ -16,5 +16,4 @@ spec: name: home-kubernetes wait: false interval: 30m - retryInterval: 1m timeout: 5m