Commit ca29f146 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
parents 3c23c84e 9112915b
Pipeline #55031330 passed with stages
in 37 minutes and 51 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