Lab 11, bonus task

kolayne-IU-assignments · Apr 12, 2024 · 7f85cb9 · 7f85cb9
1 parent c9c92c1
commit 7f85cb9
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 12 deletions.
diff --git a/k8s/app-go/templates/_helpers.tpl b/k8s/app-go/templates/_helpers.tpl
@@ -60,3 +60,10 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{- define "app-go.environ" -}}
+- name: var1
+  value: val1
+- name: var2
+  value: val2
+{{- end }}
diff --git a/k8s/app-go/templates/deployment.yaml b/k8s/app-go/templates/deployment.yaml
@@ -50,6 +50,8 @@ spec:
           volumeMounts:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          env:
+            {{ include "app-go.environ" . | nindent 12 }}
       {{- with .Values.volumes }}
       volumes:
         {{- toYaml . | nindent 8 }}

diff --git a/k8s/app-go/values.yaml b/k8s/app-go/values.yaml
@@ -51,17 +51,17 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
-resources: {}
+resources:
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
+  limits:
   #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
+    memory: 50Mi
+  requests:
+    cpu: 2000m
+    memory: 20Mi
 
 livenessProbe:
   httpGet:

diff --git a/k8s/app-py/templates/_helpers.tpl b/k8s/app-py/templates/_helpers.tpl
@@ -60,3 +60,10 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{- define "app-py.environ" -}}
+- name: var1
+  value: val1
+- name: var2
+  value: val2
+{{- end }}
diff --git a/k8s/app-py/templates/deployment.yaml b/k8s/app-py/templates/deployment.yaml
@@ -56,6 +56,7 @@ spec:
                 secretKeyRef:
                   name: env-secret
                   key: value
+            {{ include "app-py.environ" . | nindent 12 }}
       {{- with .Values.volumes }}
       volumes:
         {{- toYaml . | nindent 8 }}

diff --git a/k8s/app-py/values.yaml b/k8s/app-py/values.yaml
@@ -55,17 +55,17 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
-resources: {}
+resources:
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
+  limits:
   #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
+    memory: 60Mi
+  requests:
+    cpu: 2000m
+    memory: 30Mi
 
 livenessProbe:
   httpGet: