From fa5745105bf0d46fa85a2a26302b7b75d698c6c2 Mon Sep 17 00:00:00 2001 From: PoAn Yang Date: Mon, 3 Feb 2025 16:36:38 +0800 Subject: [PATCH] feat: add timeoutSeconds to ManagedChart (#929) Signed-off-by: PoAn Yang (cherry picked from commit 1c86e0932b2320c689cf05750f9774ddc853c08f) --- pkg/config/templates/rancherd-10-harvester.yaml | 2 ++ pkg/config/templates/rancherd-11-monitoring-crd.yaml | 1 + pkg/config/templates/rancherd-14-logging-crd.yaml | 1 + 3 files changed, 4 insertions(+) diff --git a/pkg/config/templates/rancherd-10-harvester.yaml b/pkg/config/templates/rancherd-10-harvester.yaml index 6c8e5ddc1..d0e3fccac 100644 --- a/pkg/config/templates/rancherd-10-harvester.yaml +++ b/pkg/config/templates/rancherd-10-harvester.yaml @@ -76,6 +76,7 @@ resources: releaseName: harvester version: {{ .HarvesterChartVersion }} defaultNamespace: harvester-system + timeoutSeconds: 600 diff: comparePatches: - apiVersion: storage.k8s.io/v1 @@ -213,6 +214,7 @@ resources: version: {{ .HarvesterChartVersion }} defaultNamespace: harvester-system repoName: harvester-charts + timeoutSeconds: 600 # takeOwnership will force apply this chart without checking ownership in labels and annotations. # https://github.com/rancher/fleet/blob/ce9c0d6c0a455d61e87c0f19df79d0ee11a89eeb/pkg/helmdeployer/deployer.go#L323 # https://github.com/rancher/helm/blob/ee91a121e0aa301fcef2bfbc7184f96edd4b50f5/pkg/action/validate.go#L71-L76 diff --git a/pkg/config/templates/rancherd-11-monitoring-crd.yaml b/pkg/config/templates/rancherd-11-monitoring-crd.yaml index 1b18847ee..9e378a231 100644 --- a/pkg/config/templates/rancherd-11-monitoring-crd.yaml +++ b/pkg/config/templates/rancherd-11-monitoring-crd.yaml @@ -10,6 +10,7 @@ resources: version: {{ .MonitoringChartVersion }} defaultNamespace: cattle-monitoring-system repoName: harvester-charts + timeoutSeconds: 600 targets: - clusterName: local clusterSelector: diff --git a/pkg/config/templates/rancherd-14-logging-crd.yaml b/pkg/config/templates/rancherd-14-logging-crd.yaml index 525dacb3b..46770d309 100644 --- a/pkg/config/templates/rancherd-14-logging-crd.yaml +++ b/pkg/config/templates/rancherd-14-logging-crd.yaml @@ -10,6 +10,7 @@ resources: version: {{ .LoggingChartVersion }} defaultNamespace: cattle-logging-system repoName: harvester-charts + timeoutSeconds: 600 targets: - clusterName: local clusterSelector: