diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 1fc32046f974cb8baaf67df6c8a0e524596763f2..b20f2c74e94be2de50e60e5a9fa3778fe8f682ef 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -664,7 +664,7 @@ rbd_provisioner_image_tag: "v2.1.1-k8s1.11" local_path_provisioner_image_repo: "{{ docker_image_repo }}/rancher/local-path-provisioner" local_path_provisioner_image_tag: "v0.0.19" ingress_nginx_controller_image_repo: "{{ kube_image_repo }}/ingress-nginx/controller" -ingress_nginx_controller_image_tag: "v0.43.0" +ingress_nginx_controller_image_tag: "v1.0.0" ingress_ambassador_image_repo: "{{ quay_image_repo }}/datawire/ambassador-operator" ingress_ambassador_image_tag: "v1.2.9" alb_ingress_image_repo: "{{ docker_image_repo }}/amazon/aws-alb-ingress-controller" diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/clusterrole-ingress-nginx.yml.j2 b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/clusterrole-ingress-nginx.yml.j2 index c17f6553ed90c790a2ef1ea349a8fd7fdb6acbeb..b136d4c711276dff48587898c1ec32d57c8d8c73 100644 --- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/clusterrole-ingress-nginx.yml.j2 +++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/clusterrole-ingress-nginx.yml.j2 @@ -17,7 +17,7 @@ rules: resources: ["services"] verbs: ["get", "list", "watch"] - apiGroups: ["extensions","networking.k8s.io"] - resources: ["ingresses"] + resources: ["ingresses", "ingressclasses"] verbs: ["get", "list", "watch"] - apiGroups: [""] resources: ["events"] diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/role-ingress-nginx.yml.j2 b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/role-ingress-nginx.yml.j2 index 46c5caeeaa772f851da8fd12774797b1523f8f8e..3c408e3dc80bbc0ed717afe5eb7c89a666d5bd3a 100644 --- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/role-ingress-nginx.yml.j2 +++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/role-ingress-nginx.yml.j2 @@ -18,7 +18,7 @@ rules: resources: ["services"] verbs: ["get", "list", "watch"] - apiGroups: ["extensions", "networking.k8s.io"] - resources: ["ingresses"] + resources: ["ingresses", "ingressclasses"] verbs: ["get", "list", "watch"] - apiGroups: ["extensions", "networking.k8s.io"] resources: ["ingresses/status"] @@ -36,7 +36,7 @@ rules: verbs: ["get", "update"] - apiGroups: [""] resources: ["configmaps"] - verbs: ["create"] + verbs: ["create", "update"] - apiGroups: [""] resources: ["events"] verbs: ["create", "patch"]