Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-08-10 14:15:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync upstream changes (#5359)

Browse Source
This commit is contained in:
Miguel Ángel Cabrera Miñagorri
2021-02-01 17:24:29 +01:00
committed by GitHub
parent a74e15d246
commit 75be489afd
26 changed files with 53 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/nginx-ingress-controller/Chart.yaml
+1 -1
View File
@@ -26,4 +26,4 @@ name: nginx-ingress-controller
sources:
- https://github.com/bitnami/bitnami-docker-nginx-ingress-controller
- https://github.com/kubernetes/ingress-nginx
version: 7.3.2
version: 7.4.0
bitnami/nginx-ingress-controller/README.md
+1
View File
@@ -92,6 +92,7 @@ The following tables lists the configurable parameters of the Nginx Ingress Cont
| `configMapNamespace` | The nginx-configmap namespace name | `""` |
| `tcpConfigMapNamespace` | The tcp-services-configmap namespace name | `""` |
| `udpConfigMapNamespace` | The udp-services-configmap namespace name | `""` |
| `dhparam` | A base64 Diffie-Helman parameter | `nil` |
| `tcp` | TCP service key:value pairs | `{}` |
| `udp` | UDP service key:value pairs | `{}` |
| `maxmindLicenseKey` | Maxmind license key to download GeoLite2 Databases | `""` |
bitnami/nginx-ingress-controller/templates/addheaders-configmap.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ printf "%s-custom-add-headers" (include "common.names.fullname" .) }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: controller
{{- if .Values.commonLabels }}
bitnami/nginx-ingress-controller/templates/clusterrole.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ include "common.names.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
bitnami/nginx-ingress-controller/templates/clusterrolebinding.yaml
+2 -2
View File
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ include "common.names.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
@@ -18,5 +18,5 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ include "nginx-ingress-controller.serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
{{- end -}}
bitnami/nginx-ingress-controller/templates/controller-configmap.yaml
+5 -2
View File
@@ -1,9 +1,9 @@
{{- if or .Values.config (or (or .Values.proxySetHeaders .Values.headers) .Values.addHeaders) }}
{{- if or .Values.config (or (or .Values.proxySetHeaders .Values.headers) .Values.addHeaders) .Values.dhParam }}
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "common.names.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: controller
{{- if .Values.commonLabels }}
@@ -19,6 +19,9 @@ data:
{{- if or .Values.proxySetHeaders .Values.headers }}
proxy-set-headers: {{ .Release.Namespace }}/{{ printf "%s-custom-proxy-headers" (include "common.names.fullname" .) }}
{{- end }}
{{- if .Values.dhParam }}
ssl-dh-param: {{ printf "%s/%s" .Release.Namespace (include "common.names.fullname" .) }}
{{- end }}
{{- if .Values.config }}
{{- include "common.tplvalues.render" (dict "value" .Values.config "context" $) | nindent 2 }}
{{- end }}
bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml
+1 -1
View File
@@ -4,7 +4,7 @@ apiVersion: apps/v1
kind: DaemonSet
metadata:
name: {{ template "common.names.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: controller
{{- if .Values.commonLabels }}
bitnami/nginx-ingress-controller/templates/controller-deployment.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
kind: Deployment
metadata:
name: {{ template "common.names.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: controller
{{- if .Values.commonLabels }}
bitnami/nginx-ingress-controller/templates/controller-hpa.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ apiVersion: autoscaling/v2beta1
kind: HorizontalPodAutoscaler
metadata:
name: {{ template "common.names.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: controller
{{- if .Values.commonLabels }}
bitnami/nginx-ingress-controller/templates/controller-metrics-service.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ printf "%s-metrics" (include "common.names.fullname" .) }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: metrics
{{- if .Values.metrics.service.labels }}
bitnami/nginx-ingress-controller/templates/controller-poddisruptionbudget.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ apiVersion: policy/v1beta1
kind: PodDisruptionBudget
metadata:
name: {{ template "common.names.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: controller
{{- if .Values.commonLabels }}
bitnami/nginx-ingress-controller/templates/controller-prometheusrules.yaml
+2 -2
View File
@@ -4,9 +4,9 @@ kind: PrometheusRule
metadata:
name: {{ include "common.names.fullname" . }}
{{- if .Values.metrics.prometheusRule.namespace }}
namespace: {{ .Values.metrics.prometheusRule.namespace }}
namespace: {{ .Values.metrics.prometheusRule.namespace | quote }}
{{- else }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: controller
bitnami/nginx-ingress-controller/templates/controller-service.yaml
+1 -1
View File
@@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ template "common.names.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: controller
{{- if .Values.service.labels }}
bitnami/nginx-ingress-controller/templates/controller-servicemonitor.yaml
+2 -2
View File
@@ -4,9 +4,9 @@ kind: ServiceMonitor
metadata:
name: {{ template "common.names.fullname" . }}
{{- if .Values.metrics.serviceMonitor.namespace }}
namespace: {{ .Values.metrics.serviceMonitor.namespace }}
namespace: {{ .Values.metrics.serviceMonitor.namespace | quote }}
{{- else }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: metrics
bitnami/nginx-ingress-controller/templates/default-backend-deployment.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
kind: Deployment
metadata:
name: {{ template "nginx-ingress-controller.defaultBackend.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: default-backend
{{- if .Values.commonLabels }}
bitnami/nginx-ingress-controller/templates/default-backend-poddisruptionbudget.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ apiVersion: policy/v1beta1
kind: PodDisruptionBudget
metadata:
name: {{ include "nginx-ingress-controller.defaultBackend.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: default-backend
{{- if .Values.commonLabels }}
bitnami/nginx-ingress-controller/templates/default-backend-service.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ include "nginx-ingress-controller.defaultBackend.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: default-backend
{{- if .Values.commonLabels }}
bitnami/nginx-ingress-controller/templates/dh-param-secret.yaml
+16
View File
@@ -0,0 +1,16 @@
{{- if .Values.dhParam -}}
apiVersion: v1
kind: Secret
metadata:
name: {{ include "common.names.fullname" . }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: controller
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
data:
dhparam.pem: {{ .Values.dhParam | quote }}
{{- end }}
bitnami/nginx-ingress-controller/templates/podsecuritypolicy.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ apiVersion: {{ include "nginx-ingress-controller.podSecurityPolicy.apiVersion" .
kind: PodSecurityPolicy
metadata:
name: {{ include "common.names.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
bitnami/nginx-ingress-controller/templates/proxyheaders-configmap.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ printf "%s-custom-proxy-headers" (include "common.names.fullname" .) }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: controller
{{- if .Values.commonLabels }}
bitnami/nginx-ingress-controller/templates/role.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: {{ template "common.names.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
bitnami/nginx-ingress-controller/templates/rolebinding.yaml
+2 -2
View File
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ template "common.names.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
@@ -18,5 +18,5 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ include "nginx-ingress-controller.serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
{{- end -}}
bitnami/nginx-ingress-controller/templates/serviceaccount.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "nginx-ingress-controller.serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
bitnami/nginx-ingress-controller/templates/tcp-configmap.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ printf "%s-tcp" (include "common.names.fullname" .) }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: controller
{{- if .Values.commonLabels }}
bitnami/nginx-ingress-controller/templates/udp-configmap.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ printf "%s-udp" (include "common.names.fullname" .) }}
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: controller
{{- if .Values.commonLabels }}
bitnami/nginx-ingress-controller/values.yaml
+5
View File
@@ -121,6 +121,11 @@ udpConfigMapNamespace: ''
##
maxmindLicenseKey: ''
# A base64ed Diffie-Hellman parameter
# This can be generated with: openssl dhparam 4096 2> /
# Ref: https://github.com/krmichel/ingress-nginx/blob/master/docs/examples/customization/ssl-dh-param
dhParam:
## TCP service key:value pairs
## ref: https://github.com/kubernetes/contrib/tree/master/ingress/controllers/nginx/examples/tcp
##