From 3b4a3ee6823f4ce8d0e9888c193b9c1d4b128fed Mon Sep 17 00:00:00 2001 From: Xingdong Date: Sun, 26 May 2024 10:54:57 +0800 Subject: [PATCH] Adjust cr and crd deletion timeout to 1h --- k8s/main.go | 2 +- packages/helm/symphony/files/oss/delete-objects.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s/main.go b/k8s/main.go index 84159ddfd..c7318da73 100644 --- a/k8s/main.go +++ b/k8s/main.go @@ -87,7 +87,7 @@ func main() { flag.StringVar(&pollIntervalString, "poll-interval", "10s", "The interval in seconds to poll the target and instance status during reconciliation.") flag.StringVar(&reconcileIntervalString, "reconcile-interval", "30m", "The interval in seconds to reconcile the target and instance status.") // Honor OSS changes: use 1m instead of 5m for delete-timeout - flag.StringVar(&deleteTimeOutString, "delete-timeout", "1m", "The timeout in seconds to wait for the target and instance deletion.") + flag.StringVar(&deleteTimeOutString, "delete-timeout", "60m", "The timeout in seconds to wait for the target and instance deletion.") // Add new settings for delete sync delay flag.StringVar(&deleteSyncDelayString, "delete-sync-delay", "0s", "The delay in seconds to wait for the status sync back in delete operations.") diff --git a/packages/helm/symphony/files/oss/delete-objects.sh b/packages/helm/symphony/files/oss/delete-objects.sh index 524286c8d..69ea782e8 100755 --- a/packages/helm/symphony/files/oss/delete-objects.sh +++ b/packages/helm/symphony/files/oss/delete-objects.sh @@ -1,6 +1,6 @@ #!/bin/env bash set -e -TIMEOUT="60s" +TIMEOUT="60m" SOLUTION_GROUP=solution.symphony FABRIC_GROUP=fabric.symphony AI_GROUP=ai.symphony