update api env vars

chart/templates/_helpers.tpl

@@ -26,7 +26,7 @@ Create the name of the api service account to use
 {{/*
 Create kyoo api-metadata name
 */}}
-{{- define "kyoo.apimetadata.fullname" -}}
+{{- define "kyoo.apiimagedata.fullname" -}}
 {{- printf "%s-%s%s" (include "kyoo.fullname" .) .Values.api.name "metadata" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 

chart/templates/api/deployment.yaml

@@ -55,38 +55,27 @@ spec:
               {{- toYaml . | nindent 12 }}
             {{- end }}
           env:
-            - name: TRANSCODER_URL
-              value: "http://{{ include "kyoo.transcoder.fullname" . }}:7666/video"
-            - name: KYOO_PREFIX
-              value: "/api"
-            - name: PUBLIC_URL
+            - name: JWT_ISSUER
               value: {{ .Values.kyoo.address | quote }}
-            - name: REQUIRE_ACCOUNT_VERIFICATION
-              value: {{ .Values.kyoo.requireAccountVerification | quote }}
-            - name: DEFAULT_PERMISSIONS
-              value: {{ .Values.kyoo.defaultPermissions | quote }}
-            - name: UNLOGGED_PERMISSIONS
-              value: {{ .Values.kyoo.unloggedPermissions | quote}}
-            - name: KYOO_APIKEYS
-              valueFrom:
-                secretKeyRef:
-                  key: {{ .Values.kyoo.apikey.apikeyKey }}
-                  name: {{ .Values.kyoo.apikey.existingSecret }}
-            - name: POSTGRES_USER
+            - name: AUTH_SERVER
+              value: "http://{{ include "kyoo.auth.fullname" . }}:4568"
+            - name: IMAGES_PATH
+              value: "/images"
+            - name: PGUSER
               valueFrom:
                 secretKeyRef:
                   key: {{ .Values.global.postgres.kyoo_api.kyoo_api.userKey }}
                   name: {{ .Values.global.postgres.kyoo_api.kyoo_api.existingSecret }}
-            - name: POSTGRES_PASSWORD
+            - name: PGPASSWORD
               valueFrom:
                 secretKeyRef:
                   key: {{ .Values.global.postgres.kyoo_api.kyoo_api.passwordKey }}
                   name: {{ .Values.global.postgres.kyoo_api.kyoo_api.existingSecret }}
-            - name: POSTGRES_DB
+            - name: PGDATABASE
               value: {{ .Values.global.postgres.kyoo_api.database }}
-            - name: POSTGRES_SERVER
+            - name: PGHOST
               value: {{ .Values.global.postgres.kyoo_api.host | quote }}
-            - name: POSTGRES_PORT
+            - name: PGPORT
               value: {{ .Values.global.postgres.kyoo_api.port | quote }}
             {{- range $index, $provider := .Values.kyoo.oidc_providers }}
             - name: OIDC_{{ $provider.name | upper }}_NAME
@@ -139,8 +128,8 @@ spec:
           {{- end }}
           volumeMounts:
             {{- if .Values.api.persistence.enabled }}
-            - name: apimetadata
-              mountPath: /metadata
+            - name: apiimagedata
+              mountPath: /images
             {{- end }}
             {{- with .Values.api.kyoo_api.volumeMounts }}
               {{- toYaml . | nindent 12 }}
@@ -154,13 +143,13 @@ spec:
       volumes:
         {{- if .Values.api.persistence.enabled }}
         {{- if .Values.api.persistence.existingClaim }}
-        - name: apimetadata
+        - name: apiimagedata
           persistentVolumeClaim:
             claimName: {{ .Values.api.persistence.existingClaim }}
         {{- else }}
-        - name: apimetadata
+        - name: apiimagedata
           persistentVolumeClaim:
-            claimName: {{ include "kyoo.apimetadata.fullname" . }}
+            claimName: {{ include "kyoo.apiimagedata.fullname" . }}
         {{- end }}
         {{- end }}
         {{- with .Values.api.volumes }}

chart/templates/api/pvc.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "kyoo.apimetadata.fullname" . }}
+  name: {{ include "kyoo.apiimagedata.fullname" . }}
   labels:
     {{- include "kyoo.labels" (dict "context" . "component" .Values.api.name "name" .Values.api.name) | nindent 4 }}
   {{- with (mergeOverwrite (deepCopy .Values.global.persistentVolumeClaimAnnotations) .Values.api.persistence.annotations) }}

chart/values.yaml

@@ -75,12 +75,6 @@ kyoo:
   guestClaims: '{"permissions": ["users.read", "users.write", "apikeys.read", "apikeys.write", "users.delete", "core.read", "core.write", "scanner.trigger"], "verified": true}'
   protectedClaims: "permissions,verified"
 
-  # If this is true, new accounts wont have any permissions before you approve them in your admin dashboard.
-  requireAccountVerification: true
-  # Specify permissions of new accounts.
-  defaultPermissions: "overall.read,overall.play"
-  # Specify permissions of guest accounts, default is no permissions.
-  unloggedPermissions: ""
   # A pattern (regex) to ignore video files.
   libraryIgnorePattern: ".*/[dD]ownloads?/.*"
   languages: "en"
@@ -180,7 +174,7 @@ api:
   extraContainers: []
   extraInitContainers: []
   extraVolumes: []
-  # apimetadata
+  # api image data
   # user profile pictures
   persistence:
     enabled: true