diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 689156f5..5bbf13b9 100644 --- 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: | diff --git a/packages/apps/Makefile b/packages/apps/Makefile index 845f0a92..b3917f20 100644 --- 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 diff --git a/packages/apps/bucket/templates/helmrelease.yaml b/packages/apps/bucket/templates/helmrelease.yaml index d51e3b36..45959572 100644 --- 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 }} diff --git a/packages/apps/kubernetes/templates/helmreleases/cert-manager-crds.yaml b/packages/apps/kubernetes/templates/helmreleases/cert-manager-crds.yaml index 7dc3eed1..3bf7a5d2 100644 --- 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 }} diff --git a/packages/apps/kubernetes/templates/helmreleases/cert-manager.yaml b/packages/apps/kubernetes/templates/helmreleases/cert-manager.yaml index 3a6e4939..e0caf4cb 100644 --- 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 }} diff --git a/packages/apps/kubernetes/templates/helmreleases/cilium.yaml b/packages/apps/kubernetes/templates/helmreleases/cilium.yaml index 7e8c7480..c356dc79 100644 --- 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: diff --git a/packages/apps/kubernetes/templates/helmreleases/coredns.yaml b/packages/apps/kubernetes/templates/helmreleases/coredns.yaml index 05a1a635..37a09a0b 100644 --- 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: diff --git a/packages/apps/kubernetes/templates/helmreleases/fluxcd.yaml b/packages/apps/kubernetes/templates/helmreleases/fluxcd.yaml index 944ce8cf..7518601b 100644 --- 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: diff --git a/packages/apps/kubernetes/templates/helmreleases/gateway-api-crds.yaml b/packages/apps/kubernetes/templates/helmreleases/gateway-api-crds.yaml index 230bcdee..48a20c5a 100644 --- 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: diff --git a/packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml b/packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml index 861c3657..fbee1724 100644 --- 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 }} diff --git a/packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml b/packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml index 5d4a586d..f80dd7ae 100644 --- 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: diff --git a/packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml b/packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml index 94f3c28a..8f914b08 100644 --- 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: diff --git a/packages/apps/kubernetes/templates/helmreleases/velero.yaml b/packages/apps/kubernetes/templates/helmreleases/velero.yaml index 52310767..0c918da6 100644 --- 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 }} diff --git a/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml b/packages/apps/kubernetes/templates/helmreleases/vertical-pod-autoscaler.yaml index 34375d8c..8b615c9c 100644 --- 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: diff --git a/packages/apps/kubernetes/templates/helmreleases/victoria-metrics-operator.yaml b/packages/apps/kubernetes/templates/helmreleases/victoria-metrics-operator.yaml index 91445c45..dbb4d8dc 100644 --- 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: diff --git a/packages/apps/kubernetes/templates/helmreleases/volumesnapshot_crd.yaml b/packages/apps/kubernetes/templates/helmreleases/volumesnapshot_crd.yaml index d12b669f..97cf06ad 100644 --- 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: diff --git a/packages/apps/nats/templates/nats.yaml b/packages/apps/nats/templates/nats.yaml index 0823e56b..9994332f 100644 --- 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: diff --git a/packages/apps/tenant/templates/etcd.yaml b/packages/apps/tenant/templates/etcd.yaml index 1a8e4006..6c679534 100644 --- 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 }} diff --git a/packages/apps/tenant/templates/info.yaml b/packages/apps/tenant/templates/info.yaml index fc312262..f7871180 100644 --- 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 }} diff --git a/packages/apps/tenant/templates/ingress.yaml b/packages/apps/tenant/templates/ingress.yaml index 80a14cd3..b0c1196f 100644 --- 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 }} diff --git a/packages/apps/tenant/templates/monitoring.yaml b/packages/apps/tenant/templates/monitoring.yaml index 7c26c060..aad08bd9 100644 --- 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 }} diff --git a/packages/apps/tenant/templates/seaweedfs.yaml b/packages/apps/tenant/templates/seaweedfs.yaml index bef7cd46..9df890d0 100644 --- 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 }} diff --git a/packages/core/platform/templates/apps.yaml b/packages/core/platform/templates/apps.yaml index a24744b8..c7653e03 100644 --- 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 diff --git a/packages/extra/ingress/templates/nginx-ingress.yaml b/packages/extra/ingress/templates/nginx-ingress.yaml index 900561ba..faa0b061 100644 --- 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 diff --git a/packages/extra/seaweedfs/templates/seaweedfs.yaml b/packages/extra/seaweedfs/templates/seaweedfs.yaml index b29a0e40..ced2d93b 100644 --- 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" diff --git a/pkg/registry/apps/application/rest.go b/pkg/registry/apps/application/rest.go index d456a12c..2f8ab84c 100644 --- 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,