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

Fix nginx template missing latest changes (#6000)

Browse source
This commit is contained in:
Florian Ruynat 2020-04-22 17:41:52 +02:00 committed by GitHub
parent d7df577898
commit b8cd9403df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@ rules:
verbs: ["get"] verbs: ["get"]
- apiGroups: [""] - apiGroups: [""]
resources: ["services"] resources: ["services"]
verbs: ["get", "list", "watch"] verbs: ["get", "list", "update", "watch"]
- apiGroups: ["extensions","networking.k8s.io"] - apiGroups: ["extensions","networking.k8s.io"]
resources: ["ingresses"] resources: ["ingresses"]
verbs: ["get", "list", "watch"] verbs: ["get", "list", "watch"]

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

@ -39,6 +39,11 @@ spec:
- 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 }}
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
lifecycle:
preStop:
exec:
command:
- /wait-shutdown
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
- --configmap=$(POD_NAMESPACE)/ingress-nginx - --configmap=$(POD_NAMESPACE)/ingress-nginx
@ -84,16 +89,18 @@ spec:
path: /healthz path: /healthz
port: 10254 port: 10254
scheme: HTTP scheme: HTTP
initialDelaySeconds: 5 initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 5 timeoutSeconds: 5
successThreshold: 1 successThreshold: 1
failureThreshold: 10
readinessProbe:
failureThreshold: 3 failureThreshold: 3
readinessProbe:
httpGet: httpGet:
path: /healthz path: /healthz
port: 10254 port: 10254
scheme: HTTP scheme: HTTP
initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 5 timeoutSeconds: 5
successThreshold: 1 successThreshold: 1
failureThreshold: 10 failureThreshold: 3

19
roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/role-ingress-nginx.yml.j2
View file

@ -9,8 +9,20 @@ metadata:
app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/part-of: ingress-nginx
rules: rules:
- apiGroups: [""] - apiGroups: [""]
resources: ["configmaps", "pods", "secrets", "namespaces"] resources: ["namespaces"]
verbs: ["get"] verbs: ["get"]
- apiGroups: [""]
resources: ["configmaps", "pods", "secrets", "endpoints"]
verbs: ["get", "list", "watch"]
- apiGroups: [""]
resources: ["services"]
verbs: ["get", "list", "update", "watch"]
- apiGroups: ["extensions", "networking.k8s.io"]
resources: ["ingresses"]
verbs: ["get", "list", "watch"]
- apiGroups: ["extensions", "networking.k8s.io"]
resources: ["ingresses/status"]
verbs: ["update"]
- apiGroups: [""] - apiGroups: [""]
resources: ["configmaps"] resources: ["configmaps"]
# Defaults to "<election-id>-<ingress-class>" # Defaults to "<election-id>-<ingress-class>"
@ -24,7 +36,10 @@ rules:
verbs: ["create"] verbs: ["create"]
- apiGroups: [""] - apiGroups: [""]
resources: ["endpoints"] resources: ["endpoints"]
verbs: ["get"] verbs: ["create", "get", "update"]
- apiGroups: [""]
resources: ["events"]
verbs: ["create", "patch"]
- apiGroups: ["policy"] - apiGroups: ["policy"]
resourceNames: ["ingress-nginx"] resourceNames: ["ingress-nginx"]
resources: ["podsecuritypolicies"] resources: ["podsecuritypolicies"]