From a33fbe5896a5db457a97193b504c3d63cdba2fb0 Mon Sep 17 00:00:00 2001 From: Arlan Lloyd Date: Fri, 4 Oct 2024 18:25:19 +0000 Subject: [PATCH] improve quote usage --- chart/templates/autosync/deployment.yaml | 4 +-- chart/templates/back/deployment.yaml | 32 +++++++++++----------- chart/templates/front/deployment.yaml | 2 +- chart/templates/matcher/deployment.yaml | 8 +++--- chart/templates/scanner/deployment.yaml | 10 +++---- chart/templates/transcoder/deployment.yaml | 20 +++++++------- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/chart/templates/autosync/deployment.yaml b/chart/templates/autosync/deployment.yaml index 1a793d24..d627500b 100644 --- a/chart/templates/autosync/deployment.yaml +++ b/chart/templates/autosync/deployment.yaml @@ -48,9 +48,9 @@ spec: {{- end }} env: - name: RABBITMQ_HOST - value: {{ .Values.global.rabbitmq.host }} + value: {{ .Values.global.rabbitmq.host | quote }} - name: RABBITMQ_PORT - value: "{{ .Values.global.rabbitmq.port }}" + value: {{ .Values.global.rabbitmq.port | quote }} - name: RABBITMQ_DEFAULT_USER valueFrom: secretKeyRef: diff --git a/chart/templates/back/deployment.yaml b/chart/templates/back/deployment.yaml index b4d3659a..e4662543 100644 --- a/chart/templates/back/deployment.yaml +++ b/chart/templates/back/deployment.yaml @@ -76,15 +76,15 @@ spec: {{- end }} env: - name: TRANSCODER_URL - value: http://{{ include "kyoo.transcoder.fullname" . }}:7666 + value: "http://{{ include "kyoo.transcoder.fullname" . }}:7666" - name: PUBLIC_URL - value: {{ .Values.kyoo.address }} + value: {{ .Values.kyoo.address | quote }} - name: REQUIRE_ACCOUNT_VERIFICATION - value: "{{ .Values.kyoo.requireAccountVerification }}" + value: {{ .Values.kyoo.requireAccountVerification | quote }} - name: DEFAULT_PERMISSIONS - value: {{ .Values.kyoo.defaultPermissions }} + value: {{ .Values.kyoo.defaultPermissions | quote }} - name: UNLOGGED_PERMISSIONS - value: "{{ .Values.kyoo.unloggedPermissions }}" + value: {{ .Values.kyoo.unloggedPermissions | quote}} - name: KYOO_APIKEYS valueFrom: secretKeyRef: @@ -103,9 +103,9 @@ spec: - name: POSTGRES_DB value: {{ .Values.global.postgres.kyoo_back.database }} - name: POSTGRES_SERVER - value: {{ .Values.global.postgres.kyoo_back.host }} + value: {{ .Values.global.postgres.kyoo_back.host | quote }} - name: POSTGRES_PORT - value: "{{ .Values.global.postgres.kyoo_back.port }}" + value: {{ .Values.global.postgres.kyoo_back.port | quote }} - name: RABBITMQ_DEFAULT_USER valueFrom: secretKeyRef: @@ -117,9 +117,9 @@ spec: key: {{ .Values.global.rabbitmq.kyoo_back.passwordKey }} name: {{ .Values.global.rabbitmq.kyoo_back.existingSecret }} - name: RABBITMQ_HOST - value: {{ .Values.global.rabbitmq.host }} + value: {{ .Values.global.rabbitmq.host | quote }} - name: RABBITMQ_PORT - value: "{{ .Values.global.rabbitmq.port }}" + value: {{ .Values.global.rabbitmq.port | quote }} - name: MEILI_HOST value: "{{ .Values.global.meilisearch.proto }}://{{ .Values.global.meilisearch.host }}:{{ .Values.global.meilisearch.port }}" - name: MEILI_MASTER_KEY @@ -129,9 +129,9 @@ spec: name: {{ .Values.global.meilisearch.kyoo_back.existingSecret }} {{- if .Values.kyoo.oidc.enabled }} - name: OIDC_SERVICE_NAME - value: {{ .Values.kyoo.oidc.name }} + value: {{ .Values.kyoo.oidc.name | quote }} - name: OIDC_SERVICE_LOGO - value: {{ .Values.kyoo.oidc.logo }} + value: {{ .Values.kyoo.oidc.logo | quote }} - name: OIDC_SERVICE_CLIENTID valueFrom: secretKeyRef: @@ -143,15 +143,15 @@ spec: key: {{ .Values.kyoo.oidc.clientSecretKey }} name: {{ .Values.kyoo.oidc.existingSecret }} - name: OIDC_SERVICE_AUTHORIZATION - value: {{ .Values.kyoo.oidc.authorizationAddress }} + value: {{ .Values.kyoo.oidc.authorizationAddress | quote }} - name: OIDC_SERVICE_TOKEN - value: {{ .Values.kyoo.oidc.tokenAddress }} + value: {{ .Values.kyoo.oidc.tokenAddress | quote }} - name: OIDC_SERVICE_PROFILE - value: {{ .Values.kyoo.oidc.profileAddress }} + value: {{ .Values.kyoo.oidc.profileAddress | quote }} - name: OIDC_SERVICE_SCOPE - value: {{ .Values.kyoo.oidc.scope }} + value: {{ .Values.kyoo.oidc.scope | quote }} - name: OIDC_SERVICE_AUTHMETHOD - value: {{ .Values.kyoo.oidc.authMethod }} + value: {{ .Values.kyoo.oidc.authMethod | quote }} {{- end }} {{- with (concat .Values.global.extraEnv .Values.back.kyoo_back.extraEnv) }} {{- toYaml . | nindent 12 }} diff --git a/chart/templates/front/deployment.yaml b/chart/templates/front/deployment.yaml index 608810bd..69e2f140 100644 --- a/chart/templates/front/deployment.yaml +++ b/chart/templates/front/deployment.yaml @@ -48,7 +48,7 @@ spec: {{- end }} env: - name: KYOO_URL - value: http://{{ include "kyoo.back.fullname" . }}:5000 + value: "http://{{ include "kyoo.back.fullname" . }}:5000" {{- with (concat .Values.global.extraEnv .Values.front.kyoo_front.extraEnv) }} {{- toYaml . | nindent 12 }} {{- end }} diff --git a/chart/templates/matcher/deployment.yaml b/chart/templates/matcher/deployment.yaml index 086f660c..5d2409e7 100644 --- a/chart/templates/matcher/deployment.yaml +++ b/chart/templates/matcher/deployment.yaml @@ -53,9 +53,9 @@ spec: key: {{ .Values.kyoo.apikey.apikeyKey }} name: {{ .Values.kyoo.apikey.existingSecret }} - name: KYOO_URL - value: http://{{ include "kyoo.back.fullname" . }}:5000 + value: "http://{{ include "kyoo.back.fullname" . }}:5000" - name: LIBRARY_LANGUAGES - value: {{ .Values.kyoo.languages }} + value: {{ .Values.kyoo.languages | quote }} - name: THEMOVIEDB_APIKEY valueFrom: secretKeyRef: @@ -72,9 +72,9 @@ spec: key: {{ .Values.contentdatabase.tvdb.pinKey }} name: {{ .Values.contentdatabase.tvdb.existingSecret }} - name: RABBITMQ_HOST - value: {{ .Values.global.rabbitmq.host }} + value: {{ .Values.global.rabbitmq.host | quote }} - name: RABBITMQ_PORT - value: "{{ .Values.global.rabbitmq.port }}" + value: {{ .Values.global.rabbitmq.port | quote }} - name: RABBITMQ_DEFAULT_USER valueFrom: secretKeyRef: diff --git a/chart/templates/scanner/deployment.yaml b/chart/templates/scanner/deployment.yaml index 27862105..a3cd3cf9 100644 --- a/chart/templates/scanner/deployment.yaml +++ b/chart/templates/scanner/deployment.yaml @@ -50,20 +50,20 @@ spec: - name: SCANNER_LIBRARY_ROOT value: /data - name: LIBRARY_IGNORE_PATTERN - value: "{{ .Values.kyoo.libraryIgnorePattern }}" + value: {{ .Values.kyoo.libraryIgnorePattern | quote }} - name: KYOO_APIKEYS valueFrom: secretKeyRef: key: {{ .Values.kyoo.apikey.apikeyKey }} name: {{ .Values.kyoo.apikey.existingSecret }} - name: KYOO_URL - value: http://{{ include "kyoo.back.fullname" . }}:5000 + value: "http://{{ include "kyoo.back.fullname" . }}:5000" - name: LIBRARY_LANGUAGES - value: {{ .Values.kyoo.languages }} + value: {{ .Values.kyoo.languages | quote }} - name: RABBITMQ_HOST - value: {{ .Values.global.rabbitmq.host }} + value: {{ .Values.global.rabbitmq.host | quote }} - name: RABBITMQ_PORT - value: "{{ .Values.global.rabbitmq.port }}" + value: {{ .Values.global.rabbitmq.port | quote }} - name: RABBITMQ_DEFAULT_USER valueFrom: secretKeyRef: diff --git a/chart/templates/transcoder/deployment.yaml b/chart/templates/transcoder/deployment.yaml index 530e1151..fd5d8536 100644 --- a/chart/templates/transcoder/deployment.yaml +++ b/chart/templates/transcoder/deployment.yaml @@ -48,17 +48,17 @@ spec: {{- end }} env: - name: GOCODER_HWACCEL - value: {{ .Values.kyoo.transcoderAcceleration }} + value: {{ .Values.kyoo.transcoderAcceleration | quote }} - name: GOCODER_PRESET - value: {{ .Values.kyoo.transcoderPreset }} + value: {{ .Values.kyoo.transcoderPreset | quote }} - name: GOCODER_CACHE_ROOT - value: /cache + value: "/cache" - name: GOCODER_METADATA_ROOT - value: /metadata + value: "/metadata" - name: GOCODER_PREFIX - value: /video + value: "/video" - name: GOCODER_SAFE_PATH - value: /data + value: "/data" - name: POSTGRES_USER valueFrom: secretKeyRef: @@ -70,13 +70,13 @@ spec: key: {{ .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.passwordKey }} name: {{ .Values.global.postgres.kyoo_transcoder.kyoo_transcoder.existingSecret }} - name: POSTGRES_DB - value: {{ .Values.global.postgres.kyoo_transcoder.database }} + value: {{ .Values.global.postgres.kyoo_transcoder.database | quote }} - name: POSTGRES_SERVER - value: {{ .Values.global.postgres.kyoo_transcoder.host }} + value: {{ .Values.global.postgres.kyoo_transcoder.host | quote }} - name: POSTGRES_PORT - value: "{{ .Values.global.postgres.kyoo_transcoder.port }}" + value: {{ .Values.global.postgres.kyoo_transcoder.port | quote }} - name: POSTGRES_SCHEMA - value: "{{ .Values.global.postgres.kyoo_transcoder.schema }}" + value: {{ .Values.global.postgres.kyoo_transcoder.schema | quote }} {{- with (concat .Values.global.extraEnv .Values.transcoder.kyoo_transcoder.extraEnv) }} {{- toYaml . | nindent 12 }} {{- end }}