From e67c9a26791c886a646e81fc6afb0edd722c098c Mon Sep 17 00:00:00 2001
From: Francois JACQUES <fjacques@murex.com>
Date: Thu, 2 May 2019 12:46:36 +0200
Subject: [PATCH] [stable/nginx-ingress] Remove need for cluster role in scoped
 mode (#12510) as it is not needed per
 https://github.com/kubernetes/ingress-nginx/pull/3887.

Signed-off-by: Francois JACQUES <fjacques@murex.com>
---
 stable/nginx-ingress/Chart.yaml               |  2 +-
 .../templates/scoped-clusterrole.yaml         | 20 -------------------
 .../templates/scoped-clusterrolebinding.yaml  | 19 ------------------
 3 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 stable/nginx-ingress/templates/scoped-clusterrole.yaml
 delete mode 100644 stable/nginx-ingress/templates/scoped-clusterrolebinding.yaml

diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml
index fdbaa627c76a..46d78a43c980 100644
--- a/stable/nginx-ingress/Chart.yaml
+++ b/stable/nginx-ingress/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: nginx-ingress
-version: 1.6.7
+version: 1.6.8
 appVersion: 0.24.1
 home: https://github.com/kubernetes/ingress-nginx
 description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration.
diff --git a/stable/nginx-ingress/templates/scoped-clusterrole.yaml b/stable/nginx-ingress/templates/scoped-clusterrole.yaml
deleted file mode 100644
index e3766338834c..000000000000
--- a/stable/nginx-ingress/templates/scoped-clusterrole.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-{{- if and .Values.rbac.create .Values.controller.scope.enabled -}}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRole
-metadata:
-  labels:
-    app: {{ template "nginx-ingress.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "nginx-ingress.fullname" . }}-scoped
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - nodes
-    verbs:
-      - get
-      - list
-      - watch
-{{- end -}}
diff --git a/stable/nginx-ingress/templates/scoped-clusterrolebinding.yaml b/stable/nginx-ingress/templates/scoped-clusterrolebinding.yaml
deleted file mode 100644
index 00227b04acba..000000000000
--- a/stable/nginx-ingress/templates/scoped-clusterrolebinding.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-{{- if and .Values.rbac.create .Values.controller.scope.enabled -}}
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    app: {{ template "nginx-ingress.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-  name: {{ template "nginx-ingress.fullname" . }}-scoped
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ template "nginx-ingress.fullname" . }}-scoped
-subjects:
-  - kind: ServiceAccount
-    name: {{ template "nginx-ingress.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-{{- end -}}