From fd96d32405b69e8cfce43890c2ba4dcb35d72321 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Tue, 9 Jul 2019 08:02:52 -0400
Subject: [PATCH] Fix RBAC issues with networking.k8s.io (#4298)

---
 deploy/static/mandatory.yaml | 30 ++++++++++++++++++++++--------
 deploy/static/rbac.yaml      | 30 ++++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/deploy/static/mandatory.yaml b/deploy/static/mandatory.yaml
index d93223157..1ff6add24 100644
--- a/deploy/static/mandatory.yaml
+++ b/deploy/static/mandatory.yaml
@@ -81,14 +81,6 @@ rules:
       - get
       - list
       - watch
-  - apiGroups:
-      - "extensions"
-    resources:
-      - ingresses
-    verbs:
-      - get
-      - list
-      - watch
   - apiGroups:
       - ""
     resources:
@@ -98,6 +90,28 @@ rules:
       - patch
   - apiGroups:
       - "extensions"
+    resources:
+      - ingresses
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - "extensions"
+    resources:
+      - ingresses/status
+    verbs:
+      - update
+  - apiGroups:
+      - "networking.k8s.io"
+    resources:
+      - ingresses
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - "networking.k8s.io"
     resources:
       - ingresses/status
     verbs:
diff --git a/deploy/static/rbac.yaml b/deploy/static/rbac.yaml
index 103bd98cc..c61af384f 100644
--- a/deploy/static/rbac.yaml
+++ b/deploy/static/rbac.yaml
@@ -41,14 +41,6 @@ rules:
       - get
       - list
       - watch
-  - apiGroups:
-      - "extensions"
-    resources:
-      - ingresses
-    verbs:
-      - get
-      - list
-      - watch
   - apiGroups:
       - ""
     resources:
@@ -58,6 +50,28 @@ rules:
       - patch
   - apiGroups:
       - "extensions"
+    resources:
+      - ingresses
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - "extensions"
+    resources:
+      - ingresses/status
+    verbs:
+      - update
+  - apiGroups:
+      - "networking.k8s.io"
+    resources:
+      - ingresses
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - "networking.k8s.io"
     resources:
       - ingresses/status
     verbs: