From c182c0f501bbe1d68eac28b3dcc46acc4f7ed0da Mon Sep 17 00:00:00 2001 From: David Gamero Date: Mon, 3 Feb 2025 13:37:12 -0500 Subject: [PATCH 1/8] Update draft.yaml --- template/deployments/helm/draft.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/deployments/helm/draft.yaml b/template/deployments/helm/draft.yaml index 18e16004b..428e7a824 100644 --- a/template/deployments/helm/draft.yaml +++ b/template/deployments/helm/draft.yaml @@ -122,7 +122,7 @@ variables: kind: "kubernetesProbePeriod" default: disablePrompt: true - value: 1 + value: 10 description: "kubernetes startup probe period in seconds" versions: ">=0.0.1" - name: "STARTUPTIMEOUT" @@ -130,7 +130,7 @@ variables: kind: "kubernetesProbeTimeout" default: disablePrompt: true - value: 3 + value: 1 description: "kubernetes startup probe timeout in seconds" versions: ">=0.0.1" - name: "STARTUPFAILURETHRESHOLD" @@ -138,7 +138,7 @@ variables: kind: "kubernetesProbeThreshold" default: disablePrompt: true - value: 1 + value: 3 description: "kubernetes startup probe failure threshold" versions: ">=0.0.1" - name: "STARTUPSUCCESSTHRESHOLD" @@ -154,7 +154,7 @@ variables: kind: "kubernetesProbeDelay" default: disablePrompt: true - value: 5 + value: 0 description: "kubernetes startup probe initial delay in seconds" versions: ">=0.0.1" - name: "READINESSPERIOD" From c3e38debc3a9cc6f6af680fea6efa1f3281905a2 Mon Sep 17 00:00:00 2001 From: David Gamero Date: Mon, 3 Feb 2025 13:38:50 -0500 Subject: [PATCH 2/8] Update draft.yaml --- template/deployments/kustomize/draft.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/deployments/kustomize/draft.yaml b/template/deployments/kustomize/draft.yaml index e00a15adf..35b42af6c 100644 --- a/template/deployments/kustomize/draft.yaml +++ b/template/deployments/kustomize/draft.yaml @@ -122,7 +122,7 @@ variables: kind: "kubernetesProbePeriod" default: disablePrompt: true - value: 1 + value: 10 description: "kubernetes startup probe period in seconds" versions: ">=0.0.1" - name: "STARTUPTIMEOUT" @@ -130,7 +130,7 @@ variables: kind: "kubernetesProbeTimeout" default: disablePrompt: true - value: 3 + value: 1 description: "kubernetes startup probe timeout in seconds" versions: ">=0.0.1" - name: "STARTUPFAILURETHRESHOLD" @@ -138,7 +138,7 @@ variables: kind: "kubernetesProbeThreshold" default: disablePrompt: true - value: 1 + value: 3 description: "kubernetes startup probe failure threshold" versions: ">=0.0.1" - name: "STARTUPSUCCESSTHRESHOLD" @@ -154,7 +154,7 @@ variables: kind: "kubernetesProbeDelay" default: disablePrompt: true - value: 5 + value: 0 description: "kubernetes startup probe initial delay in seconds" versions: ">=0.0.1" - name: "READINESSPERIOD" From a9778fe6a88403267e5e3af6af7ed704c67d2aae Mon Sep 17 00:00:00 2001 From: David Gamero Date: Mon, 3 Feb 2025 13:39:43 -0500 Subject: [PATCH 3/8] Update draft.yaml --- template/deployments/manifests/draft.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template/deployments/manifests/draft.yaml b/template/deployments/manifests/draft.yaml index 071291c73..b90177a30 100644 --- a/template/deployments/manifests/draft.yaml +++ b/template/deployments/manifests/draft.yaml @@ -122,7 +122,7 @@ variables: kind: "kubernetesProbePeriod" default: disablePrompt: true - value: 1 + value: 10 description: "kubernetes startup probe period in seconds" versions: ">=0.0.1" - name: "STARTUPTIMEOUT" @@ -130,7 +130,7 @@ variables: kind: "kubernetesProbeTimeout" default: disablePrompt: true - value: 3 + value: 1 description: "kubernetes startup probe timeout in seconds" versions: ">=0.0.1" - name: "STARTUPFAILURETHRESHOLD" @@ -138,7 +138,7 @@ variables: kind: "kubernetesProbeThreshold" default: disablePrompt: true - value: 1 + value: 3 description: "kubernetes startup probe failure threshold" versions: ">=0.0.1" - name: "STARTUPSUCCESSTHRESHOLD" @@ -154,7 +154,7 @@ variables: kind: "kubernetesProbeDelay" default: disablePrompt: true - value: 5 + value: 0 description: "kubernetes startup probe initial delay in seconds" versions: ">=0.0.1" - name: "READINESSPERIOD" From 533fab942a2f7e2e753911c585b5cf38f958b1e9 Mon Sep 17 00:00:00 2001 From: David Gamero Date: Mon, 3 Feb 2025 13:42:16 -0500 Subject: [PATCH 4/8] Update helm.yaml --- test/integration/clojure/helm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/integration/clojure/helm.yaml b/test/integration/clojure/helm.yaml index b4570ad0b..c7b57b21c 100644 --- a/test/integration/clojure/helm.yaml +++ b/test/integration/clojure/helm.yaml @@ -10,8 +10,6 @@ deployVariables: value: "testapp" - name: "IMAGENAME" value: "host.minikube.internal:5001/testapp" - - name: "STARTUPINITIALDELAY" - value: 30 languageVariables: - name: "VERSION" value: "8-jdk-alpine" From be471555eb44abb2c393488534a343b663e2332a Mon Sep 17 00:00:00 2001 From: David Gamero Date: Mon, 3 Feb 2025 13:42:26 -0500 Subject: [PATCH 5/8] Update kustomize.yaml --- test/integration/clojure/kustomize.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/integration/clojure/kustomize.yaml b/test/integration/clojure/kustomize.yaml index fa0f4f739..5cfee3cd8 100644 --- a/test/integration/clojure/kustomize.yaml +++ b/test/integration/clojure/kustomize.yaml @@ -10,8 +10,6 @@ deployVariables: value: "testapp" - name: "IMAGENAME" value: "host.minikube.internal:5001/testapp" - - name: "STARTUPINITIALDELAY" - value: 30 languageVariables: - name: "VERSION" value: "8-jdk-alpine" From 89e39440d518a827171e3085f96ecf0b79b21062 Mon Sep 17 00:00:00 2001 From: David Gamero Date: Mon, 3 Feb 2025 13:42:34 -0500 Subject: [PATCH 6/8] Update manifest.yaml --- test/integration/clojure/manifest.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/integration/clojure/manifest.yaml b/test/integration/clojure/manifest.yaml index f0a27248e..f9ac4edf7 100644 --- a/test/integration/clojure/manifest.yaml +++ b/test/integration/clojure/manifest.yaml @@ -10,8 +10,6 @@ deployVariables: value: "testapp" - name: "IMAGENAME" value: "host.minikube.internal:5001/testapp" - - name: "STARTUPINITIALDELAY" - value: 30 languageVariables: - name: "VERSION" value: "8-jdk-alpine" From 15a7c645fc8896973a9604340ae69d03d4da4c32 Mon Sep 17 00:00:00 2001 From: David Gamero Date: Mon, 3 Feb 2025 13:44:56 -0500 Subject: [PATCH 7/8] remove startup delays for specific tests --- test/integration/gradle/helm.yaml | 2 -- test/integration/gradle/kustomize.yaml | 2 -- test/integration/gradle/manifest.yaml | 2 -- test/integration/java/helm.yaml | 2 -- test/integration/java/kustomize.yaml | 2 -- test/integration/java/manifest.yaml | 2 -- 6 files changed, 12 deletions(-) diff --git a/test/integration/gradle/helm.yaml b/test/integration/gradle/helm.yaml index 9fbcd1ac1..4c85a0365 100644 --- a/test/integration/gradle/helm.yaml +++ b/test/integration/gradle/helm.yaml @@ -10,8 +10,6 @@ deployVariables: value: "testapp" - name: "IMAGENAME" value: "host.minikube.internal:5001/testapp" - - name: "STARTUPINITIALDELAY" - value: 30 languageVariables: - name: "VERSION" value: "11-jre" diff --git a/test/integration/gradle/kustomize.yaml b/test/integration/gradle/kustomize.yaml index 9f4da724b..c351a7730 100644 --- a/test/integration/gradle/kustomize.yaml +++ b/test/integration/gradle/kustomize.yaml @@ -10,8 +10,6 @@ deployVariables: value: "testapp" - name: "IMAGENAME" value: "host.minikube.internal:5001/testapp" - - name: "STARTUPINITIALDELAY" - value: 30 languageVariables: - name: "VERSION" value: "11-jre" diff --git a/test/integration/gradle/manifest.yaml b/test/integration/gradle/manifest.yaml index dee9ef7ee..a37812680 100644 --- a/test/integration/gradle/manifest.yaml +++ b/test/integration/gradle/manifest.yaml @@ -10,8 +10,6 @@ deployVariables: value: "testapp" - name: "IMAGENAME" value: "host.minikube.internal:5001/testapp" - - name: "STARTUPINITIALDELAY" - value: 30 languageVariables: - name: "VERSION" value: "11-jre" diff --git a/test/integration/java/helm.yaml b/test/integration/java/helm.yaml index 8ac5b16f7..8c338a803 100644 --- a/test/integration/java/helm.yaml +++ b/test/integration/java/helm.yaml @@ -10,8 +10,6 @@ deployVariables: value: "testapp" - name: "IMAGENAME" value: "host.minikube.internal:5001/testapp" - - name: "STARTUPINITIALDELAY" - value: 30 languageVariables: - name: "VERSION" value: "11-jre" diff --git a/test/integration/java/kustomize.yaml b/test/integration/java/kustomize.yaml index db0a432ff..3aca136fb 100644 --- a/test/integration/java/kustomize.yaml +++ b/test/integration/java/kustomize.yaml @@ -10,8 +10,6 @@ deployVariables: value: "testapp" - name: "IMAGENAME" value: "host.minikube.internal:5001/testapp" - - name: "STARTUPINITIALDELAY" - value: 30 languageVariables: - name: "VERSION" value: "11-jre" diff --git a/test/integration/java/manifest.yaml b/test/integration/java/manifest.yaml index d31b63d5d..1aa1cfbcb 100644 --- a/test/integration/java/manifest.yaml +++ b/test/integration/java/manifest.yaml @@ -10,8 +10,6 @@ deployVariables: value: "testapp" - name: "IMAGENAME" value: "host.minikube.internal:5001/testapp" - - name: "STARTUPINITIALDELAY" - value: 30 languageVariables: - name: "VERSION" value: "11-jre" From 54c6d5151ab6b93f4a48f0c0dc9c8582a5846d1e Mon Sep 17 00:00:00 2001 From: David Gamero Date: Mon, 3 Feb 2025 14:31:25 -0500 Subject: [PATCH 8/8] update fixtures --- pkg/fixtures/deployments/helm/charts/values.yaml | 10 +++++----- .../deployments/kustomize/base/deployment.yaml | 10 +++++----- .../deployments/manifest/manifests/deployment.yaml | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkg/fixtures/deployments/helm/charts/values.yaml b/pkg/fixtures/deployments/helm/charts/values.yaml index f5afa3b12..d5fe1be02 100644 --- a/pkg/fixtures/deployments/helm/charts/values.yaml +++ b/pkg/fixtures/deployments/helm/charts/values.yaml @@ -58,11 +58,11 @@ readinessProbe: startupProbe: tcpSocket: port: 80 - periodSeconds: 1 - timeoutSeconds: 3 - failureThreshold: 1 + periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 successThreshold: 1 - initialDelaySeconds: 5 + initialDelaySeconds: 0 nodeSelector: {} @@ -110,4 +110,4 @@ securityContext: envVars: -generatorLabel: draft \ No newline at end of file +generatorLabel: draft diff --git a/pkg/fixtures/deployments/kustomize/base/deployment.yaml b/pkg/fixtures/deployments/kustomize/base/deployment.yaml index afc5a25d1..5956987cb 100644 --- a/pkg/fixtures/deployments/kustomize/base/deployment.yaml +++ b/pkg/fixtures/deployments/kustomize/base/deployment.yaml @@ -49,11 +49,11 @@ spec: startupProbe: tcpSocket: port: 80 - periodSeconds: 1 - timeoutSeconds: 3 - failureThreshold: 1 + periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 successThreshold: 1 - initialDelaySeconds: 5 + initialDelaySeconds: 0 securityContext: seccompProfile: type: RuntimeDefault @@ -90,4 +90,4 @@ spec: whenUnsatisfiable: ScheduleAnyway labelSelector: matchLabels: - app.kubernetes.io/name: testapp \ No newline at end of file + app.kubernetes.io/name: testapp diff --git a/pkg/fixtures/deployments/manifest/manifests/deployment.yaml b/pkg/fixtures/deployments/manifest/manifests/deployment.yaml index afc5a25d1..5956987cb 100644 --- a/pkg/fixtures/deployments/manifest/manifests/deployment.yaml +++ b/pkg/fixtures/deployments/manifest/manifests/deployment.yaml @@ -49,11 +49,11 @@ spec: startupProbe: tcpSocket: port: 80 - periodSeconds: 1 - timeoutSeconds: 3 - failureThreshold: 1 + periodSeconds: 10 + timeoutSeconds: 1 + failureThreshold: 3 successThreshold: 1 - initialDelaySeconds: 5 + initialDelaySeconds: 0 securityContext: seccompProfile: type: RuntimeDefault @@ -90,4 +90,4 @@ spec: whenUnsatisfiable: ScheduleAnyway labelSelector: matchLabels: - app.kubernetes.io/name: testapp \ No newline at end of file + app.kubernetes.io/name: testapp