github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

adding backwards compatible component label key override (#22983)

Browse Source 
Signed-off-by: Rodrigo Lomonaco <rodrigo.lomonaco@xero.com>

Co-authored-by: rodrigo.lomonaco <rodrigo.lomonaco@xero.com>
This commit is contained in:
Blanko2
2020-06-28 20:26:17 -07:00
committed by GitHub
co-authored by rodrigo.lomonaco
parent 6b23882541
commit 10e466c721
13 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/nginx-ingress/Chart.yaml
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: nginx-ingress
version: 1.40.1
version: 1.40.2
appVersion: 0.32.0
home: https://github.com/kubernetes/ingress-nginx
description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration.
stable/nginx-ingress/README.md
+2
View File
@@ -53,6 +53,7 @@ Parameter | Description | Default
`controller.image.pullPolicy` | controller container image pull policy | `IfNotPresent`
`controller.image.runAsUser` | User ID of the controller process. Value depends on the Linux distribution used inside of the container image. | `101`
`controller.useComponentLabel` | Wether to add component label so the HPA can work separately for controller and defaultBackend. *Note: don't change this if you have an already running deployment as it will need the recreation of the controller deployment* | `false`
`controller.componentLabelKeyOverride` | Allows override of the component label key | `""`
`controller.containerPort.http` | The port that the controller container listens on for http connections. | `80`
`controller.containerPort.https` | The port that the controller container listens on for https connections. | `443`
`controller.config` | nginx [ConfigMap](https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/configmap.md) entries | none
@@ -191,6 +192,7 @@ Parameter | Description | Default
`defaultBackend.image.pullPolicy` | default backend container image pull policy | `IfNotPresent`
`defaultBackend.image.runAsUser` | User ID of the controller process. Value depends on the Linux distribution used inside of the container image. By default uses nobody user. | `65534`
`defaultBackend.useComponentLabel` | Whether to add component label so the HPA can work separately for controller and defaultBackend. *Note: don't change this if you have an already running deployment as it will need the recreation of the defaultBackend deployment* | `false`
`defaultBackend.componentLabelKeyOverride` | Allows override of the component label key | `""`
`defaultBackend.extraArgs` | Additional default backend container arguments | `{}`
`defaultBackend.extraEnvs` | any additional environment variables to set in the defaultBackend pods | `[]`
`defaultBackend.port` | Http port number | `8080`
stable/nginx-ingress/templates/controller-daemonset.yaml
+4 -4
View File
@@ -9,9 +9,9 @@ metadata:
chart: {{ template "nginx-ingress.chart" . }}
heritage: {{ .Release.Service }}
release: {{ template "nginx-ingress.releaseLabel" . }}
app.kubernetes.io/component: controller
{{ .Values.controller.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: controller
name: {{ template "nginx-ingress.controller.fullname" . }}
annotations:
annotations:
{{ toYaml .Values.controller.deploymentAnnotations | indent 4}}
spec:
selector:
@@ -19,7 +19,7 @@ spec:
app: {{ template "nginx-ingress.name" . }}
release: {{ template "nginx-ingress.releaseLabel" . }}
{{- if .Values.controller.useComponentLabel }}
app.kubernetes.io/component: controller
{{ .Values.controller.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: controller
{{- end }}
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
updateStrategy:
@@ -37,7 +37,7 @@ spec:
app: {{ template "nginx-ingress.name" . }}
release: {{ template "nginx-ingress.releaseLabel" . }}
component: "{{ .Values.controller.name }}"
app.kubernetes.io/component: controller
{{ .Values.controller.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: controller
{{- if .Values.controller.podLabels }}
{{ toYaml .Values.controller.podLabels | indent 8}}
{{- end }}
stable/nginx-ingress/templates/controller-deployment.yaml
+4 -3
View File
@@ -7,7 +7,8 @@ metadata:
chart: {{ template "nginx-ingress.chart" . }}
heritage: {{ .Release.Service }}
release: {{ template "nginx-ingress.releaseLabel" . }}
app.kubernetes.io/component: controller
{{ .Values.controller.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: controller
{{- if .Values.controller.deploymentLabels }}
{{ toYaml .Values.controller.deploymentLabels | indent 4 }}
{{- end }}
@@ -20,7 +21,7 @@ spec:
app: {{ template "nginx-ingress.name" . }}
release: {{ template "nginx-ingress.releaseLabel" . }}
{{- if .Values.controller.useComponentLabel }}
app.kubernetes.io/component: controller
{{ .Values.controller.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: controller
{{- end }}
{{- if not .Values.controller.autoscaling.enabled }}
replicas: {{ .Values.controller.replicaCount }}
@@ -41,7 +42,7 @@ spec:
app: {{ template "nginx-ingress.name" . }}
release: {{ template "nginx-ingress.releaseLabel" . }}
component: "{{ .Values.controller.name }}"
app.kubernetes.io/component: controller
{{ .Values.controller.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: controller
{{- if .Values.controller.podLabels }}
{{ toYaml .Values.controller.podLabels | indent 8 }}
{{- end }}
stable/nginx-ingress/templates/controller-metrics-service.yaml
+1 -1
View File
@@ -42,6 +42,6 @@ spec:
selector:
app: {{ template "nginx-ingress.name" . }}
release: {{ template "nginx-ingress.releaseLabel" . }}
app.kubernetes.io/component: controller
{{ .Values.controller.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: controller
type: "{{ .Values.controller.metrics.service.type }}"
{{- end }}
stable/nginx-ingress/templates/controller-poddisruptionbudget.yaml
+2 -2
View File
@@ -5,7 +5,7 @@ metadata:
labels:
app: {{ template "nginx-ingress.name" . }}
chart: {{ template "nginx-ingress.chart" . }}
app.kubernetes.io/component: controller
{{ .Values.controller.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: controller
heritage: {{ .Release.Service }}
release: {{ template "nginx-ingress.releaseLabel" . }}
name: {{ template "nginx-ingress.controller.fullname" . }}
@@ -14,6 +14,6 @@ spec:
matchLabels:
app: {{ template "nginx-ingress.name" . }}
release: {{ template "nginx-ingress.releaseLabel" . }}
app.kubernetes.io/component: controller
{{ .Values.controller.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: controller
minAvailable: {{ .Values.controller.minAvailable }}
{{- end }}
stable/nginx-ingress/templates/controller-service-internal.yaml
+1 -1
View File
@@ -40,6 +40,6 @@ spec:
selector:
app: {{ template "nginx-ingress.name" . }}
release: {{ template "nginx-ingress.releaseLabel" . }}
app.kubernetes.io/component: controller
{{ .Values.controller.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: controller
type: "{{ .Values.controller.service.type }}"
{{- end }}
stable/nginx-ingress/templates/controller-service.yaml
+1 -1
View File
@@ -89,6 +89,6 @@ spec:
selector:
app: {{ template "nginx-ingress.name" . }}
release: {{ template "nginx-ingress.releaseLabel" . }}
app.kubernetes.io/component: controller
{{ .Values.controller.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: controller
type: "{{ .Values.controller.service.type }}"
{{- end }}
stable/nginx-ingress/templates/controller-webhook-service.yaml
+1 -1
View File
@@ -39,6 +39,6 @@ spec:
selector:
app: {{ template "nginx-ingress.name" . }}
release: {{ template "nginx-ingress.releaseLabel" . }}
app.kubernetes.io/component: controller
{{ .Values.controller.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: controller
type: "{{ .Values.controller.admissionWebhooks.service.type }}"
{{- end }}
stable/nginx-ingress/templates/default-backend-deployment.yaml
+3 -3
View File
@@ -7,7 +7,7 @@ metadata:
chart: {{ template "nginx-ingress.chart" . }}
heritage: {{ .Release.Service }}
release: {{ template "nginx-ingress.releaseLabel" . }}
app.kubernetes.io/component: default-backend
{{ .Values.defaultBackend.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: default-backend
{{- if .Values.defaultBackend.deploymentLabels }}
{{ toYaml .Values.defaultBackend.deploymentLabels | indent 4 }}
{{- end }}
@@ -18,7 +18,7 @@ spec:
app: {{ template "nginx-ingress.name" . }}
release: {{ template "nginx-ingress.releaseLabel" . }}
{{- if .Values.defaultBackend.useComponentLabel }}
app.kubernetes.io/component: default-backend
{{ .Values.defaultBackend.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: default-backend
{{- end }}
replicas: {{ .Values.defaultBackend.replicaCount }}
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
@@ -33,7 +33,7 @@ spec:
labels:
app: {{ template "nginx-ingress.name" . }}
release: {{ template "nginx-ingress.releaseLabel" . }}
app.kubernetes.io/component: default-backend
{{ .Values.defaultBackend.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: default-backend
{{- if .Values.defaultBackend.podLabels }}
{{ toYaml .Values.defaultBackend.podLabels | indent 8 }}
{{- end }}
stable/nginx-ingress/templates/default-backend-poddisruptionbudget.yaml
+2 -2
View File
@@ -5,7 +5,7 @@ metadata:
labels:
app: {{ template "nginx-ingress.name" . }}
chart: {{ template "nginx-ingress.chart" . }}
app.kubernetes.io/component: default-backend
{{ .Values.defaultBackend.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: default-backend
heritage: {{ .Release.Service }}
release: {{ template "nginx-ingress.releaseLabel" . }}
name: {{ template "nginx-ingress.defaultBackend.fullname" . }}
@@ -14,6 +14,6 @@ spec:
matchLabels:
app: {{ template "nginx-ingress.name" . }}
release: {{ template "nginx-ingress.releaseLabel" . }}
app.kubernetes.io/component: default-backend
{{ .Values.defaultBackend.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: default-backend
minAvailable: {{ .Values.defaultBackend.minAvailable }}
{{- end }}
stable/nginx-ingress/templates/default-backend-service.yaml
+1 -1
View File
@@ -40,6 +40,6 @@ spec:
selector:
app: {{ template "nginx-ingress.name" . }}
release: {{ template "nginx-ingress.releaseLabel" . }}
app.kubernetes.io/component: default-backend
{{ .Values.defaultBackend.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: default-backend
type: "{{ .Values.defaultBackend.service.type }}"
{{- end }}
stable/nginx-ingress/values.yaml
+6
View File
@@ -16,6 +16,9 @@ controller:
# We recommend setting this to true for new deployments.
useComponentLabel: false
# Override component label key
# componentLabelKeyOverride:
# Configures the ports the nginx-controller listens on
containerPort:
http: 80
@@ -458,6 +461,9 @@ defaultBackend:
# We recommend setting this to true for new deployments.
useComponentLabel: false
# Override component label key
# componentLabelKeyOverride:
extraArgs: {}
serviceAccount: