1495 2 app repository cluster role

chart/kubeapps/templates/apprepository-rbac.yaml

@@ -94,3 +94,45 @@ rules:
     verbs:
       - create
 {{- end -}}
+{{- if .Values.featureFlags.reposPerNamespace -}}
+---
+# Kubeapps can read and watch its own AppRepository resources cluster-wide.
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: "kubeapps:controller:apprepository-reader-{{ .Release.Namespace }}"
+  labels:
+    app: {{ template "kubeapps.apprepository.fullname" . }}
+    chart: {{ template "kubeapps.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+rules:
+  - apiGroups:
+      - kubeapps.com
+    resources:
+      - apprepositories
+      - apprepositories/finalizers
+    verbs:
+      - get
+      - list
+      - update
+      - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: "kubeapps:controller:apprepository-reader-{{ .Release.Namespace }}"
+  labels:
+    app: {{ template "kubeapps.apprepository.fullname" . }}
+    chart: {{ template "kubeapps.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: "kubeapps:controller:apprepository-reader-{{ .Release.Namespace }}"
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "kubeapps.apprepository.fullname" . }}
+    namespace: {{ .Release.Namespace }}
+{{- end -}}

chart/kubeapps/values.yaml

@@ -633,3 +633,7 @@ authProxy:
     requests:
       cpu: 25m
       memory: 32Mi
+## Feature flags
+## These are used to switch on in development features or new features not yet released.
+featureFlags:
+  reposPerNamespace: false

script/deploy-dev.mk

@@ -50,11 +50,12 @@ deploy-dev: deploy-dex deploy-openldap update-apiserver-etc-hosts
 	@echo "to authenticate with the corresponding permissions."
 
 reset-dev:
-	helm delete kubeapps || true
-	helm delete dex || true
-	helm delete ldap || true
-	kubectl delete clusterrole dex || true
-	kubectl delete clusterrolebinding dex || true
+	helm -n kubeapps delete kubeapps || true
+	helm -n dex delete dex || true
+	helm -n ldap delete ldap || true
+	# In case helm installations fail, still delete non-namespaced resources.
+	kubectl delete clusterrole dex kubeapps:controller:apprepository-reader || true
+	kubectl delete clusterrolebinding dex kubeapps:controller:apprepository-reader || true
 	kubectl delete namespace --wait dex ldap kubeapps || true
 	kubectl delete --wait -f ./docs/user/manifests/kubeapps-local-dev-users-rbac.yaml || true