Feat: Add HPA & PDB Helm Chart Support #13391 #13512
+298
−3
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
carlosmt86 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| {{- if .Values.celery.beat.autoscaling.enabled -}} | ||
| {{- $fullName := include "defectdojo.fullname" . -}} | ||
| apiVersion: autoscaling/v2 | ||
| kind: HorizontalPodAutoscaler | ||
| metadata: | ||
| {{- with mergeOverwrite dict .Values.extraAnnotations .Values.celery.annotations .Values.celery.beat.annotations }} | ||
| annotations: | ||
| {{- range $key, $value := . }} | ||
| {{ $key }}: {{ quote $value }} | ||
| {{- end }} | ||
| {{- end }} | ||
| name: {{ $fullName }}-celery-beat | ||
| namespace: {{ .Release.Namespace }} | ||
| labels: | ||
| defectdojo.org/component: celery | ||
| defectdojo.org/subcomponent: beat | ||
| app.kubernetes.io/name: {{ include "defectdojo.name" . }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| app.kubernetes.io/managed-by: {{ .Release.Service }} | ||
| helm.sh/chart: {{ include "defectdojo.chart" . }} | ||
| {{- range $key, $value := .Values.extraLabels }} | ||
| {{ $key }}: {{ quote $value }} | ||
| {{- end }} | ||
| spec: | ||
| scaleTargetRef: | ||
| apiVersion: apps/v1 | ||
| kind: "Deployment" | ||
| name: {{ $fullName }}-celery-beat | ||
| minReplicas: {{ .Values.celery.beat.autoscaling.minReplicas }} | ||
| maxReplicas: {{ .Values.celery.beat.autoscaling.maxReplicas }} | ||
| metrics: | ||
| {{- with .Values.celery.beat.autoscaling.targetCPUUtilizationPercentage }} | ||
| - type: Resource | ||
| resource: | ||
| name: cpu | ||
| target: | ||
| averageUtilization: {{ . }} | ||
| type: Utilization | ||
| {{- end }} | ||
| {{- with .Values.celery.beat.autoscaling.targetMemoryUtilizationPercentage }} | ||
| - type: Resource | ||
| resource: | ||
| name: memory | ||
| target: | ||
| averageUtilization: {{ . }} | ||
| type: Utilization | ||
| {{- end }} | ||
| {{- if .Values.celery.beat.autoscaling.autoscaleBehavior }} | ||
| behavior: {{ toYaml .Values.celery.beat.autoscaling.autoscaleBehavior | nindent 4 }} | ||
| {{- end }} | ||
| {{- end }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| {{- if .Values.celery.beat.podDisruptionBudget.enabled }} | ||
| {{- $fullName := include "defectdojo.fullname" . -}} | ||
| apiVersion: policy/v1 | ||
| kind: PodDisruptionBudget | ||
| metadata: | ||
| {{- with mergeOverwrite dict .Values.extraAnnotations .Values.celery.annotations .Values.celery.beat.annotations }} | ||
| annotations: | ||
| {{- range $key, $value := . }} | ||
| {{ $key }}: {{ quote $value }} | ||
| {{- end }} | ||
| {{- end }} | ||
| labels: | ||
| defectdojo.org/component: celery | ||
| defectdojo.org/subcomponent: beat | ||
| app.kubernetes.io/name: {{ include "defectdojo.name" . }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| app.kubernetes.io/managed-by: {{ .Release.Service }} | ||
| helm.sh/chart: {{ include "defectdojo.chart" . }} | ||
| {{- range $key, $value := .Values.extraLabels }} | ||
| {{ $key }}: {{ quote $value }} | ||
| {{- end }} | ||
| name: {{ $fullName }}-celery-beat | ||
| namespace: {{ .Release.Namespace }} | ||
| spec: | ||
| selector: | ||
| matchLabels: | ||
| app.kubernetes.io/name: {{ .Release.Name }} | ||
| defectdojo.org/component: celery | ||
| defectdojo.org/subcomponent: beat | ||
| {{ toYaml (omit .Values.celery.beat.podDisruptionBudget "enabled" ) | indent 2 }} | ||
| {{- end }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| {{- if .Values.celery.worker.autoscaling.enabled -}} | ||
| {{- $fullName := include "defectdojo.fullname" . -}} | ||
| apiVersion: autoscaling/v2 | ||
| kind: HorizontalPodAutoscaler | ||
| metadata: | ||
| {{- with mergeOverwrite dict .Values.extraAnnotations .Values.celery.annotations .Values.celery.worker.annotations }} | ||
| annotations: | ||
| {{- range $key, $value := . }} | ||
| {{ $key }}: {{ quote $value }} | ||
| {{- end }} | ||
| {{- end }} | ||
| name: {{ $fullName }}-celery-worker | ||
| namespace: {{ .Release.Namespace }} | ||
| labels: | ||
| defectdojo.org/component: celery | ||
| defectdojo.org/subcomponent: worker | ||
| app.kubernetes.io/name: {{ include "defectdojo.name" . }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| app.kubernetes.io/managed-by: {{ .Release.Service }} | ||
| helm.sh/chart: {{ include "defectdojo.chart" . }} | ||
| {{- range $key, $value := .Values.extraLabels }} | ||
| {{ $key }}: {{ quote $value }} | ||
| {{- end }} | ||
| spec: | ||
| scaleTargetRef: | ||
| apiVersion: apps/v1 | ||
| kind: "Deployment" | ||
| name: {{ $fullName }}-celery-worker | ||
| minReplicas: {{ .Values.celery.worker.autoscaling.minReplicas }} | ||
| maxReplicas: {{ .Values.celery.worker.autoscaling.maxReplicas }} | ||
| metrics: | ||
| {{- with .Values.celery.worker.autoscaling.targetCPUUtilizationPercentage }} | ||
| - type: Resource | ||
| resource: | ||
| name: cpu | ||
| target: | ||
| averageUtilization: {{ . }} | ||
| type: Utilization | ||
| {{- end }} | ||
| {{- with .Values.celery.worker.autoscaling.targetMemoryUtilizationPercentage }} | ||
| - type: Resource | ||
| resource: | ||
| name: memory | ||
| target: | ||
| averageUtilization: {{ . }} | ||
| type: Utilization | ||
| {{- end }} | ||
| {{- if .Values.celery.worker.autoscaling.autoscaleBehavior }} | ||
|
There was a problem hiding this comment. Is there any reason not to use |
||
| behavior: {{ toYaml .Values.celery.worker.autoscaling.autoscaleBehavior | nindent 4 }} | ||
|
There was a problem hiding this comment. Shorter version: |
||
| {{- end }} | ||
| {{- end }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| {{- if .Values.celery.worker.podDisruptionBudget.enabled }} | ||
| {{- $fullName := include "defectdojo.fullname" . -}} | ||
| apiVersion: policy/v1 | ||
| kind: PodDisruptionBudget | ||
| metadata: | ||
| {{- with mergeOverwrite dict .Values.extraAnnotations .Values.celery.annotations .Values.celery.worker.annotations }} | ||
| annotations: | ||
| {{- range $key, $value := . }} | ||
| {{ $key }}: {{ quote $value }} | ||
| {{- end }} | ||
| {{- end }} | ||
| labels: | ||
| defectdojo.org/component: celery | ||
| defectdojo.org/subcomponent: worker | ||
| app.kubernetes.io/name: {{ include "defectdojo.name" . }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| app.kubernetes.io/managed-by: {{ .Release.Service }} | ||
| helm.sh/chart: {{ include "defectdojo.chart" . }} | ||
| {{- range $key, $value := .Values.extraLabels }} | ||
| {{ $key }}: {{ quote $value }} | ||
| {{- end }} | ||
| name: {{ $fullName }}-celery-worker | ||
| namespace: {{ .Release.Namespace }} | ||
| spec: | ||
| selector: | ||
| matchLabels: | ||
| app.kubernetes.io/name: {{ .Release.Name }} | ||
carlosmt86 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| defectdojo.org/component: celery | ||
| defectdojo.org/subcomponent: worker | ||
| {{ toYaml (omit .Values.celery.worker.podDisruptionBudget "enabled" ) | indent 2 }} | ||
| {{- end }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| {{- if .Values.django.autoscaling.enabled -}} | ||
| {{- $fullName := include "defectdojo.fullname" . -}} | ||
| apiVersion: autoscaling/v2 | ||
| kind: HorizontalPodAutoscaler | ||
| metadata: | ||
| {{- if or .Values.extraAnnotations .Values.django.autoscaling.annotations }} | ||
carlosmt86 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| annotations: | ||
| {{- range $key, $value := .Values.extraAnnotations }} | ||
| {{ $key }}: {{ quote $value }} | ||
| {{- end }} | ||
| {{- range $key, $value := .Values.django.annotations }} | ||
carlosmt86 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| {{ $key }}: {{ quote $value }} | ||
| {{- end }} | ||
| {{- end }} | ||
| name: {{ $fullName }}-django | ||
| namespace: {{ .Release.Namespace }} | ||
| labels: | ||
| defectdojo.org/component: django | ||
| app.kubernetes.io/name: {{ include "defectdojo.name" . }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| app.kubernetes.io/managed-by: {{ .Release.Service }} | ||
| helm.sh/chart: {{ include "defectdojo.chart" . }} | ||
| {{- range $key, $value := .Values.extraLabels }} | ||
| {{ $key }}: {{ quote $value }} | ||
| {{- end }} | ||
| spec: | ||
| scaleTargetRef: | ||
| apiVersion: apps/v1 | ||
| kind: "Deployment" | ||
| name: {{ $fullName }}-django | ||
| minReplicas: {{ .Values.django.autoscaling.minReplicas }} | ||
| maxReplicas: {{ .Values.django.autoscaling.maxReplicas }} | ||
| metrics: | ||
| {{- with .Values.django.autoscaling.targetCPUUtilizationPercentage }} | ||
| - type: Resource | ||
| resource: | ||
| name: cpu | ||
| target: | ||
| averageUtilization: {{ . }} | ||
| type: Utilization | ||
| {{- end }} | ||
| {{- with .Values.django.autoscaling.targetMemoryUtilizationPercentage }} | ||
| - type: Resource | ||
| resource: | ||
| name: memory | ||
| target: | ||
| averageUtilization: {{ . }} | ||
| type: Utilization | ||
| {{- end }} | ||
| {{- if .Values.django.autoscaling.autoscaleBehavior }} | ||
|
|
||
| behavior: {{ toYaml .Values.django.autoscaling.autoscaleBehavior | nindent 4 }} | ||
|
There was a problem hiding this comment. Same ( |
||
| {{- end }} | ||
| {{- end }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| {{- if .Values.django.podDisruptionBudget.enabled }} | ||
| {{- $fullName := include "defectdojo.fullname" . -}} | ||
| apiVersion: policy/v1 | ||
| kind: PodDisruptionBudget | ||
| metadata: | ||
| {{- if or .Values.extraAnnotations .Values.django.podDisruptionBudget.annotations }} | ||
carlosmt86 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| annotations: | ||
| {{- range $key, $value := .Values.extraAnnotations }} | ||
| {{ $key }}: {{ quote $value }} | ||
| {{- end }} | ||
| {{- range $key, $value := .Values.django.annotations }} | ||
| {{ $key }}: {{ quote $value }} | ||
| {{- end }} | ||
| {{- end }} | ||
| labels: | ||
| defectdojo.org/component: django | ||
| app.kubernetes.io/name: {{ include "defectdojo.name" . }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| app.kubernetes.io/managed-by: {{ .Release.Service }} | ||
| helm.sh/chart: {{ include "defectdojo.chart" . }} | ||
| {{- range $key, $value := .Values.extraLabels }} | ||
| {{ $key }}: {{ quote $value }} | ||
| {{- end }} | ||
| name: {{ $fullName }}-django | ||
| namespace: {{ .Release.Namespace }} | ||
| spec: | ||
| selector: | ||
| matchLabels: | ||
| app.kubernetes.io/name: {{ .Release.Name }} | ||
| defectdojo.org/component: django | ||
| {{ toYaml (omit .Values.django.podDisruptionBudget "enabled" ) | indent 2 }} | ||
| {{- end }} | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.