Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update initialdelayseconds default logic #341

Merged
merged 2 commits into from
Jul 24, 2024
Merged

update initialdelayseconds default logic #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
defcc6c
update initialdelayseconds default logic
Jul 24, 2024
f22271d
update snapshot for tests
Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions charts/standard-application-stack/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v7.2.0] - 2024-07-24
### Changes
- Updated the logic of initialDelaySeconds to not be set if no value given

## [v7.1.0] - 2024-07-19
### Added
- Always add `matchLabelKeys: pod-template-hash` to topologySpreadConstraints
Expand Down
2 changes: 1 addition & 1 deletion charts/standard-application-stack/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 7.1.0
version: 7.2.0

dependencies:
- name: redis
Expand Down
2 changes: 1 addition & 1 deletion charts/standard-application-stack/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# standard-application-stack

![Version: 7.1.0](https://img.shields.io/badge/Version-7.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
![Version: 7.2.0](https://img.shields.io/badge/Version-7.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)

A generic chart to support most common application requirements

Expand Down
8 changes: 6 additions & 2 deletions charts/standard-application-stack/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,9 @@ spec:
port: {{ .Values.liveness.port | default "http" }}
scheme: {{ .Values.liveness.scheme | default "HTTP" }}
{{- end }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds | default 0 }}
{{- if .Values.liveness.initialDelaySeconds }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
{{- end }}
timeoutSeconds: {{ .Values.liveness.timeoutSeconds | default 1 }}
periodSeconds: {{ .Values.liveness.periodSeconds | default 10 }}
startupProbe:
Expand Down Expand Up @@ -325,7 +327,9 @@ spec:
port: {{ .Values.readiness.port | default "http" }}
scheme: {{ .Values.readiness.scheme | default "HTTP" }}
{{- end }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds | default 0 }}
{{- if .Values.readiness.initialDelaySeconds }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
{{- end }}
timeoutSeconds: {{ .Values.readiness.timeoutSeconds | default 1 }}
periodSeconds: {{ .Values.readiness.periodSeconds | default 10 }}
{{- end }}
Expand Down
6 changes: 0 additions & 6 deletions .../standard-application-stack/tests/__snapshot__/deployment_dynamodb_enabled_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ Check DynamoDB envfrom secretRef is present:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -75,7 +74,6 @@ Check DynamoDB envfrom secretRef is present:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down Expand Up @@ -184,7 +182,6 @@ Check DynamoDB envfrom secretRef is present for local environment:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -196,7 +193,6 @@ Check DynamoDB envfrom secretRef is present for local environment:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down Expand Up @@ -289,7 +285,6 @@ Check DynamoDB secretName Override:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -301,7 +296,6 @@ Check DynamoDB secretName Override:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down
4 changes: 0 additions & 4 deletions charts/standard-application-stack/tests/__snapshot__/deployment_env_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ Check default env behavior:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -174,7 +173,6 @@ Check default env behavior:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down Expand Up @@ -281,7 +279,6 @@ Check main container combines default env and `main.env` values:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -293,7 +290,6 @@ Check main container combines default env and `main.env` values:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down
2 changes: 0 additions & 2 deletions charts/standard-application-stack/tests/__snapshot__/deployment_host_network_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ Has a pod template that uses the host network:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -75,7 +74,6 @@ Has a pod template that uses the host network:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down
8 changes: 0 additions & 8 deletions ...s/standard-application-stack/tests/__snapshot__/deployment_instrumentation_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ Check custom python otel extraEnv vars are added:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -95,7 +94,6 @@ Check custom python otel extraEnv vars are added:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down Expand Up @@ -218,7 +216,6 @@ Check custom sampler settings:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -230,7 +227,6 @@ Check custom sampler settings:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down Expand Up @@ -351,7 +347,6 @@ Check default python otel envars are added:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -363,7 +358,6 @@ Check default python otel envars are added:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down Expand Up @@ -486,7 +480,6 @@ Check global otel extraEnv vars are added:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -498,7 +491,6 @@ Check global otel extraEnv vars are added:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down
4 changes: 0 additions & 4 deletions charts/standard-application-stack/tests/__snapshot__/deployment_labels_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ Check default label behavior:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -77,7 +76,6 @@ Check default label behavior:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down Expand Up @@ -182,7 +180,6 @@ Check empty application and component labels both default to name:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -194,7 +191,6 @@ Check empty application and component labels both default to name:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down
6 changes: 0 additions & 6 deletions charts/standard-application-stack/tests/__snapshot__/deployment_lifecycle_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ Check AWS ALB lifecycle rule applied:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -88,7 +87,6 @@ Check AWS ALB lifecycle rule applied:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down Expand Up @@ -204,7 +202,6 @@ Check AWS ALB lifecycle rules applied with custom delay:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -216,7 +213,6 @@ Check AWS ALB lifecycle rules applied with custom delay:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down Expand Up @@ -324,7 +320,6 @@ Check lifecycle rules:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -336,7 +331,6 @@ Check lifecycle rules:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down
6 changes: 0 additions & 6 deletions ...s/standard-application-stack/tests/__snapshot__/deployment_mariadb_enabled_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ Check MariaDB envfrom secretRef is present:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -75,7 +74,6 @@ Check MariaDB envfrom secretRef is present:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down Expand Up @@ -184,7 +182,6 @@ Check MariaDB envfrom secretRef is present for local environment:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -196,7 +193,6 @@ Check MariaDB envfrom secretRef is present for local environment:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down Expand Up @@ -289,7 +285,6 @@ Check MariaDB secretName Override:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -301,7 +296,6 @@ Check MariaDB secretName Override:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down
6 changes: 0 additions & 6 deletions ...standard-application-stack/tests/__snapshot__/deployment_memcached_enabled_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ Check Memcached envfrom secretRef is present:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -75,7 +74,6 @@ Check Memcached envfrom secretRef is present:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down Expand Up @@ -184,7 +182,6 @@ Check Memcached envfrom secretRef is present for local environment:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -196,7 +193,6 @@ Check Memcached envfrom secretRef is present for local environment:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down Expand Up @@ -289,7 +285,6 @@ Check Memcached secretName Override:
path: /healthz
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
name: main
Expand All @@ -301,7 +296,6 @@ Check Memcached secretName Override:
path: /readiness
port: http
scheme: HTTP
initialDelaySeconds: 0
periodSeconds: 10
timeoutSeconds: 1
resources:
Expand Down
Loading
Loading