Merge pull request #2 from Netcracker/helm-refactoring

helm refactoring
Netcracker · Jan 29, 2025 · 00e26f9 · 00e26f9
2 parents 83b9765 + 1f9b683
commit 00e26f9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git 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
@@ -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
@@ -2,19 +2,22 @@
 serviceAccount:
   name: env-checker-sa
 
+# kubernetes secret name. Only pods which provide own keys can access the private registry.
+imagePullSecrets: []
+
 #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 +33,4 @@ OPS_IDP_URL: ''
 ENVCHECKER_KEYCLOACK_REALM: ''
 ENVCHECKER_KEYCLOACK_CLIENT_ID: ''
 ENVCHECKER_KEYCLOACK_CLIENT_SECRET: ''
-CLOUD_PUBLIC_HOST: ''
+CLOUD_PUBLIC_HOST: 'qubership'