HPA: set maxReplicas from Values, add grace period

Signed-off-by: Alexey Fomenko <[email protected]>
opea-project · Aug 21, 2024 · d39dc51 · d39dc51
1 parent f32d810
commit d39dc51
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 3 deletions.
diff --git a/helm-charts/chatqna/templates/deployment.yaml b/helm-charts/chatqna/templates/deployment.yaml
@@ -71,6 +71,9 @@ spec:
                 #              port: {{ .Values.port }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- if .Values.horizontalPodAutoscaler.enabled }}
+          terminationGracePeriodSeconds: 120
+          {{- end }}
       volumes:
         - name: tmp
           emptyDir: {}

diff --git a/helm-charts/chatqna/templates/horizontalPorAutoscaler.yaml b/helm-charts/chatqna/templates/horizontalPorAutoscaler.yaml
@@ -12,7 +12,7 @@ spec:
     kind: Deployment
     name: {{ include "chatqna.fullname" . }}
   minReplicas: 1
-  maxReplicas: 6
+  maxReplicas: {{ .Values.horizontalPodAutoscaler.maxReplicas }}
   metrics:
   - type: Object
     object:

diff --git a/helm-charts/chatqna/values.yaml b/helm-charts/chatqna/values.yaml
@@ -8,6 +8,7 @@
 replicaCount: 1
 horizontalPodAutoscaler:
   enable: false
+  maxReplicas: 6
 
 image:
   repository: opea/chatqna

diff --git a/helm-charts/common/embedding-usvc/templates/deployment.yaml b/helm-charts/common/embedding-usvc/templates/deployment.yaml
@@ -65,6 +65,9 @@ spec:
           {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- if .Values.horizontalPodAutoscaler.enabled }}
+          terminationGracePeriodSeconds: 60
+          {{- end }}
       volumes:
         - name: tmp
           emptyDir: {}

diff --git a/helm-charts/common/embedding-usvc/templates/horizontalPodAutoscaler.yaml b/helm-charts/common/embedding-usvc/templates/horizontalPodAutoscaler.yaml
@@ -12,7 +12,7 @@ spec:
     kind: Deployment
     name: {{ include "embedding-usvc.fullname" . }}
   minReplicas: 1
-  maxReplicas: 2
+  maxReplicas: {{ .Values.horizontalPodAutoscaler.maxReplicas }}
   metrics:
   - type: Object
     object:

diff --git a/helm-charts/common/embedding-usvc/values.yaml b/helm-charts/common/embedding-usvc/values.yaml
@@ -11,6 +11,7 @@ autodependency:
 replicaCount: 1
 horizontalPodAutoscaler:
   enabled: false
+  maxReplicas: 2
 
 TEI_EMBEDDING_ENDPOINT: ""
 image:

diff --git a/helm-charts/common/reranking-usvc/templates/deployment.yaml b/helm-charts/common/reranking-usvc/templates/deployment.yaml
@@ -65,6 +65,9 @@ spec:
           {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- if .Values.horizontalPodAutoscaler.enabled }}
+          terminationGracePeriodSeconds: 60
+          {{- end }}
       volumes:
         - name: tmp
           emptyDir: {}

diff --git a/helm-charts/common/reranking-usvc/templates/horizontalPodAutoscaler.yaml b/helm-charts/common/reranking-usvc/templates/horizontalPodAutoscaler.yaml
@@ -12,7 +12,7 @@ spec:
     kind: Deployment
     name: {{ include "reranking-usvc.fullname" . }}
   minReplicas: 1
-  maxReplicas: 3
+  maxReplicas: {{ .Values.horizontalPodAutoscaler.maxReplicas }}
   metrics:
   - type: Object
     object:

diff --git a/helm-charts/common/reranking-usvc/values.yaml b/helm-charts/common/reranking-usvc/values.yaml
@@ -11,6 +11,7 @@ autodependency:
 replicaCount: 1
 horizontalPodAutoscaler:
   enabled: false
+  maxReplicas: 3
 
 TEI_RERANKING_ENDPOINT: ""
 image: