Merge pull request #3 from xoanmi/fixTestsHPA

Fix tests hpa
goharbor · Jan 8, 2025 · 712b44c · 712b44c
2 parents 94cd10c + 94c3e56
commit 712b44c
Show file tree

Hide file tree

Showing 17 changed files with 1,049 additions and 0 deletions.
diff --git a/templates/core/core-dpl.yaml b/templates/core/core-dpl.yaml
@@ -8,7 +8,9 @@ metadata:
     component: core
     app.kubernetes.io/component: core
 spec:
+  {{- if not .Values.core.autoscaling.enabled }}
   replicas: {{ .Values.core.replicas }}
+  {{- end }}
   revisionHistoryLimit: {{ .Values.core.revisionHistoryLimit }}
   selector:
     matchLabels:

diff --git a/templates/core/core-hpa.yaml b/templates/core/core-hpa.yaml
@@ -0,0 +1,43 @@
+{{- if .Values.core.autoscaling.enabled }}
+apiVersion: {{ ternary "autoscaling/v2" "autoscaling/v2beta2" (.Capabilities.APIVersions.Has "autoscaling/v2") }}
+kind: HorizontalPodAutoscaler
+metadata:
+  {{- with .Values.core.autoscaling.annotations }}
+  annotations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "harbor.labels" . | nindent 4 }}
+    app.kubernetes.io/component: core
+  name: {{ template "harbor.core" . }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ template "harbor.core" . }}
+  minReplicas: {{ .Values.core.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.core.autoscaling.maxReplicas }}
+  metrics:
+  {{- with .Values.core.autoscaling.targetMemoryUtilizationPercentage }}
+  - type: Resource
+    resource:
+      name: memory
+      target:
+        type: Utilization
+        averageUtilization: {{ . }}
+  {{- end }}
+  {{- with .Values.core.autoscaling.targetCPUUtilizationPercentage }}
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: {{ . }}
+  {{- end }}
+  {{- with .Values.core.autoscalingTemplate }}
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
+  {{- with .Values.core.autoscaling.behavior }}
+  behavior:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/templates/exporter/exporter-dpl.yaml b/templates/exporter/exporter-dpl.yaml
@@ -9,7 +9,9 @@ metadata:
     component: exporter
     app.kubernetes.io/component: exporter
 spec:
+  {{- if not .Values.exporter.autoscaling.enabled }}
   replicas: {{ .Values.exporter.replicas }}
+  {{- end }}
   revisionHistoryLimit: {{ .Values.exporter.revisionHistoryLimit }}
   selector:
     matchLabels:

diff --git a/templates/exporter/exporter-hpa.yaml b/templates/exporter/exporter-hpa.yaml
@@ -0,0 +1,43 @@
+{{- if .Values.exporter.autoscaling.enabled }}
+apiVersion: {{ ternary "autoscaling/v2" "autoscaling/v2beta2" (.Capabilities.APIVersions.Has "autoscaling/v2") }}
+kind: HorizontalPodAutoscaler
+metadata:
+  {{- with .Values.exporter.autoscaling.annotations }}
+  annotations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "harbor.labels" . | nindent 4 }}
+    app.kubernetes.io/component: exporter
+  name: {{ template "harbor.exporter" . }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ template "harbor.exporter" . }}
+  minReplicas: {{ .Values.exporter.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.exporter.autoscaling.maxReplicas }}
+  metrics:
+  {{- with .Values.exporter.autoscaling.targetMemoryUtilizationPercentage }}
+  - type: Resource
+    resource:
+      name: memory
+      target:
+        type: Utilization
+        averageUtilization: {{ . }}
+  {{- end }}
+  {{- with .Values.exporter.autoscaling.targetCPUUtilizationPercentage }}
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: {{ . }}
+  {{- end }}
+  {{- with .Values.exporter.autoscalingTemplate }}
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
+  {{- with .Values.exporter.autoscaling.behavior }}
+  behavior:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/templates/jobservice/jobservice-dpl.yaml b/templates/jobservice/jobservice-dpl.yaml
@@ -8,7 +8,9 @@ metadata:
     component: jobservice
     app.kubernetes.io/component: jobservice
 spec:
+  {{- if not .Values.jobservice.autoscaling.enabled }}
   replicas: {{ .Values.jobservice.replicas }}
+  {{- end }}
   revisionHistoryLimit: {{ .Values.jobservice.revisionHistoryLimit }}
   strategy:
     type: {{ .Values.updateStrategy.type }}

diff --git a/templates/jobservice/jobservice-hpa.yaml b/templates/jobservice/jobservice-hpa.yaml
@@ -0,0 +1,43 @@
+{{- if .Values.jobservice.autoscaling.enabled }}
+apiVersion: {{ ternary "autoscaling/v2" "autoscaling/v2beta2" (.Capabilities.APIVersions.Has "autoscaling/v2") }}
+kind: HorizontalPodAutoscaler
+metadata:
+  {{- with .Values.jobservice.autoscaling.annotations }}
+  annotations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "harbor.labels" . | nindent 4 }}
+    app.kubernetes.io/component: jobservice
+  name: {{ template "harbor.jobservice" . }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ template "harbor.jobservice" . }}
+  minReplicas: {{ .Values.jobservice.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.jobservice.autoscaling.maxReplicas }}
+  metrics:
+  {{- with .Values.jobservice.autoscaling.targetMemoryUtilizationPercentage }}
+  - type: Resource
+    resource:
+      name: memory
+      target:
+        type: Utilization
+        averageUtilization: {{ . }}
+  {{- end }}
+  {{- with .Values.jobservice.autoscaling.targetCPUUtilizationPercentage }}
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: {{ . }}
+  {{- end }}
+  {{- with .Values.jobservice.autoscalingTemplate }}
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
+  {{- with .Values.jobservice.autoscaling.behavior }}
+  behavior:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/templates/portal/deployment.yaml b/templates/portal/deployment.yaml
@@ -8,7 +8,9 @@ metadata:
     component: portal
     app.kubernetes.io/component: portal
 spec:
+  {{- if not .Values.portal.autoscaling.enabled }}
   replicas: {{ .Values.portal.replicas }}
+  {{- end }}
   revisionHistoryLimit: {{ .Values.portal.revisionHistoryLimit }}
   selector:
     matchLabels:

diff --git a/templates/portal/portal-hpa.yaml b/templates/portal/portal-hpa.yaml
@@ -0,0 +1,43 @@
+{{- if .Values.portal.autoscaling.enabled }}
+apiVersion: {{ ternary "autoscaling/v2" "autoscaling/v2beta2" (.Capabilities.APIVersions.Has "autoscaling/v2") }}
+kind: HorizontalPodAutoscaler
+metadata:
+  {{- with .Values.portal.autoscaling.annotations }}
+  annotations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "harbor.labels" . | nindent 4 }}
+    app.kubernetes.io/component: portal
+  name: {{ template "harbor.portal" . }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ template "harbor.portal" . }}
+  minReplicas: {{ .Values.portal.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.portal.autoscaling.maxReplicas }}
+  metrics:
+  {{- with .Values.portal.autoscaling.targetMemoryUtilizationPercentage }}
+  - type: Resource
+    resource:
+      name: memory
+      target:
+        type: Utilization
+        averageUtilization: {{ . }}
+  {{- end }}
+  {{- with .Values.portal.autoscaling.targetCPUUtilizationPercentage }}
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: {{ . }}
+  {{- end }}
+  {{- with .Values.portal.autoscalingTemplate }}
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
+  {{- with .Values.portal.autoscaling.behavior }}
+  behavior:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/templates/registry/registry-dpl.yaml b/templates/registry/registry-dpl.yaml
@@ -10,7 +10,9 @@ metadata:
     component: registry
     app.kubernetes.io/component: registry
 spec:
+  {{- if not .Values.registry.autoscaling.enabled }}
   replicas: {{ .Values.registry.replicas }}
+  {{- end }}
   revisionHistoryLimit: {{ .Values.registry.revisionHistoryLimit }}
   strategy:
     type: {{ .Values.updateStrategy.type }}

diff --git a/templates/registry/registry-hpa.yaml b/templates/registry/registry-hpa.yaml
@@ -0,0 +1,43 @@
+{{- if .Values.registry.autoscaling.enabled }}
+apiVersion: {{ ternary "autoscaling/v2" "autoscaling/v2beta2" (.Capabilities.APIVersions.Has "autoscaling/v2") }}
+kind: HorizontalPodAutoscaler
+metadata:
+  {{- with .Values.registry.autoscaling.annotations }}
+  annotations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "harbor.labels" . | nindent 4 }}
+    app.kubernetes.io/component: registry
+  name: {{ template "harbor.registry" . }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ template "harbor.registry" . }}
+  minReplicas: {{ .Values.registry.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.registry.autoscaling.maxReplicas }}
+  metrics:
+  {{- with .Values.registry.autoscaling.targetMemoryUtilizationPercentage }}
+  - type: Resource
+    resource:
+      name: memory
+      target:
+        type: Utilization
+        averageUtilization: {{ . }}
+  {{- end }}
+  {{- with .Values.registry.autoscaling.targetCPUUtilizationPercentage }}
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: {{ . }}
+  {{- end }}
+  {{- with .Values.registry.autoscalingTemplate }}
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
+  {{- with .Values.registry.autoscaling.behavior }}
+  behavior:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/templates/trivy/trivy-hpa.yaml b/templates/trivy/trivy-hpa.yaml
@@ -0,0 +1,43 @@
+{{- if .Values.trivy.autoscaling.enabled }}
+apiVersion: {{ ternary "autoscaling/v2" "autoscaling/v2beta2" (.Capabilities.APIVersions.Has "autoscaling/v2") }}
+kind: HorizontalPodAutoscaler
+metadata:
+  {{- with .Values.trivy.autoscaling.annotations }}
+  annotations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "harbor.labels" . | nindent 4 }}
+    app.kubernetes.io/component: trivy
+  name: {{ template "harbor.trivy" . }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: StatefulSet
+    name: {{ template "harbor.trivy" . }}
+  minReplicas: {{ .Values.trivy.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.trivy.autoscaling.maxReplicas }}
+  metrics:
+  {{- with .Values.trivy.autoscaling.targetMemoryUtilizationPercentage }}
+  - type: Resource
+    resource:
+      name: memory
+      target:
+        type: Utilization
+        averageUtilization: {{ . }}
+  {{- end }}
+  {{- with .Values.trivy.autoscaling.targetCPUUtilizationPercentage }}
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: {{ . }}
+  {{- end }}
+  {{- with .Values.trivy.autoscalingTemplate }}
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
+  {{- with .Values.trivy.autoscaling.behavior }}
+  behavior:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/templates/trivy/trivy-sts.yaml b/templates/trivy/trivy-sts.yaml
@@ -10,7 +10,9 @@ metadata:
     component: trivy
     app.kubernetes.io/component: trivy
 spec:
+  {{- if not .Values.trivy.autoscaling.enabled }}
   replicas: {{ .Values.trivy.replicas }}
+  {{- end }}
   serviceName: {{  template "harbor.trivy" . }}
   selector:
     matchLabels:

diff --git a/test/unittest/core/core_deployment_test.yaml b/test/unittest/core/core_deployment_test.yaml
@@ -43,6 +43,28 @@ tests:
           path: spec.replicas
           value: 2
 
+  - it: HPADisabledReplicas
+    set:
+      core:
+        replicas: 2
+        autoscaling:
+          enabled: false
+    template: templates/core/core-dpl.yaml
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 2
+
+  - it: HPAEnabledReplicas
+    set:
+      core:
+        autoscaling:
+          enabled: true
+    template: templates/core/core-dpl.yaml
+    asserts:
+      - notExists:
+          path: spec.replicas
+
   - it: ServiceAccounts
     set:
       core: