[bitnami/apache] Fix probes not reading port from .Values (#10286)

* [bitnami/apache] Fix probes not reading port from .Values

From what I can see the  pull request [#1696][1] tried to introduce
both customizable path and port number for the livellyness and readyness
probes, however, the part where it actually read the custom value from
the .Values file was removed before the merge.

With this pull request we actually allow people to change the port, as
else the now default value is ignored and might cause confusion when
nothing happens even though the user has defined a custom port.

Signed-off-by: Jonas Alfredsson <jonasal@axis.com>

[1]: https://github.com/bitnami/charts/pull/1696

* [bitnami/apache] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: Carlos Rodríguez Hernández <carlosrh@vmware.com>
Co-authored-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
Jonas Alfredsson
2022-05-18 20:09:30 +02:00
committed by GitHub
parent d8789bbde9
commit 910396069e
3 changed files with 7 additions and 7 deletions

View File

@@ -26,4 +26,4 @@ name: apache
sources:
- https://github.com/bitnami/bitnami-docker-apache
- https://httpd.apache.org
version: 9.1.1
version: 9.1.2

View File

@@ -151,7 +151,7 @@ spec:
startupProbe:
httpGet:
path: {{ .Values.startupProbe.path }}
port: http
port: {{ .Values.startupProbe.port }}
initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.startupProbe.periodSeconds }}
timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }}
@@ -164,7 +164,7 @@ spec:
livenessProbe:
httpGet:
path: {{ .Values.livenessProbe.path }}
port: http
port: {{ .Values.livenessProbe.port }}
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
@@ -177,7 +177,7 @@ spec:
readinessProbe:
httpGet:
path: {{ .Values.readinessProbe.path }}
port: http
port: {{ .Values.readinessProbe.port }}
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}

View File

@@ -51,7 +51,7 @@ extraDeploy: []
image:
registry: docker.io
repository: bitnami/apache
tag: 2.4.53-debian-10-r61
tag: 2.4.53-debian-10-r62
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -79,7 +79,7 @@ image:
git:
registry: docker.io
repository: bitnami/git
tag: 2.36.1-debian-10-r9
tag: 2.36.1-debian-10-r10
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
@@ -593,7 +593,7 @@ metrics:
image:
registry: docker.io
repository: bitnami/apache-exporter
tag: 0.11.0-debian-10-r146
tag: 0.11.0-debian-10-r148
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.