moved the configurations into testkube-cloud api and ui

kubeshop · Aug 18, 2023 · 2b609fc · 2b609fc
1 parent 6f92575
commit 2b609fc
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 141 deletions.
diff --git a/charts/testkube-cloud-api/templates/deployment.yaml b/charts/testkube-cloud-api/templates/deployment.yaml
@@ -277,6 +277,15 @@ spec:
             - name: {{ $k }}
               value: "{{ $v }}"
             {{- end}}
+            {{- if .Values.externalSecrets.enabled -}}
+            {{- range $key, $value := .Values.externalSecrets.keys }}
+            - name: {{ $value }}
+              valueFrom:
+                secretKeyRef:
+                  key: {{ $value }}
+                  name: api-external-secrets
+            {{ end }}
+            {{- end}}
           ports:
             - name: {{ if .Values.api.tls.serveHTTPS }}https{{ else }}http{{ end }}
               containerPort: {{ if .Values.api.tls.serveHTTPS }}{{ .Values.api.tls.apiPort }}{{ else }}8090{{ end }}

diff --git a/charts/testkube-cloud-api/templates/external-secret.yaml b/charts/testkube-cloud-api/templates/external-secret.yaml
@@ -0,0 +1,21 @@
+{{- if .Values.externalSecrets.enabled -}}
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: api-external-secrets
+spec:
+  data:
+{{- range $key, $value := .Values.externalSecrets.keys }}
+  - remoteRef:
+      key: {{ $value }}
+    secretKey: {{ $key }}
+{{ end }}
+  refreshInterval: 60s
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: secret-store
+  target:
+    creationPolicy: Owner
+    deletionPolicy: Retain
+    name: api-external-secrets
+{{- end }}
diff --git a/charts/testkube-cloud-api/values.yaml b/charts/testkube-cloud-api/values.yaml
@@ -187,6 +187,10 @@ api:
     # -- Comma-separated list of allowed external redirect URIs (example: `https://cloud.testkube.xyz,http://localhost:3000`)
     allowedExternalRedirectURIs: ""
 
+externalSecrets:
+  enabled: false
+  keys:
+    OPENAPI_KEY: open-api-key
 serviceAccount:
   # -- Toggle whether to create a ServiceAccount resource
   create: false

diff --git a/charts/testkube-cloud-secrets/.helmignore b/charts/testkube-cloud-secrets/.helmignore
diff --git a/charts/testkube-cloud-secrets/Chart.yaml b/charts/testkube-cloud-secrets/Chart.yaml
diff --git a/charts/testkube-cloud-secrets/README.md b/charts/testkube-cloud-secrets/README.md
diff --git a/charts/testkube-cloud-secrets/templates/external-secret.yaml b/charts/testkube-cloud-secrets/templates/external-secret.yaml
diff --git a/charts/testkube-cloud-secrets/values.yaml b/charts/testkube-cloud-secrets/values.yaml
diff --git a/charts/testkube-cloud-ui/templates/deployment.yaml b/charts/testkube-cloud-ui/templates/deployment.yaml
@@ -60,6 +60,15 @@ spec:
             - name: REACT_APP_DISABLE_TELEMETRY
               value: "true"
             {{- end }}
+            {{- if .Values.externalSecrets.enabled -}}
+            {{- range $key, $value := .Values.externalSecrets.keys }}
+            - name: {{ $value }}
+              valueFrom:
+                secretKeyRef:
+                  key: {{ $value }}
+                  name: ui-external-secrets
+            {{ end }}
+            {{- end}}
           livenessProbe:
             httpGet:
               path: /

diff --git a/charts/testkube-cloud-ui/templates/external-secret.yaml b/charts/testkube-cloud-ui/templates/external-secret.yaml
@@ -0,0 +1,21 @@
+{{- if .Values.externalSecrets.enabled -}}
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: ui-external-secrets
+spec:
+  data:
+{{- range $key, $value := .Values.externalSecrets.keys }}
+  - remoteRef:
+      key: {{ $value }}
+    secretKey: {{ $key }}
+{{ end }}
+  refreshInterval: 60s
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: secret-store
+  target:
+    creationPolicy: Owner
+    deletionPolicy: Retain
+    name: ui-external-secrets
+{{- end }}
diff --git a/charts/testkube-cloud-ui/values.yaml b/charts/testkube-cloud-ui/values.yaml
@@ -53,6 +53,11 @@ ui:
   # -- Force disabling telemetry on the UI
   disableTelemetry: false
 
+externalSecrets:
+  enabled: false
+  keys:
+    OPENAPI_KEY: open-api-key
+
 serviceAccount:
   # -- Toggle whether to create ServiceAccount resource
   create: false