hacky regression test for #1416/#1526

script/dev-cluster.sh

@@ -47,6 +47,10 @@ bootstrap_peers = []
 $REPLICATION_MODE
 rpc_secret = "$NETWORK_SECRET"
 
+[consul_discovery]
+service_name = "panic-catcher"
+consul_http_addr = "http://localhost:9876"
+
 [s3_api]
 api_bind_addr = "0.0.0.0:$((3910+$count))"	# the S3 API port, HTTP without TLS. Add a reverse proxy for the TLS part.
 s3_region = "garage"				# set this to anything. S3 API calls will fail if they are not made against the region set here.

script/helm/garage/templates/clusterrole.yaml

@@ -1,4 +1,3 @@
-{{- if eq .Values.garage.noClusterRole false }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -29,4 +28,3 @@ roleRef:
   kind: ClusterRole
   name: manage-crds-{{ .Release.Namespace }}-{{ .Release.Name }}
   apiGroup: rbac.authorization.k8s.io
-{{ end }}

script/helm/garage/templates/role.yaml

@@ -1,27 +0,0 @@
-{{- if eq .Values.garage.noClusterRole true }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: manage-crds-{{ .Release.Namespace }}-{{ .Release.Name }}
-  labels:
-    {{- include "garage.labels" . | nindent 4 }}
-rules:
-- apiGroups: ["deuxfleurs.fr"]
-  resources: ["garagenodes"]
-  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: allow-crds-for-{{ .Release.Namespace }}-{{ .Release.Name }}
-  labels:
-    {{- include "garage.labels" . | nindent 4 }}
-subjects:
-- kind: ServiceAccount
-  name: {{ include "garage.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
-roleRef:
-  kind: Role
-  name: manage-crds-{{ .Release.Namespace }}-{{ .Release.Name }}
-  apiGroup: rbac.authorization.k8s.io
-{{ end }}

script/helm/garage/values.yaml

@@ -46,8 +46,6 @@ garage:
   # -- Set to true if you want to use k8s discovery but install the CRDs manually outside
   # of the helm chart, for example if you operate at namespace level without cluster resources
   kubernetesSkipCrd: false
-  # -- Set to true if you want to use roles instead of cluster roles
-  noClusterRole: false
   s3:
     api:
       bindAddr: "[::]:3900"