From 13037d97b381264da33a50db45105ddbf394abfd Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Thu, 27 Oct 2022 22:10:37 -0300 Subject: [PATCH 1/2] Adjust livenessProbe timeouts --- components/common-go/kubernetes/probes.go | 2 +- install/installer/pkg/components/blobserve/deployment.go | 4 ++-- install/installer/pkg/components/registry-facade/daemonset.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/common-go/kubernetes/probes.go b/components/common-go/kubernetes/probes.go index d212fea027b887..e0a99823915eea 100644 --- a/components/common-go/kubernetes/probes.go +++ b/components/common-go/kubernetes/probes.go @@ -25,7 +25,7 @@ func NetworkIsReachableProbe(url string) func() error { } client := &http.Client{ Transport: tr, - Timeout: 1 * time.Second, + Timeout: 5 * time.Second, // never follow redirects CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse diff --git a/install/installer/pkg/components/blobserve/deployment.go b/install/installer/pkg/components/blobserve/deployment.go index 3ccd9c9fe000a0..1a9781bd14c6ca 100644 --- a/install/installer/pkg/components/blobserve/deployment.go +++ b/install/installer/pkg/components/blobserve/deployment.go @@ -139,7 +139,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) { }, InitialDelaySeconds: 5, PeriodSeconds: 5, - TimeoutSeconds: 1, + TimeoutSeconds: 2, SuccessThreshold: 1, FailureThreshold: 3, }, @@ -152,7 +152,7 @@ func deployment(ctx *common.RenderContext) ([]runtime.Object, error) { }, InitialDelaySeconds: 5, PeriodSeconds: 10, - TimeoutSeconds: 1, + TimeoutSeconds: 2, SuccessThreshold: 1, FailureThreshold: 3, }, diff --git a/install/installer/pkg/components/registry-facade/daemonset.go b/install/installer/pkg/components/registry-facade/daemonset.go index 936524abb3563e..f8fb4f6fa610ca 100644 --- a/install/installer/pkg/components/registry-facade/daemonset.go +++ b/install/installer/pkg/components/registry-facade/daemonset.go @@ -278,7 +278,7 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) { }, InitialDelaySeconds: 5, PeriodSeconds: 5, - TimeoutSeconds: 1, + TimeoutSeconds: 2, SuccessThreshold: 2, FailureThreshold: 5, }, @@ -291,7 +291,7 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) { }, InitialDelaySeconds: 5, PeriodSeconds: 10, - TimeoutSeconds: 1, + TimeoutSeconds: 2, SuccessThreshold: 1, FailureThreshold: 3, }, From 8e4c5555c0e30e7cdcecacebc8ba52282da0ebd7 Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Thu, 27 Oct 2022 23:04:41 -0300 Subject: [PATCH 2/2] Update golden files --- .../installer/cmd/testdata/render/aws-setup/output.golden | 8 ++++---- .../cmd/testdata/render/azure-setup/output.golden | 8 ++++---- .../cmd/testdata/render/customization/output.golden | 8 ++++---- .../cmd/testdata/render/external-registry/output.golden | 8 ++++---- .../installer/cmd/testdata/render/gcp-setup/output.golden | 8 ++++---- .../cmd/testdata/render/http-proxy/output.golden | 8 ++++---- .../cmd/testdata/render/insecure-s3-setup/output.golden | 8 ++++---- .../installer/cmd/testdata/render/minimal/output.golden | 8 ++++---- .../installer/cmd/testdata/render/shortname/output.golden | 8 ++++---- .../render/statefulset-customization/output.golden | 8 ++++---- .../render/use-pod-security-policies/output.golden | 8 ++++---- .../render/workspace-requests-limits/output.golden | 8 ++++---- 12 files changed, 48 insertions(+), 48 deletions(-) diff --git a/install/installer/cmd/testdata/render/aws-setup/output.golden b/install/installer/cmd/testdata/render/aws-setup/output.golden index 4bab42c9822208..16e47edade4471 100644 --- a/install/installer/cmd/testdata/render/aws-setup/output.golden +++ b/install/installer/cmd/testdata/render/aws-setup/output.golden @@ -6882,7 +6882,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: registry-facade ports: - containerPort: 32223 @@ -6896,7 +6896,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 2 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m @@ -7707,7 +7707,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: blobserve ports: - containerPort: 32224 @@ -7720,7 +7720,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m diff --git a/install/installer/cmd/testdata/render/azure-setup/output.golden b/install/installer/cmd/testdata/render/azure-setup/output.golden index b273fb7193f1ec..3ef8a52e83e8d4 100644 --- a/install/installer/cmd/testdata/render/azure-setup/output.golden +++ b/install/installer/cmd/testdata/render/azure-setup/output.golden @@ -6727,7 +6727,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: registry-facade ports: - containerPort: 32223 @@ -6741,7 +6741,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 2 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m @@ -7546,7 +7546,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: blobserve ports: - containerPort: 32224 @@ -7559,7 +7559,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m diff --git a/install/installer/cmd/testdata/render/customization/output.golden b/install/installer/cmd/testdata/render/customization/output.golden index ba2c078cb786ca..e6edef5d8a5640 100644 --- a/install/installer/cmd/testdata/render/customization/output.golden +++ b/install/installer/cmd/testdata/render/customization/output.golden @@ -7954,7 +7954,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: registry-facade ports: - containerPort: 32223 @@ -7968,7 +7968,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 2 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m @@ -8959,7 +8959,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: blobserve ports: - containerPort: 32224 @@ -8972,7 +8972,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m diff --git a/install/installer/cmd/testdata/render/external-registry/output.golden b/install/installer/cmd/testdata/render/external-registry/output.golden index f4261c35c45ae9..f65c4eecc88a8b 100644 --- a/install/installer/cmd/testdata/render/external-registry/output.golden +++ b/install/installer/cmd/testdata/render/external-registry/output.golden @@ -7009,7 +7009,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: registry-facade ports: - containerPort: 32223 @@ -7023,7 +7023,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 2 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m @@ -7987,7 +7987,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: blobserve ports: - containerPort: 32224 @@ -8000,7 +8000,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m diff --git a/install/installer/cmd/testdata/render/gcp-setup/output.golden b/install/installer/cmd/testdata/render/gcp-setup/output.golden index ed0f02b69e1e88..570328dc81f9b7 100644 --- a/install/installer/cmd/testdata/render/gcp-setup/output.golden +++ b/install/installer/cmd/testdata/render/gcp-setup/output.golden @@ -6701,7 +6701,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: registry-facade ports: - containerPort: 32223 @@ -6715,7 +6715,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 2 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m @@ -7526,7 +7526,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: blobserve ports: - containerPort: 32224 @@ -7539,7 +7539,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m diff --git a/install/installer/cmd/testdata/render/http-proxy/output.golden b/install/installer/cmd/testdata/render/http-proxy/output.golden index 1eb787d8c7244e..e74d4c63d20832 100644 --- a/install/installer/cmd/testdata/render/http-proxy/output.golden +++ b/install/installer/cmd/testdata/render/http-proxy/output.golden @@ -7412,7 +7412,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: registry-facade ports: - containerPort: 32223 @@ -7426,7 +7426,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 2 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m @@ -8792,7 +8792,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: blobserve ports: - containerPort: 32224 @@ -8805,7 +8805,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m diff --git a/install/installer/cmd/testdata/render/insecure-s3-setup/output.golden b/install/installer/cmd/testdata/render/insecure-s3-setup/output.golden index f230ff7a2e176e..f8161365991902 100644 --- a/install/installer/cmd/testdata/render/insecure-s3-setup/output.golden +++ b/install/installer/cmd/testdata/render/insecure-s3-setup/output.golden @@ -7159,7 +7159,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: registry-facade ports: - containerPort: 32223 @@ -7173,7 +7173,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 2 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m @@ -8143,7 +8143,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: blobserve ports: - containerPort: 32224 @@ -8156,7 +8156,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m diff --git a/install/installer/cmd/testdata/render/minimal/output.golden b/install/installer/cmd/testdata/render/minimal/output.golden index 9ebe0dceb360d6..a12142da27f8dd 100644 --- a/install/installer/cmd/testdata/render/minimal/output.golden +++ b/install/installer/cmd/testdata/render/minimal/output.golden @@ -7289,7 +7289,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: registry-facade ports: - containerPort: 32223 @@ -7303,7 +7303,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 2 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m @@ -8267,7 +8267,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: blobserve ports: - containerPort: 32224 @@ -8280,7 +8280,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m diff --git a/install/installer/cmd/testdata/render/shortname/output.golden b/install/installer/cmd/testdata/render/shortname/output.golden index 500cf3ffec5017..3bfe2f302659e3 100644 --- a/install/installer/cmd/testdata/render/shortname/output.golden +++ b/install/installer/cmd/testdata/render/shortname/output.golden @@ -7289,7 +7289,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: registry-facade ports: - containerPort: 32223 @@ -7303,7 +7303,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 2 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m @@ -8267,7 +8267,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: blobserve ports: - containerPort: 32224 @@ -8280,7 +8280,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m diff --git a/install/installer/cmd/testdata/render/statefulset-customization/output.golden b/install/installer/cmd/testdata/render/statefulset-customization/output.golden index 195a52606ed86b..31569ee0dda8cf 100644 --- a/install/installer/cmd/testdata/render/statefulset-customization/output.golden +++ b/install/installer/cmd/testdata/render/statefulset-customization/output.golden @@ -7301,7 +7301,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: registry-facade ports: - containerPort: 32223 @@ -7315,7 +7315,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 2 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m @@ -8279,7 +8279,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: blobserve ports: - containerPort: 32224 @@ -8292,7 +8292,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m diff --git a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden index bc9e8c86f17fde..63ef515f9d5039 100644 --- a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden +++ b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden @@ -7733,7 +7733,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: registry-facade ports: - containerPort: 32223 @@ -7747,7 +7747,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 2 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m @@ -8711,7 +8711,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: blobserve ports: - containerPort: 32224 @@ -8724,7 +8724,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m diff --git a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden index 3bf1dee4bd18df..227596b957c2c9 100644 --- a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden +++ b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden @@ -7292,7 +7292,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: registry-facade ports: - containerPort: 32223 @@ -7306,7 +7306,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 2 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m @@ -8270,7 +8270,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 name: blobserve ports: - containerPort: 32224 @@ -8283,7 +8283,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 successThreshold: 1 - timeoutSeconds: 1 + timeoutSeconds: 2 resources: requests: cpu: 100m