From d5bb6d9150843bd5ddcbe38a1af59e5f52eae346 Mon Sep 17 00:00:00 2001 From: NikolaiKuziaevQubership Date: Tue, 28 Jan 2025 19:12:32 +0400 Subject: [PATCH 1/2] helm refactoring --- charts/env-checker/templates/Deployment.yaml | 4 ++++ charts/env-checker/templates/_templates.yaml | 8 ++++---- charts/env-checker/values.yaml | 14 +++++++++----- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/charts/env-checker/templates/Deployment.yaml b/charts/env-checker/templates/Deployment.yaml index 89447cb..8e6de26 100644 --- a/charts/env-checker/templates/Deployment.yaml +++ b/charts/env-checker/templates/Deployment.yaml @@ -54,6 +54,10 @@ spec: app.kubernetes.io/technology: python spec: serviceAccountName: {{ .Values.serviceAccount.name }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} containers: - name: '{{ .Values.SERVICE_NAME }}' image: '{{ .Values.IMAGE_REPOSITORY }}:{{ .Values.TAG }}' diff --git a/charts/env-checker/templates/_templates.yaml b/charts/env-checker/templates/_templates.yaml index c437648..78b7cad 100644 --- a/charts/env-checker/templates/_templates.yaml +++ b/charts/env-checker/templates/_templates.yaml @@ -19,11 +19,11 @@ {{- define "envchecker.pod.resources" }} requests: - cpu: '{{ .Values.CPU_REQUEST }}' - memory: '{{ .Values.MEMORY_REQUEST }}' + cpu: '{{ .Values.CPU_REQUEST | default "100m" }}' + memory: '{{ .Values.MEMORY_REQUEST | default "1Gi" }}' limits: - memory: '{{ .Values.MEMORY_LIMIT }}' - cpu: '{{ .Values.CPU_LIMIT }}' + memory: '{{ .Values.MEMORY_LIMIT | default "2Gi" }}' + cpu: '{{ .Values.CPU_LIMIT | default "1000m" }}' {{- end }} {{- define "envchecker.pod.volumes" }} diff --git a/charts/env-checker/values.yaml b/charts/env-checker/values.yaml index c39c297..b52add6 100644 --- a/charts/env-checker/values.yaml +++ b/charts/env-checker/values.yaml @@ -2,19 +2,23 @@ serviceAccount: name: env-checker-sa +# kubernetes secret name. Only pods which provide own keys can access the private registry. +imagePullSecrets: + - name: regcred + #Defines microservice name SERVICE_NAME: "env-checker" APPLICATION_NAME: "env-checker" MANAGED_BY: "saasDeployer" #The namespace it is going to be deployed. -NAMESPACE: '' +NAMESPACE: 'default' #Artifact descriptor version which is installed. ARTIFACT_DESCRIPTOR_VERSION : '' -IMAGE_REPOSITORY: '' -TAG: '' +IMAGE_REPOSITORY: 'ghcr.io/netcracker/qubership-env-checker' +TAG: 'main' DELIMITER: "-" DEPLOYMENT_SESSION_ID: '' -CLOUD_NAME: '' +CLOUD_NAME: 'qubership' CSE_CLOUD: '' CSE_TENANT: '' READONLY_CONTAINER_FILE_SYSTEM_ENABLED: false @@ -30,4 +34,4 @@ OPS_IDP_URL: '' ENVCHECKER_KEYCLOACK_REALM: '' ENVCHECKER_KEYCLOACK_CLIENT_ID: '' ENVCHECKER_KEYCLOACK_CLIENT_SECRET: '' -CLOUD_PUBLIC_HOST: '' \ No newline at end of file +CLOUD_PUBLIC_HOST: 'qubership' \ No newline at end of file From 1f9b683bfdf7a23618d49f9764eeec54cf447b8e Mon Sep 17 00:00:00 2001 From: NikolaiKuziaevQubership Date: Tue, 28 Jan 2025 19:14:05 +0400 Subject: [PATCH 2/2] helm refactoring --- charts/env-checker/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/env-checker/values.yaml b/charts/env-checker/values.yaml index b52add6..b5444c7 100644 --- a/charts/env-checker/values.yaml +++ b/charts/env-checker/values.yaml @@ -3,8 +3,7 @@ serviceAccount: name: env-checker-sa # kubernetes secret name. Only pods which provide own keys can access the private registry. -imagePullSecrets: - - name: regcred +imagePullSecrets: [] #Defines microservice name SERVICE_NAME: "env-checker"