Commit 58031d6d authored by Jason Plum's avatar Jason Plum

Merge branch 'add-selector-to-nginx-daemonset' into 'master'

Fix DaemonSet support for NGINX

See merge request charts/gitlab!748

(cherry picked from commit ca29f146)

2c373441 Add explicit selector labels for daemonset
5af9f8ed Add DaemonSet to componentKinds
7ed90fba Correct the DaemonSet test value
a1b57a51 Add quotes for DaemonSet
cedfd80e Fix whitespace parsing in application.yml
3f9ad119 Add changelog
parent b950d39f
Pipeline #55032518 passed with stages
in 40 minutes and 44 seconds
---
title: Fix support for NGINX Ingress DaemonSets
merge_request: 748
author:
type: fixed
......@@ -13,6 +13,11 @@ spec:
updateStrategy:
{{ toYaml .Values.controller.updateStrategy | indent 4 }}
minReadySeconds: {{ .Values.controller.minReadySeconds }}
selector:
matchLabels:
app: {{ template "name" . }}
component: "{{ .Values.controller.name }}"
release: {{ .Release.Name }}
template:
metadata:
annotations:
......
......@@ -82,7 +82,7 @@ spec:
kind: Role
- group: rbac.authorization.k8s.io
kind: RoleBinding
{{ if eq .Values.global.application.allowClusterRoles true -}}
{{- if eq .Values.global.application.allowClusterRoles true }}
- group: rbac.authorization.k8s.io
kind: ClusterRole
- group: rbac.authorization.k8s.io
......@@ -98,6 +98,10 @@ spec:
kind: PersistentVolumeClaim
- group: apps
kind: Deployment
{{- if eq (index .Values "nginx-ingress" "controller" "kind") "DaemonSet" }}
- group: apps
kind: DaemonSet
{{- end }}
- group: autoscaling
kind: HorizontalPodAutoscaler
- group: apps
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment