Update deployment.yaml

OT-CONTAINER-KIT · Jul 29, 2024 · 0c7a154 · 0c7a154
1 parent d77014d
commit 0c7a154
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/charts/microservice/templates/deployment.yaml b/charts/microservice/templates/deployment.yaml
@@ -91,9 +91,6 @@ spec:
       {{- end }}
       {{- with .Values.deployment.affinity }}
       affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.deployment.tolerations }}
+        {{- toYaml (merge .Values.deployment.affinity (default dict .Values.deployment.affinity)) | nindent 8 }}
       tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        {{- toYaml (merge .Values.deployment.tolerations (default dict .Values.deployment.tolerations)) | nindent 8 }}