Merge pull request #3222 from alvistack/nginx-0.19.0

ingress-nginx: Upgrade to 0.19.0

README.md

@@ -105,7 +105,7 @@ Supported Components
     -   [cephfs-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.0-k8s1.11
     -   [cert-manager](https://github.com/jetstack/cert-manager) v0.4.1
     -   [coredns](https://github.com/coredns/coredns) v1.2.2
-    -   [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v0.18.0
+    -   [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v0.19.0
 
 Note: kubernetes doesn't support newer docker versions. Among other things kubelet currently breaks on docker's non-standard version numbering (it no longer uses semantic versioning). To ensure auto-updates don't break your cluster look into e.g. yum versionlock plugin or apt pin).
 

roles/download/defaults/main.yml

@@ -151,7 +151,7 @@ local_volume_provisioner_image_tag: "v2.1.0"
 cephfs_provisioner_image_repo: "quay.io/external_storage/cephfs-provisioner"
 cephfs_provisioner_image_tag: "v2.1.0-k8s1.11"
 ingress_nginx_controller_image_repo: "quay.io/kubernetes-ingress-controller/nginx-ingress-controller"
-ingress_nginx_controller_image_tag: "0.18.0"
+ingress_nginx_controller_image_tag: "0.19.0"
 ingress_nginx_default_backend_image_repo: "gcr.io/google_containers/defaultbackend"
 ingress_nginx_default_backend_image_tag: "1.4"
 cert_manager_version: "v0.4.1"

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

@@ -3,7 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   name: ingress-nginx
-  namespace: {{ ingress_nginx_namespace }}
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
 rules:
   - apiGroups: [""]
     resources: ["configmaps", "endpoints", "nodes", "pods", "secrets"]

roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/clusterrolebinding-ingress-nginx.yml.j2

@@ -4,11 +4,14 @@ kind: ClusterRoleBinding
 metadata:
   name: ingress-nginx
   namespace: {{ ingress_nginx_namespace }}
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: ingress-nginx
 subjects:
   - kind: ServiceAccount
     name: ingress-nginx
     namespace: {{ ingress_nginx_namespace }}
-roleRef:
-  kind: ClusterRole
-  name: ingress-nginx
-  apiGroup: rbac.authorization.k8s.io

roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/cm-ingress-nginx.yml.j2

@@ -5,7 +5,8 @@ metadata:
   name: ingress-nginx
   namespace: {{ ingress_nginx_namespace }}
   labels:
-    k8s-app: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
 {% if ingress_nginx_configmap %}
 data:
   {{ ingress_nginx_configmap | to_nice_yaml | indent(2) }}

roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/cm-tcp-services.yml.j2

@@ -5,7 +5,8 @@ metadata:
   name: tcp-services
   namespace: {{ ingress_nginx_namespace }}
   labels:
-    k8s-app: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
 {% if ingress_nginx_configmap_tcp_services %}
 data:
   {{ ingress_nginx_configmap_tcp_services | to_nice_yaml | indent(2) }}

roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/cm-udp-services.yml.j2

@@ -5,7 +5,8 @@ metadata:
   name: udp-services
   namespace: {{ ingress_nginx_namespace }}
   labels:
-    k8s-app: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
 {% if ingress_nginx_configmap_udp_services %}
 data:
   {{ ingress_nginx_configmap_udp_services | to_nice_yaml | indent(2) }}

roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/deploy-default-backend.yml.j2

@@ -5,19 +5,19 @@ metadata:
   name: default-backend
   namespace: {{ ingress_nginx_namespace }}
   labels:
-    k8s-app: default-backend
+    app.kubernetes.io/name: default-backend
-    version: v{{ ingress_nginx_default_backend_image_tag }}
+    app.kubernetes.io/part-of: ingress-nginx
 spec:
   replicas: 1
   selector:
     matchLabels:
-      k8s-app: default-backend
+      app.kubernetes.io/name: default-backend
-      version: v{{ ingress_nginx_default_backend_image_tag }}
+      app.kubernetes.io/part-of: ingress-nginx
   template:
     metadata:
       labels:
-        k8s-app: default-backend
+        app.kubernetes.io/name: default-backend
-        version: v{{ ingress_nginx_default_backend_image_tag }}
+        app.kubernetes.io/part-of: ingress-nginx
     spec:
       terminationGracePeriodSeconds: 60
       containers:

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

@@ -5,18 +5,18 @@ metadata:
   name: ingress-nginx-controller
   namespace: {{ ingress_nginx_namespace }}
   labels:
-    k8s-app: ingress-nginx
+    app.kubernetes.io/name: ingress-nginx
-    version: v{{ ingress_nginx_controller_image_tag }}
+    app.kubernetes.io/part-of: ingress-nginx
 spec:
   selector:
     matchLabels:
-      k8s-app: ingress-nginx
+      app.kubernetes.io/name: ingress-nginx
-      version: v{{ ingress_nginx_controller_image_tag }}
+      app.kubernetes.io/part-of: ingress-nginx
   template:
     metadata:
       labels:
-        k8s-app: ingress-nginx
+        app.kubernetes.io/name: ingress-nginx
-        version: v{{ ingress_nginx_controller_image_tag }}
+        app.kubernetes.io/part-of: ingress-nginx
       annotations:
         prometheus.io/port: '10254'
         prometheus.io/scrape: 'true'

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

@@ -4,6 +4,9 @@ kind: Role
 metadata:
   name: ingress-nginx
   namespace: {{ ingress_nginx_namespace }}
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
 rules:
   - apiGroups: [""]
     resources: ["configmaps", "pods", "secrets", "namespaces"]
@@ -22,11 +25,7 @@ rules:
   - apiGroups: [""]
     resources: ["endpoints"]
     verbs: ["get"]
-  - apiGroups:
+  - apiGroups: ["policy"]
-    - policy
+    resourceNames: ["ingress-nginx"]
-    resourceNames:
+    resources: ["podsecuritypolicies"]
-    - ingress-nginx
+    verbs: ["use"]
-    resources:
-    - podsecuritypolicies
-    verbs:
-    - use

roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/rolebinding-ingress-nginx.yml.j2

@@ -4,11 +4,14 @@ kind: RoleBinding
 metadata:
   name: ingress-nginx
   namespace: {{ ingress_nginx_namespace }}
-subjects:
+  labels:
-  - kind: ServiceAccount
+    app.kubernetes.io/name: ingress-nginx
-    name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx
-    namespace: {{ ingress_nginx_namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: ingress-nginx
+subjects:
+  - kind: ServiceAccount
+    name: ingress-nginx
+    namespace: {{ ingress_nginx_namespace }}

roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/sa-ingress-nginx.yml.j2

@@ -4,3 +4,6 @@ kind: ServiceAccount
 metadata:
   name: ingress-nginx
   namespace: {{ ingress_nginx_namespace }}
+  labels:
+    app.kubernetes.io/name: ingress-nginx
+    app.kubernetes.io/part-of: ingress-nginx

roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/svc-default-backend.yml.j2

@@ -5,10 +5,11 @@ metadata:
   name: default-backend
   namespace: {{ ingress_nginx_namespace }}
   labels:
-    k8s-app: default-backend
+    app.kubernetes.io/name: default-backend
+    app.kubernetes.io/part-of: ingress-nginx
 spec:
   ports:
     - port: 80
       targetPort: 8080
   selector:
-    k8s-app: default-backend
+    app.kubernetes.io/name: default-backend