fix service account

charts/barman-cloud/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: barman-cloud
-version: 0.1.0
+version: 0.2.2
 description: Barman Cloud Plugin
 keywords:
   - barman-cloud

charts/barman-cloud/README.md

@@ -1,6 +1,6 @@
 # barman-cloud
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: v.0.4.0](https://img.shields.io/badge/AppVersion-v.0.4.0-informational?style=flat-square)
+![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![AppVersion: v.0.4.0](https://img.shields.io/badge/AppVersion-v.0.4.0-informational?style=flat-square)
 
 Barman Cloud Plugin
 
@@ -25,11 +25,9 @@ Barman Cloud Plugin
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| existingSecretKey | string | `"cf-tunnel-token"` | Name of key that contains the token in the existingSecret |
-| existingSecretName | string | `"cloudflared-secret"` | Name of existing secret that contains Cloudflare token |
 | image | object | `{"pullPolicy":"IfNotPresent","repository":"ghcr.io/cloudnative-pg/plugin-barman-cloud","tag":"v0.4.0"}` | Default image |
 | name | string | `"barman-cloud"` | Name override of release |
-| resources | object | `{"requests":{"cpu":"10m","memory":"128Mi"}}` | Default resources |
+| service | object | `{"listenPort":9090}` | Default service |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

charts/barman-cloud/templates/cluster-role-binding.yaml

@@ -12,7 +12,7 @@ roleRef:
   name: metrics-auth-role
 subjects:
 - kind: ServiceAccount
-  name: plugin-barman-cloud
+  name: {{ .Release.Name }}-plugin-barman-cloud
   namespace: {{ .Release.Namespace }}
 
 ---
@@ -30,5 +30,5 @@ roleRef:
   name: plugin-barman-cloud
 subjects:
 - kind: ServiceAccount
-  name: plugin-barman-cloud
+  name: {{ .Release.Name }}-plugin-barman-cloud
   namespace: {{ .Release.Namespace }}

charts/barman-cloud/templates/common.yaml

@@ -12,7 +12,8 @@ controllers:
       app: {{ .Values.name }}
     replicas: 1
     strategy: Recreate
-    serviceAccountName: plugin-barman-cloud
+    serviceAccount:
+      name: {{ .Release.Name }}-plugin-barman-cloud
     pod:
       securityContext:
         runAsNonRoot: true
@@ -41,7 +42,6 @@ controllers:
               secretKeyRef:
                 key: SIDECAR_IMAGE
                 name: plugin-barman-cloud-m76km67hd7
-
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
@@ -54,7 +54,7 @@ controllers:
             type: RuntimeDefault
 serviceAccount:
   plugin-barman-cloud:
-    enabled: {{ .Values.serviceAccount.enabled }}
+    enabled: true
 service:
   main:
     controller: main

charts/barman-cloud/templates/role-binding.yaml

@@ -13,5 +13,5 @@ roleRef:
   name: leader-election-role
 subjects:
 - kind: ServiceAccount
-  name: plugin-barman-cloud
+  name: {{ .Release.Name }}-plugin-barman-cloud
   namespace: {{ .Release.Namespace }}

charts/barman-cloud/values.yaml

@@ -1,20 +1,12 @@
 # -- Name override of release
 name: barman-cloud
 
-# -- Name of existing secret that contains Cloudflare token
-existingSecretName: cloudflared-secret
-
-# -- Name of key that contains the token in the existingSecret
-existingSecretKey: cf-tunnel-token
-
 # -- Default image
 image:
   repository: ghcr.io/cloudnative-pg/plugin-barman-cloud
   tag: "v0.4.0"
   pullPolicy: IfNotPresent
 
-# -- Default resources
-resources:
-  requests:
-    cpu: 10m
-    memory: 128Mi
+# -- Default service
+service:
+  listenPort: 9090