C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add labels for ingress_nginx_namespace, also only setup serviceAccountName if rbac_enabled

Browse source
This commit is contained in:
Wong Hoi Sing Edison 2018-03-05 23:11:18 +08:00
parent dada98143c
commit e65904eee3
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ingress-nginx-controller-ds.yml.j2
View file

@ -21,7 +21,6 @@ spec:
k8s-app: ingress-nginx k8s-app: ingress-nginx
version: v{{ ingress_nginx_controller_image_tag }} version: v{{ ingress_nginx_controller_image_tag }}
spec: spec:
serviceAccountName: ingress-nginx
containers: containers:
- name: ingress-nginx-controller - name: ingress-nginx-controller
image: {{ ingress_nginx_controller_image_repo }}:{{ ingress_nginx_controller_image_tag }} image: {{ ingress_nginx_controller_image_repo }}:{{ ingress_nginx_controller_image_tag }}
@ -68,3 +67,6 @@ spec:
periodSeconds: 10 periodSeconds: 10
successThreshold: 1 successThreshold: 1
timeoutSeconds: 1 timeoutSeconds: 1
{% if rbac_enabled %}
serviceAccountName: ingress-nginx
{% endif %}

2
roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ingress-nginx-ns.yml.j2
View file

@ -3,3 +3,5 @@ apiVersion: v1
kind: Namespace kind: Namespace
metadata: metadata:
name: {{ ingress_nginx_namespace }} name: {{ ingress_nginx_namespace }}
labels:
name: {{ ingress_nginx_namespace }}