Allign timeouts for HelmReleases

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
2026-01-28 02:18:36 +00:00 · 2025-09-24 12:49:37 +02:00
parent f871fbdb1e
commit 9f9d8f8530
26 changed files with 105 additions and 43 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,13 +1,6 @@
 repos:
 - repo: local
  hooks:
-    - id: gen-versions-map
-      name: Generate versions map and check for changes
-      entry: sh -c 'make -C packages/apps check-version-map && make -C packages/extra check-version-map'
-      language: system
-      types: [file]
-      pass_filenames: false
-      description: Run the script and fail if it generates changes
    - id: run-make-generate
      name: Run 'make generate' in all app directories
      entry: |
--- a/packages/apps/Makefile
+++ b/packages/apps/Makefile
@@ -1,4 +1,4 @@
-OUT=../_out/repos/apps
+OUT=../../_out/repos/apps
 CHARTS := $(shell find . -maxdepth 2 -name Chart.yaml | awk -F/ '{print $$2}')

 include ../../scripts/common-envs.mk
--- a/packages/apps/bucket/templates/helmrelease.yaml
+++ b/packages/apps/bucket/templates/helmrelease.yaml
@@ -12,7 +12,14 @@ spec:
        name: cozystack-system
        namespace: cozy-system
      version: '>= 0.0.0-0'
-  interval: 1m0s
-  timeout: 5m0s
+  interval: 5m
+  timeout: 10m
+  install:
+    remediation:
+      retries: -1
+  upgrade:
+    force: true
+    remediation:
+      retries: -1
  values:
    bucketName: {{ .Release.Name }}
--- a/packages/apps/kubernetes/templates/helmreleases/cert-manager-crds.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/cert-manager-crds.yaml
@@ -7,7 +7,6 @@ metadata:
    cozystack.io/repository: system
    cozystack.io/target-cluster-name: {{ .Release.Name }}
 spec:
-  interval: 5m
  releaseName: cert-manager-crds
  chart:
    spec:
@@ -24,11 +23,14 @@ spec:
      key: super-admin.svc
  targetNamespace: cozy-cert-manager-crds
  storageNamespace: cozy-cert-manager-crds
+  interval: 5m
+  timeout: 10m
  install:
    createNamespace: true
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
  {{- if .Values.addons.certManager.valuesOverride }}
--- a/packages/apps/kubernetes/templates/helmreleases/cert-manager.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/cert-manager.yaml
@@ -7,7 +7,6 @@ metadata:
    cozystack.io/repository: system
    cozystack.io/target-cluster-name: {{ .Release.Name }}
 spec:
-  interval: 5m
  releaseName: cert-manager
  chart:
    spec:
@@ -24,11 +23,14 @@ spec:
      key: super-admin.svc
  targetNamespace: cozy-cert-manager
  storageNamespace: cozy-cert-manager
+  interval: 5m
+  timeout: 10m
  install:
    createNamespace: true
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
  {{- with .Values.addons.certManager.valuesOverride }}
--- a/packages/apps/kubernetes/templates/helmreleases/cilium.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/cilium.yaml
@@ -21,7 +21,6 @@ metadata:
    cozystack.io/repository: system
    cozystack.io/target-cluster-name: {{ .Release.Name }}
 spec:
-  interval: 5m
  releaseName: cilium
  chart:
    spec:
@@ -38,11 +37,14 @@ spec:
      key: super-admin.svc
  targetNamespace: cozy-cilium
  storageNamespace: cozy-cilium
+  interval: 5m
+  timeout: 10m
  install:
    createNamespace: true
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
  values:
--- a/packages/apps/kubernetes/templates/helmreleases/coredns.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/coredns.yaml
@@ -12,7 +12,6 @@ metadata:
    cozystack.io/repository: system
    cozystack.io/target-cluster-name: {{ .Release.Name }}
 spec:
-  interval: 5m
  releaseName: coredns
  chart:
    spec:
@@ -29,11 +28,13 @@ spec:
      key: super-admin.svc
  targetNamespace: kube-system
  storageNamespace: kube-system
+  interval: 5m
+  timeout: 10m
  install:
-    createNamespace: true
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
  values:
--- a/packages/apps/kubernetes/templates/helmreleases/fluxcd.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/fluxcd.yaml
@@ -7,7 +7,6 @@ metadata:
    cozystack.io/repository: system
    cozystack.io/target-cluster-name: {{ .Release.Name }}
 spec:
-  interval: 5m
  releaseName: fluxcd-operator
  chart:
    spec:
@@ -24,11 +23,14 @@ spec:
      key: super-admin.svc
  targetNamespace: cozy-fluxcd
  storageNamespace: cozy-fluxcd
+  interval: 5m
+  timeout: 10m
  install:
    createNamespace: true
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
  values:
--- a/packages/apps/kubernetes/templates/helmreleases/gateway-api-crds.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/gateway-api-crds.yaml
@@ -7,7 +7,6 @@ metadata:
    cozystack.io/repository: system
    cozystack.io/target-cluster-name: {{ .Release.Name }}
 spec:
-  interval: 5m
  releaseName: gateway-api-crds
  chart:
    spec:
@@ -24,11 +23,13 @@ spec:
      key: super-admin.svc
  targetNamespace: kube-system
  storageNamespace: kube-system
+  interval: 5m
+  timeout: 10m
  install:
-    createNamespace: false
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
  dependsOn:
--- a/packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml
@@ -7,7 +7,6 @@ metadata:
    cozystack.io/repository: system
    cozystack.io/target-cluster-name: {{ .Release.Name }}
 spec:
-  interval: 5m
  releaseName: gpu-operator
  chart:
    spec:
@@ -24,11 +23,14 @@ spec:
      key: super-admin.svc
  targetNamespace: cozy-gpu-operator
  storageNamespace: cozy-gpu-operator
+  interval: 5m
+  timeout: 10m
  install:
    createNamespace: true
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
  {{- with .Values.addons.gpuOperator.valuesOverride }}
--- a/packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml
@@ -26,7 +26,6 @@ metadata:
    cozystack.io/repository: system
    cozystack.io/target-cluster-name: {{ .Release.Name }}
 spec:
-  interval: 5m
  releaseName: ingress-nginx
  chart:
    spec:
@@ -43,11 +42,14 @@ spec:
      key: super-admin.svc
  targetNamespace: cozy-ingress-nginx
  storageNamespace: cozy-ingress-nginx
+  interval: 5m
+  timeout: 10m
  install:
    createNamespace: true
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
  values:
--- a/packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml
@@ -9,7 +9,6 @@ metadata:
    cozystack.io/repository: system
    cozystack.io/target-cluster-name: {{ .Release.Name }}
 spec:
-  interval: 5m
  releaseName: cozy-monitoring-agents
  chart:
    spec:
@@ -26,12 +25,14 @@ spec:
      key: super-admin.svc
  targetNamespace: cozy-monitoring
  storageNamespace: cozy-monitoring
+  interval: 5m
+  timeout: 10m
  install:
    createNamespace: true
-    timeout: "300s"
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
  dependsOn:
--- a/packages/apps/kubernetes/templates/helmreleases/velero.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/velero.yaml
@@ -7,7 +7,6 @@ metadata:
    cozystack.io/repository: system
    cozystack.io/target-cluster-name: {{ .Release.Name }}
 spec:
-  interval: 5m
  releaseName: velero
  chart:
    spec:
@@ -24,11 +23,14 @@ spec:
      key: super-admin.svc
  targetNamespace: cozy-velero
  storageNamespace: cozy-velero
+  interval: 5m
+  timeout: 10m
  install:
    createNamespace: true
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
  {{- with .Values.addons.velero.valuesOverride }}
--- a/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml
@@ -35,7 +35,6 @@ metadata:
    cozystack.io/repository: system
    cozystack.io/target-cluster-name: {{ .Release.Name }}
 spec:
-  interval: 5m
  releaseName: vertical-pod-autoscaler
  chart:
    spec:
@@ -52,11 +51,14 @@ spec:
      key: super-admin.svc
  targetNamespace: cozy-vertical-pod-autoscaler
  storageNamespace: cozy-vertical-pod-autoscaler
+  interval: 5m
+  timeout: 10m
  install:
    createNamespace: true
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
  values:
--- a/packages/apps/kubernetes/templates/helmreleases/victoria-metrics-operator.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/victoria-metrics-operator.yaml
@@ -7,7 +7,6 @@ metadata:
    cozystack.io/repository: system
    cozystack.io/target-cluster-name: {{ .Release.Name }}
 spec:
-  interval: 5m
  releaseName: cozy-victoria-metrics-operator
  chart:
    spec:
@@ -24,11 +23,14 @@ spec:
      key: super-admin.svc
  targetNamespace: cozy-victoria-metrics-operator
  storageNamespace: cozy-victoria-metrics-operator
+  interval: 5m
+  timeout: 10m
  install:
    createNamespace: true
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
  dependsOn:
--- a/packages/apps/kubernetes/templates/helmreleases/volumesnapshot_crd.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/volumesnapshot_crd.yaml
@@ -6,7 +6,6 @@ metadata:
    cozystack.io/repository: system
    cozystack.io/target-cluster-name: {{ .Release.Name }}
 spec:
-  interval: 5m
  releaseName: vsnap-crd
  chart:
    spec:
@@ -23,11 +22,14 @@ spec:
      key: super-admin.svc
  targetNamespace: cozy-vsnap-crd
  storageNamespace: cozy-vsnap-crd
+  interval: 5m
+  timeout: 10m
  install:
    createNamespace: true
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
  dependsOn:
--- a/packages/apps/nats/templates/nats.yaml
+++ b/packages/apps/nats/templates/nats.yaml
@@ -36,8 +36,15 @@ spec:
        name: cozystack-system
        namespace: cozy-system
      version: '>= 0.0.0-0'
-  interval: 1m0s
-  timeout: 5m0s
+  interval: 5m
+  timeout: 10m
+  install:
+    remediation:
+      retries: -1
+  upgrade:
+    force: true
+    remediation:
+      retries: -1
  values:
    nats:
      podTemplate:
--- a/packages/apps/tenant/templates/etcd.yaml
+++ b/packages/apps/tenant/templates/etcd.yaml
@@ -17,6 +17,14 @@ spec:
        kind: HelmRepository
        name: cozystack-extra
        namespace: cozy-public
-  interval: 1m0s
-  timeout: 5m0s
+      version: '>= 0.0.0-0'
+  interval: 5m
+  timeout: 10m
+  install:
+    remediation:
+      retries: -1
+  upgrade:
+    force: true
+    remediation:
+      retries: -1
 {{- end }}
--- a/packages/apps/tenant/templates/info.yaml
+++ b/packages/apps/tenant/templates/info.yaml
@@ -19,6 +19,14 @@ spec:
        kind: HelmRepository
        name: cozystack-extra
        namespace: cozy-public
-  interval: 1m0s
-  timeout: 5m0s
+      version: '>= 0.0.0-0'
+  interval: 5m
+  timeout: 10m
+  install:
+    remediation:
+      retries: -1
+  upgrade:
+    force: true
+    remediation:
+      retries: -1
 {{- end }}
--- a/packages/apps/tenant/templates/ingress.yaml
+++ b/packages/apps/tenant/templates/ingress.yaml
@@ -18,9 +18,13 @@ spec:
        name: cozystack-extra
        namespace: cozy-public
      version: '>= 0.0.0-0'
-  interval: 1m0s
-  timeout: 5m0s
+  interval: 5m
+  timeout: 10m
+  install:
+    remediation:
+      retries: -1
  upgrade:
    force: true
-  values: {}
+    remediation:
+      retries: -1
 {{- end }}
--- a/packages/apps/tenant/templates/monitoring.yaml
+++ b/packages/apps/tenant/templates/monitoring.yaml
@@ -17,12 +17,14 @@ spec:
        kind: HelmRepository
        name: cozystack-extra
        namespace: cozy-public
+      version: '>= 0.0.0-0'
+  interval: 5m
+  timeout: 10m
  install:
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
-  interval: 1m0s
-  timeout: 10m0s
 {{- end }}
--- a/packages/apps/tenant/templates/seaweedfs.yaml
+++ b/packages/apps/tenant/templates/seaweedfs.yaml
@@ -17,12 +17,14 @@ spec:
        kind: HelmRepository
        name: cozystack-extra
        namespace: cozy-public
+      version: '>= 0.0.0-0'
+  interval: 5m
+  timeout: 10m
  install:
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
-  interval: 1m0s
-  timeout: 10m0s
 {{- end }}
--- a/packages/core/platform/templates/apps.yaml
+++ b/packages/core/platform/templates/apps.yaml
@@ -48,6 +48,7 @@ spec:
  chart:
    spec:
      chart: tenant
+      version: '>= 0.0.0-0'
      sourceRef:
        kind: HelmRepository
        name: cozystack-apps
--- a/packages/extra/ingress/templates/nginx-ingress.yaml
+++ b/packages/extra/ingress/templates/nginx-ingress.yaml
@@ -15,14 +15,15 @@ spec:
        name: cozystack-system
        namespace: cozy-system
      version: '>= 0.0.0-0'
+  interval: 5m
+  timeout: 10m
  install:
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
-  interval: 1m0s
-  timeout: 10m0s
  values:
    ingress-nginx:
      fullnameOverride: {{ trimPrefix "tenant-" .Release.Namespace }}-ingress
--- a/packages/extra/seaweedfs/templates/seaweedfs.yaml
+++ b/packages/extra/seaweedfs/templates/seaweedfs.yaml
@@ -51,14 +51,15 @@ spec:
        name: cozystack-system
        namespace: cozy-system
      version: '>= 0.0.0-0'
+  interval: 5m
+  timeout: 10m
  install:
    remediation:
      retries: -1
  upgrade:
+    force: true
    remediation:
      retries: -1
-  interval: 1m0s
-  timeout: 10m0s
  values:
    global:
      serviceAccountName: "{{ .Release.Namespace }}-seaweedfs"
--- a/pkg/registry/apps/application/rest.go
+++ b/pkg/registry/apps/application/rest.go
@@ -1029,6 +1029,11 @@ func (r *REST) convertApplicationToHelmRelease(app *appsv1alpha1.Application) (*
 				},
 			},
 			Interval: metav1.Duration{Duration: 5 * time.Minute},
+			Install: &helmv2.Install{
+				Remediation: &helmv2.InstallRemediation{
+					Retries: -1,
+				},
+			},
 			Upgrade: &helmv2.Upgrade{
 				Remediation: &helmv2.UpgradeRemediation{
 					Retries: -1,