feat: use a normal k8s secret by default

plexinc · Jun 28, 2024 · ee4b083 · ee4b083
1 parent 0baffe1
commit ee4b083
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 29 deletions.
diff --git a/charts/music-notifications/README.md b/charts/music-notifications/README.md
@@ -49,8 +49,11 @@ The following table lists the configurable parameters of the Music-notifications
 | `ingress.ingressClassName` |  | `"ingress-nginx"` |
 | `ingress.url` |  | `""` |
 | `ingress.annotations` |  | `{}` |
-| `secret.externalSecretKey` |  | `"pms/corp/rclone-config"` |
+| `secret.externalSecretKey` |  | `""` |
 | `secret.annotations` |  | `{}` |
+| `secret.secretStore.name` |  | `""` |
+| `secret.secretStore.kind` |  | `""` |
+| `secret.data` |  | `{}` |
 | `replicaCount` |  | `1` |
 | `resources.limits.cpu` |  | `"100m"` |
 | `resources.limits.memory` |  | `"256Mi"` |

diff --git a/charts/music-notifications/templates/external-secret.yaml b/charts/music-notifications/templates/external-secret.yaml
@@ -0,0 +1,33 @@
+{{- if .Values.secret.externalSecretKey  }}
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: {{ include "music-notifications.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "music-notifications.labels" . | nindent 4 }}
+spec:
+  refreshInterval: 1h
+  secretStoreRef:
+    name: cluster
+    kind: ClusterSecretStore
+  target:
+    name: {{ include "music-notifications.fullname" . }}
+    template:
+      engineVersion: v2
+      metadata:
+        labels:
+          {{- include "music-notifications.labels" . | nindent 10 }}
+        {{- with .Values.secret.annotations }}
+        annotations:
+            {{ toYaml . }}
+        {{- end }}
+    creationPolicy: Owner
+    deletionPolicy: Delete
+  dataFrom:
+  - extract:
+      conversionStrategy: Default
+      decodingStrategy: None
+      metadataPolicy: None
+      key: {{ .Values.secret.externalSecretKey | quote }}
+{{- end }}
diff --git a/charts/music-notifications/templates/secret.yaml b/charts/music-notifications/templates/secret.yaml
@@ -1,33 +1,14 @@
-{{- if .Values.secret.externalSecretKey  }}
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
+{{- if not .Values.secret.externalSecretKey  }}
+apiVersion: v1
+kind: Secret
 metadata:
   name: {{ include "music-notifications.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "music-notifications.labels" . | nindent 4 }}
-spec:
-  refreshInterval: 1h
-  secretStoreRef:
-    name: cluster
-    kind: ClusterSecretStore
-  target:
-    name: {{ include "music-notifications.fullname" . }}
-    template:
-      engineVersion: v2
-      metadata:
-        labels:
-          {{- include "music-notifications.labels" . | nindent 10 }}
-        {{- with .Values.secret.annotations }}
-        annotations:
-            {{ toYaml . }}
-        {{- end }}
-    creationPolicy: Owner
-    deletionPolicy: Delete
-  dataFrom:
-  - extract:
-      conversionStrategy: Default
-      decodingStrategy: None
-      metadataPolicy: None
-      key: {{ .Values.secret.externalSecretKey | quote }}
+type: Opaque
+{{- with .Values.secret.data }}
+data:
+  {{ toYaml . }}
+{{- end }}
 {{- end }}
diff --git a/charts/music-notifications/values.yaml b/charts/music-notifications/values.yaml
@@ -21,11 +21,24 @@ ingress:
   annotations: {}
 
 secret:
-  externalSecretKey: pms/corp/rclone-config
+  externalSecretKey: ''
 
   # Custom annotations on the secret
+  # this is only used for the external secrets
   annotations: {}
 
+  # this is only used for the external secrets
+  secretStore:
+    name: ''
+    kind: ''
+
+  # use this to set the values of the secrets directly
+  # these values will be mounted as environment variables and should be base64 encoded
+  data: {}
+  #  SLACK_APP_CLIENT_ID
+  #  SLACK_APP_CLIENT_SECRET
+  #  SLACK_APP_SIGNING_SECRET
+
 replicaCount: 1
 
 resources: