Skip to content

Commit

Permalink
Switch from disabled to enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
blenkjon committed Jul 17, 2024
1 parent 7ed6ab7 commit 548cc60
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
6 changes: 6 additions & 0 deletions chart-tests/application/ci/test-disabled-service-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
service:
enabled: false
readinessProbe:
enabled: false
livenessProbe:
enabled: false
6 changes: 0 additions & 6 deletions chart-tests/application/ci/test-disabled-service.yaml

This file was deleted.

6 changes: 3 additions & 3 deletions charts/application/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ Generic application chart with common requirements of a typical workload.
| autoscaling.minReplicaCount | int | `1` | |
| autoscaling.maxReplicaCount | int | `1` | |
| autoscaling.averageUtilization.cpu | int | `80` | |
| livenessProbe.disabled | bool | `false` | |
| livenessProbe.enabled | bool | `true` | |
| livenessProbe.path | string | `"/.well-known/live"` | |
| livenessProbe.cmd | list | `[]` | |
| livenessProbe.initialDelaySeconds | int | `10` | |
| livenessProbe.periodSeconds | int | `10` | |
| livenessProbe.failureThreshold | int | `3` | |
| livenessProbe.timeoutSeconds | int | `5` | |
| readinessProbe.disabled | bool | `false` | |
| readinessProbe.enabled | bool | `true` | |
| readinessProbe.path | string | `"/.well-known/ready"` | |
| readinessProbe.cmd | list | `[]` | |
| readinessProbe.initialDelaySeconds | int | `10` | |
Expand All @@ -51,7 +51,7 @@ Generic application chart with common requirements of a typical workload.
| image.repositoryProvider | string | `"generic"` | |
| image.imageAutomationNamespace | string | `nil` | |
| image.pullSecrets | list | `[]` | |
| service.disabled | bool | `false` | |
| service.enabled | bool | `true` | |
| service.port | int | `80` | |
| service.timeout | string | `"120s"` | |
| service.annotations | object | `{}` | |
Expand Down
4 changes: 2 additions & 2 deletions charts/application/templates/_podTemplate.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ spec:
containerPort: {{ $ap.containerPort }}
protocol: {{ $ap.protocol }}
{{- end }}
{{- if not .Values.livenessProbe.disabled }}
{{- if .Values.livenessProbe.enabled }}
livenessProbe:
{{- if .Values.livenessProbe.cmd }}
exec:
Expand All @@ -248,7 +248,7 @@ spec:
failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
{{- end }}
{{- if not .Values.readinessProbe.disabled }}
{{- if .Values.readinessProbe.enabled }}
readinessProbe:
{{- if .Values.readinessProbe.cmd }}
exec:
Expand Down
2 changes: 1 addition & 1 deletion charts/application/templates/k8s-service.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if and (not .Values.service.disabled) (not (and .Values.canary.enabled .Values.istio.enabled)) }}
{{- if and .Values.service.enabled (not (and .Values.canary.enabled .Values.istio.enabled)) }}
apiVersion: v1
kind: Service
metadata:
Expand Down
10 changes: 5 additions & 5 deletions charts/application/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ autoscaling:

# Check if the container is running
livenessProbe:
# Disable the liveness probe
disabled: false
# Allows to disable the liveness probe
enabled: true
path: /.well-known/live
# Use a command to check liveness from inside the container, for example ['curl', '-f', 'http://localhost/health/live'].
# This will take precedence over the given `path` value, if provided.
Expand All @@ -38,8 +38,8 @@ livenessProbe:

# Check if the container are able to service requests
readinessProbe:
# Disable the readiness probe
disabled: false
# Allows to disable the readiness probe
enabled: true
path: /.well-known/ready
# Use a command to check readiness from inside the container, for example ['curl', '-f', 'http://localhost/health/ready'].
# This will take precedence over the given `path` value, if provided.
Expand Down Expand Up @@ -86,7 +86,7 @@ image:
pullSecrets: []

service:
disabled: false
enabled: true
port: 80
timeout: 120s
annotations: {}
Expand Down

0 comments on commit 548cc60

Please sign in to comment.