mirror of
https://github.com/bitnami/charts.git
synced 2026-03-06 15:10:15 +08:00
[bitnami/nginx] Adding health ingress. (#2469)
* Added health ingress. * increamented the minnor version * Update bitnami/nginx/Chart.yaml chart version with new patch since incremented new minor version. Co-authored-by: Carlos Rodríguez Hernández <carrodher1179@gmail.com> * [bitnami/nginx] Update components versions Signed-off-by: Bitnami Containers <containers@bitnami.com> Co-authored-by: Shankar Mohan <Shankar.Mohan@mrisoftware.com> Co-authored-by: Carlos Rodríguez Hernández <carrodher1179@gmail.com> Co-authored-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
shankarmohannamakkal
committed by
GitHub
GitHub
parent
ecb515030b
commit
32b5f15348
@@ -1,6 +1,6 @@
|
||||
apiVersion: v1
|
||||
name: nginx
|
||||
version: 5.2.4
|
||||
version: 5.3.0
|
||||
appVersion: 1.17.10
|
||||
description: Chart for the nginx server
|
||||
keywords:
|
||||
|
||||
@@ -100,6 +100,17 @@ The following tables lists the configurable parameters of the NGINX Open Source
|
||||
| `ingress.secrets[0].name` | TLS Secret Name | `nil` |
|
||||
| `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` |
|
||||
| `ingress.secrets[0].key` | TLS Secret Key | `nil` |
|
||||
| `healthIngress.enabled` | Enable health ingress controller resource | `false` |
|
||||
| `healthIngress.certManager` | Add annotations for cert-manager | `false` |
|
||||
| `healthIngress.selectors` | Health Ingress selectors for labelSelector option | `[]` |
|
||||
| `healthIngress.annotations` | Health Ingress annotations | `[]` |
|
||||
| `healthIngress.hosts[0].name` | Hostname to your NGINX installation | `nginx.local` |
|
||||
| `healthIngress.hosts[0].path` | Path within the url structure | `/` |
|
||||
| `healthIngress.tls[0].hosts[0]` | TLS hosts | `nginx.local` |
|
||||
| `healthIngress.tls[0].secretName` | TLS Secret (certificates) | `nginx.local-tls` |
|
||||
| `healthIngress.secrets[0].name` | TLS Secret Name | `nil` |
|
||||
| `healthIngress.secrets[0].certificate` | TLS Secret Certificate | `nil` |
|
||||
| `healthIngress.secrets[0].key` | TLS Secret Key | `nil` |
|
||||
| `metrics.enabled` | Start a side-car prometheus exporter | `false` |
|
||||
| `metrics.image.registry` | NGINX Prometheus exporter image registry | `docker.io` |
|
||||
| `metrics.image.repository` | NGINX Prometheus exporter image name | `bitnami/nginx-exporter` |
|
||||
|
||||
37
bitnami/nginx/templates/health-ingress.yaml
Normal file
37
bitnami/nginx/templates/health-ingress.yaml
Normal file
@@ -0,0 +1,37 @@
|
||||
{{- if .Values.healthIngress.enabled }}
|
||||
apiVersion: extensions/v1beta1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: {{ include "nginx.fullname" . }}-health
|
||||
labels: {{- include "nginx.labels" . | nindent 4 }}
|
||||
annotations:
|
||||
{{- if .Values.healthIngress.certManager }}
|
||||
kubernetes.io/tls-acme: "true"
|
||||
{{- end }}
|
||||
{{- range $key, $value := .Values.healthIngress.annotations }}
|
||||
{{ $key }}: {{ $value | quote }}
|
||||
{{- end }}
|
||||
spec:
|
||||
rules:
|
||||
{{- if .Values.healthIngress.hostname }}
|
||||
- host: {{ .Values.healthIngress.hostname }}
|
||||
http:
|
||||
paths:
|
||||
- path: /
|
||||
backend:
|
||||
serviceName: "{{ template "nginx.fullname" $ }}"
|
||||
servicePort: http
|
||||
{{- end }}
|
||||
{{- range .Values.healthIngress.hosts }}
|
||||
- host: {{ .name }}
|
||||
http:
|
||||
paths:
|
||||
- path: {{ default "/" .path }}
|
||||
backend:
|
||||
serviceName: "{{ template "nginx.fullname" $ }}"
|
||||
servicePort: http
|
||||
{{- end }}
|
||||
{{- if .Values.healthIngress.tls }}
|
||||
tls: {{- toYaml .Values.healthIngress.tls | nindent 4 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
@@ -13,7 +13,7 @@
|
||||
image:
|
||||
registry: docker.io
|
||||
repository: bitnami/nginx
|
||||
tag: 1.17.10-debian-10-r11
|
||||
tag: 1.17.10-debian-10-r28
|
||||
## Specify a imagePullPolicy
|
||||
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
|
||||
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
|
||||
@@ -232,6 +232,43 @@ ingress:
|
||||
- example.local
|
||||
secretName: example.local-tls
|
||||
|
||||
|
||||
healthIngress:
|
||||
## Set to true to enable health ingress record generation
|
||||
##
|
||||
enabled: false
|
||||
|
||||
## Set this to true in order to add the corresponding annotations for cert-manager
|
||||
##
|
||||
certManager: false
|
||||
|
||||
## When the health ingress is enabled, a host pointing to this will be created
|
||||
##
|
||||
hostname: example.local
|
||||
|
||||
## Health Ingress annotations done as key:value pairs
|
||||
## For a full list of possible ingress annotations, please see
|
||||
## ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/annotations.md
|
||||
##
|
||||
## If tls is set to true, annotation ingress.kubernetes.io/secure-backends: "true" will automatically be set
|
||||
## If certManager is set to true, annotation kubernetes.io/tls-acme: "true" will automatically be set
|
||||
annotations: {}
|
||||
# kubernetes.io/ingress.class: nginx
|
||||
|
||||
## The list of additional hostnames to be covered with this health ingress record.
|
||||
## Most likely the hostname above will be enough, but in the event more hosts are needed, this is an array
|
||||
## hosts:
|
||||
## - name: example.local
|
||||
## path: /
|
||||
|
||||
## The tls configuration for the health ingress
|
||||
## ref: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls
|
||||
##
|
||||
tls:
|
||||
- hosts:
|
||||
- example.local
|
||||
secretName: example.local-tls
|
||||
|
||||
secrets:
|
||||
## If you're providing your own certificates, please use this to add the certificates as secrets
|
||||
## key and certificate should start with -----BEGIN CERTIFICATE----- or
|
||||
@@ -257,7 +294,7 @@ metrics:
|
||||
image:
|
||||
registry: docker.io
|
||||
repository: bitnami/nginx-exporter
|
||||
tag: 0.6.0-debian-10-r63
|
||||
tag: 0.7.0-debian-10-r17
|
||||
pullPolicy: IfNotPresent
|
||||
## Optionally specify an array of imagePullSecrets.
|
||||
## Secrets must be manually created in the namespace.
|
||||
|
||||
Reference in New Issue
Block a user