From 26b96870718eb1f7a3561892494da4263a158f51 Mon Sep 17 00:00:00 2001
From: CharlieC3 <2747302+CharlieC3@users.noreply.github.com>
Date: Mon, 31 Oct 2022 10:39:20 -0400
Subject: [PATCH] [bitcoin-core] change CRB to RB, adjust role

---
 hirosystems/bitcoin-core/Chart.yaml                        | 2 +-
 hirosystems/bitcoin-core/templates/role.yaml               | 7 -------
 .../{clusterrolebinding.yaml => rolebinding.yaml}          | 5 +++--
 3 files changed, 4 insertions(+), 10 deletions(-)
 rename hirosystems/bitcoin-core/templates/{clusterrolebinding.yaml => rolebinding.yaml} (89%)

diff --git a/hirosystems/bitcoin-core/Chart.yaml b/hirosystems/bitcoin-core/Chart.yaml
index b10b316..0d9eb3e 100644
--- a/hirosystems/bitcoin-core/Chart.yaml
+++ b/hirosystems/bitcoin-core/Chart.yaml
@@ -25,4 +25,4 @@ sources:
   - https://github.com/bitcoin/bitcoin
   - https://github.com/ruimarinho/docker-bitcoin-core
   - https://bitcoin.org
-version: 1.1.5
+version: 1.1.6
diff --git a/hirosystems/bitcoin-core/templates/role.yaml b/hirosystems/bitcoin-core/templates/role.yaml
index 03623c8..85429cd 100644
--- a/hirosystems/bitcoin-core/templates/role.yaml
+++ b/hirosystems/bitcoin-core/templates/role.yaml
@@ -13,13 +13,6 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 rules:
-  # TODO: Update resources and verbs to the proper values for the application cases
-  - apiGroups: [""]
-    resources: ["*"]
-    verbs: ["*"]
-  - apiGroups: [""]
-    resources: ["*"]
-    verbs: ["*"]
   {{- if .Values.rbac.rules }}
   {{- include "common.tplvalues.render" ( dict "value" .Values.rbac.rules "context" $ ) | nindent 2 }}
   {{- end }}
diff --git a/hirosystems/bitcoin-core/templates/clusterrolebinding.yaml b/hirosystems/bitcoin-core/templates/rolebinding.yaml
similarity index 89%
rename from hirosystems/bitcoin-core/templates/clusterrolebinding.yaml
rename to hirosystems/bitcoin-core/templates/rolebinding.yaml
index 78537a9..7bf4d94 100644
--- a/hirosystems/bitcoin-core/templates/clusterrolebinding.yaml
+++ b/hirosystems/bitcoin-core/templates/rolebinding.yaml
@@ -1,7 +1,8 @@
-kind: ClusterRoleBinding
+kind: RoleBinding
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 metadata:
   name: {{ template "common.names.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     app.kubernetes.io/component: bitcoin-core
     {{- if .Values.commonLabels }}
@@ -12,7 +13,7 @@ metadata:
   {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
+  kind: Role
   name: {{ template "common.names.fullname" . }}
 subjects:
   - kind: ServiceAccount