merged conflicts

Author: di2ag-org

chp_api/Dockerfile

@@ -13,6 +13,9 @@ RUN git clone --single-branch --branch master https://github.com/di2ag/gene-spec
 # Upgrade pip
 RUN pip3 install --upgrade pip
 
+# Upgrade pip
+RUN pip3 install --upgrade pip
+
 # install dependencies
 COPY ./requirements.txt .
 RUN pip3 wheel --no-cache-dir --no-deps --wheel-dir /usr/src/chp_api/wheels -r requirements.txt
@@ -48,7 +51,7 @@ ARG DEBIAN_FRONTEND=noninterative
 # copy repo to new image
 COPY --from=intermediate /usr/src/chp_api/wheels /wheels
 COPY --from=intermediate /usr/src/chp_api/requirements.txt .
-# Running this command to ensure version 1 of pydantic is being used until reasoner-pydantic is updated. 
+# Running this command to ensure version 1 of pydantic is being used until reasoner-pydantic is updated.
 RUN pip3 install pydantic==1.10.12
 RUN pip3 install --no-cache /wheels/*
 

deploy/chp-api/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

deploy/chp-api/templates/deployment.yaml

@@ -21,6 +21,10 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
         - name: {{ .Chart.Name }}
+          {{- with .Values.chp_api.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
@@ -89,6 +93,10 @@ spec:
             - name: OTEL_EXPORTER_JAEGER_AGENT_PORT
               value: "{{ .Values.app.OtelExporterJaegerAgentPort }}"
         - name: {{ .Chart.Name }}-nginx
+          {{- with .Values.chp_api_nginx.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           securityContext:
             {{- toYaml .Values.securityContextNginx | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.nginxTag | default .Chart.AppVersion }}"
@@ -102,6 +110,10 @@ spec:
               mountPath: /etc/nginx/conf.d/default.conf
               subPath: nginx.conf
         - name: {{ .Chart.Name }}-staticfs
+          {{- with .Values.chp_api_staticfs.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           securityContext:
             {{- toYaml .Values.securityContextStaticfs | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.staticfsTag | default .Chart.AppVersion }}"

deploy/chp-api/values.yaml

@@ -80,7 +80,7 @@ ingress:
 
 tolerations: 
   - key: "transltr"
-    value: "chp-api"
+    value: "managed-app"
     operator: "Equal"
     effect: "NoSchedule"
 
@@ -93,14 +93,14 @@ affinity:
           - key: app
             operator: In
             values:
-            - chp-api
+            - managed-app
         topologyKey: "kubernetes.io/hostname"
-  # this ensures pod only runs on node with label application=chp-api
+  # this ensures pod only runs on node with label application=managed-app
   nodeAffinity:
     requiredDuringSchedulingIgnoredDuringExecution:
       nodeSelectorTerms:
         - matchExpressions:
           - key: application
             operator: In
             values:
-            - chp-api
+            - managed-app