From 869b0206b8e6e6779620f54e5cc2dc61d1cfbb69 Mon Sep 17 00:00:00 2001 From: Arlan Lloyd Date: Thu, 30 Oct 2025 23:03:10 +0000 Subject: [PATCH] purge matcher specific settings --- chart/templates/_helpers.tpl | 18 --- chart/templates/matcher/deployment.yaml | 128 -------------------- chart/templates/matcher/serviceaccount.yaml | 13 -- chart/values.yaml | 40 ------ 4 files changed, 199 deletions(-) delete mode 100644 chart/templates/matcher/deployment.yaml delete mode 100644 chart/templates/matcher/serviceaccount.yaml diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index a7b5df38..f472bb6b 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -85,24 +85,6 @@ Create the name of the front service account to use {{- end -}} {{- end -}} -{{/* -Create kyoo matcher name -*/}} -{{- define "kyoo.matcher.fullname" -}} -{{- printf "%s-%s" (include "kyoo.fullname" .) .Values.matcher.name | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create the name of the matcher service account to use -*/}} -{{- define "kyoo.matcher.serviceAccountName" -}} -{{- if .Values.matcher.serviceAccount.create -}} - {{ default (include "kyoo.matcher.fullname" .) .Values.matcher.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.matcher.serviceAccount.name }} -{{- end -}} -{{- end -}} - {{/* Create kyoo scanner name */}} diff --git a/chart/templates/matcher/deployment.yaml b/chart/templates/matcher/deployment.yaml deleted file mode 100644 index 8799a806..00000000 --- a/chart/templates/matcher/deployment.yaml +++ /dev/null @@ -1,128 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - {{- with (mergeOverwrite (deepCopy .Values.global.deploymentAnnotations) .Values.matcher.deploymentAnnotations) }} - annotations: - {{- range $key, $value := . }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- end }} - name: {{ include "kyoo.matcher.fullname" . }} - labels: - {{- include "kyoo.labels" (dict "context" . "component" .Values.matcher.name "name" .Values.matcher.name) | nindent 4 }} -spec: - replicas: {{ .Values.matcher.replicaCount }} - {{- with .Values.matcher.updateStrategy }} - strategy: - {{- toYaml . | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- include "kyoo.selectorLabels" (dict "context" . "name" .Values.matcher.name) | nindent 6 }} - template: - metadata: - {{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.matcher.podAnnotations) }} - annotations: - {{- range $key, $value := . }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- end }} - labels: - {{- include "kyoo.labels" (dict "context" . "component" .Values.matcher.name "name" .Values.matcher.name) | nindent 8 }} - {{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.matcher.podLabels) }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - {{- with .Values.matcher.imagePullSecrets | default .Values.global.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.global.securityContext }} - securityContext: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "kyoo.matcher.serviceAccountName" . }} - containers: - - name: main - image: {{ .Values.matcher.kyoo_matcher.image.repository | default (printf "%s/kyoo_matcher" .Values.global.image.repositoryBase) }}:{{ default (include "kyoo.defaultTag" .) .Values.matcher.kyoo_matcher.image.tag }} - imagePullPolicy: {{ default .Values.global.image.imagePullPolicy }} - args: - {{- with .Values.matcher.kyoo_matcher.extraArgs }} - {{- toYaml . | nindent 12 }} - {{- end }} - env: - - 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/api" - - name: LIBRARY_LANGUAGES - value: {{ .Values.kyoo.languages | quote }} - - name: THEMOVIEDB_APIKEY - valueFrom: - secretKeyRef: - key: {{ .Values.contentdatabase.tmdb.apikeyKey }} - name: {{ .Values.contentdatabase.tmdb.existingSecret }} - optional: true - - name: TVDB_APIKEY - valueFrom: - secretKeyRef: - key: {{ .Values.contentdatabase.tvdb.apikeyKey }} - name: {{ .Values.contentdatabase.tvdb.existingSecret }} - optional: true - - name: TVDB_PIN - valueFrom: - secretKeyRef: - key: {{ .Values.contentdatabase.tvdb.pinKey }} - name: {{ .Values.contentdatabase.tvdb.existingSecret }} - optional: true - - name: RABBITMQ_HOST - value: {{ .Values.global.rabbitmq.host | quote }} - - name: RABBITMQ_PORT - value: {{ .Values.global.rabbitmq.port | quote }} - - name: RABBITMQ_DEFAULT_USER - valueFrom: - secretKeyRef: - key: {{ .Values.global.rabbitmq.kyoo_matcher.userKey }} - name: {{ .Values.global.rabbitmq.kyoo_matcher.existingSecret }} - - name: RABBITMQ_DEFAULT_PASS - valueFrom: - secretKeyRef: - key: {{ .Values.global.rabbitmq.kyoo_matcher.passwordKey }} - name: {{ .Values.global.rabbitmq.kyoo_matcher.existingSecret }} - {{- with (concat .Values.global.extraEnv .Values.matcher.kyoo_matcher.extraEnv) }} - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.matcher.kyoo_matcher.livenessProbe }} - livenessProbe: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.matcher.kyoo_matcher.readinessProbe }} - readinessProbe: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.matcher.kyoo_matcher.resources }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.matcher.kyoo_matcher.containerSecurityContext }} - securityContext: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.matcher.kyoo_matcher.extraVolumeMounts }} - volumeMounts: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.matcher.extraContainers }} - {{- tpl (toYaml .) $ | nindent 8 }} - {{- end }} - {{- with .Values.matcher.extraInitContainers }} - initContainers: - {{- tpl (toYaml .) $ | nindent 6 }} - {{- end }} - {{- with .Values.matcher.extraVolumes }} - volumes: - {{- toYaml . | nindent 8 }} - {{- end }} \ No newline at end of file diff --git a/chart/templates/matcher/serviceaccount.yaml b/chart/templates/matcher/serviceaccount.yaml deleted file mode 100644 index e3053836..00000000 --- a/chart/templates/matcher/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.matcher.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -automountServiceAccountToken: {{ .Values.matcher.serviceAccount.automount }} -metadata: - name: {{ include "kyoo.matcher.serviceAccountName" . }} - labels: - {{- include "kyoo.labels" (dict "context" . "component" .Values.matcher.name "name" .Values.matcher.name) | nindent 4 }} - {{- with .Values.matcher.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/chart/values.yaml b/chart/values.yaml index f105a168..804f165c 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -107,11 +107,6 @@ global: userKey: rabbitmq_user passwordKey: rabbitmq_password existingSecret: bigsecret - # kyoo_matcher workload specific settings - kyoo_matcher: - userKey: rabbitmq_user - passwordKey: rabbitmq_password - existingSecret: bigsecret # kyoo_scanner workload specific settings kyoo_scanner: userKey: rabbitmq_user @@ -354,41 +349,6 @@ front: extraInitContainers: [] extraVolumes: [] -# matcher deployment configuration -matcher: - name: matcher - # kyoo_matcher container configuration - kyoo_matcher: - livenessProbe: {} - readinessProbe: {} - resources: {} - containerSecurityContext: {} - extraVolumeMounts: [] - # kyoo_matcher uses the same image as kyoo_scanner - # requires an additional argument to function as matcher - extraArgs: - - matcher - extraEnv: [] - image: - # kyoo_matcher uses the same image as kyoo_scanner - repository: ghcr.io/zoriya/kyoo_scanner - tag: ~ - # matcher does not support multiple replicas - replicaCount: 1 - updateStrategy: ~ - podLabels: {} - deploymentAnnotations: {} - podAnnotations: {} - imagePullSecrets: [] - serviceAccount: - create: true - automount: true - annotations: {} - name: ~ - extraContainers: [] - extraInitContainers: [] - extraVolumes: [] - # scanner deployment configuration scanner: name: scanner