From 7136b66932803c6b4e43b92f2f19caa629472065 Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Sat, 21 Dec 2024 20:53:00 +0100 Subject: [PATCH] SMAR-3017 fix typos --- templates/palms/palm-detector-deployment.yaml | 138 +++++++++--------- .../palms/palm-extractor-deployment.yaml | 138 +++++++++--------- values.yaml | 4 +- 3 files changed, 140 insertions(+), 140 deletions(-) diff --git a/templates/palms/palm-detector-deployment.yaml b/templates/palms/palm-detector-deployment.yaml index 95a23b5..e887739 100644 --- a/templates/palms/palm-detector-deployment.yaml +++ b/templates/palms/palm-detector-deployment.yaml @@ -4,76 +4,76 @@ apiVersion: "apps/v1" kind: "Deployment" metadata: - name: {{ $name | quote }} - labels: - {{ include "smartface.palmDetector.labels" | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} + name: {{ $name | quote }} + labels: + {{ include "smartface.palmDetector.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.palmDetector.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.palmDetector.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.palmDetector.annotations }} - {{- toYaml . | nindent 4 }} + {{- with .Values.palmDetector.podAnnotations }} + {{- toYaml . | nindent 8 }} {{- end }} -spec: - replicas: {{ .Values.palmDetector.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} - {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} - {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.palmDetector.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.palmDetector.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.palmDetector.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.palmDetector.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- with .Values.palmDetector.extraVars }} - {{- toYaml . | nindent 8 }} - {{- end }} - resources: - {{- toYaml .Values.palmDetector.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.palmDetector.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.palmDetector.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.palmDetector.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.palmDetector.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.palmDetector.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- with .Values.palmDetector.extraVars }} + {{- toYaml . | nindent 8 }} + {{- end }} + resources: + {{- toYaml .Values.palmDetector.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.palmDetector.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.palmDetector.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} {{- end }} diff --git a/templates/palms/palm-extractor-deployment.yaml b/templates/palms/palm-extractor-deployment.yaml index 85b7dbe..7e6eafd 100644 --- a/templates/palms/palm-extractor-deployment.yaml +++ b/templates/palms/palm-extractor-deployment.yaml @@ -4,75 +4,75 @@ apiVersion: "apps/v1" kind: "Deployment" metadata: - name: {{ $name | quote }} - labels: - {{ include "smartface.palmExtractor.labels" | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- with .Values.palmExtractor.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - replicas: {{ .Values.palmExtractor.replicas }} - {{- if .Values.revisionHistoryLimit }} - revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + name: {{ $name | quote }} + labels: + {{ include "smartface.palmExtractor.labels" . | nindent 4 }} + annotations: + {{- with .Values.annotations }} + {{- toYaml . | nindent 4 }} {{- end }} - {{- if .Values.updateStrategy }} - strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- with .Values.palmExtractor.annotations }} + {{- toYaml . | nindent 4 }} {{- end }} - selector: - matchLabels: - {{- $selectorLabels | nindent 6 }} - template: - metadata: - annotations: - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.palmExtractor.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- $selectorLabels | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.palmExtractor.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ .Values.serviceAccount.name | quote }} - automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} - topologySpreadConstraints: - {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: {{ $name | quote }} - image: {{ include "smartface.image" (dict "local" .Values.palmExtractor.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} - imagePullPolicy: {{ .Values.palmExtractor.image.pullPolicy }} - env: - {{- include "smartface.commonEnv" . | nindent 8 }} - {{- include "smartface.rmqConfig" . | nindent 8 }} - {{- with .Values.palmExtractor.extraVars }} - {{- toYaml . | nindent 8 }} - {{- end }} - resources: - {{- toYaml .Values.palmExtractor.resources | nindent 10 }} - volumeMounts: - {{- include "smartface.licVolumeMount" . | nindent 8 }} - volumes: - {{- include "smartface.licVolume" . | nindent 8 }} - {{- with .Values.palmExtractor.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.palmExtractor.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} +spec: + replicas: {{ .Values.palmExtractor.replicas }} + {{- if .Values.revisionHistoryLimit }} + revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} + {{- end }} + {{- if .Values.updateStrategy }} + strategy: {{- toYaml .Values.updateStrategy | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- $selectorLabels | nindent 6 }} + template: + metadata: + annotations: + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.palmExtractor.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- $selectorLabels | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.palmExtractor.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ .Values.serviceAccount.name | quote }} + automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} + topologySpreadConstraints: + {{- include "smartface.topologySpread" (dict "selectorLabels" $selectorLabels ) | nindent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ $name | quote }} + image: {{ include "smartface.image" (dict "local" .Values.palmExtractor.image "global" .Values.global.image "defaultVersion" .Chart.AppVersion) }} + imagePullPolicy: {{ .Values.palmExtractor.image.pullPolicy }} + env: + {{- include "smartface.commonEnv" . | nindent 8 }} + {{- include "smartface.rmqConfig" . | nindent 8 }} + {{- with .Values.palmExtractor.extraVars }} + {{- toYaml . | nindent 8 }} + {{- end }} + resources: + {{- toYaml .Values.palmExtractor.resources | nindent 10 }} + volumeMounts: + {{- include "smartface.licVolumeMount" . | nindent 8 }} + volumes: + {{- include "smartface.licVolume" . | nindent 8 }} + {{- with .Values.palmExtractor.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.palmExtractor.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} {{- end }} diff --git a/values.yaml b/values.yaml index debe776..8929d30 100644 --- a/values.yaml +++ b/values.yaml @@ -476,7 +476,7 @@ objectDetector: # value: "value2" palmDetector: - name: "palmDetector" + name: "palm-detector" # -- Annotations for detector deployment annotations: {} # -- Annotations for detector pods @@ -564,7 +564,7 @@ extractor: # value: "value2" palmExtractor: - name: "palmExtractor" + name: "palm-extractor" # -- Annotations for extractor deployment annotations: {} # -- Annotations for extractor pods