Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions .idea/simovative-onPremise-Helm.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions academyfive/charts/a5Chart/templates/academy-hpa.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{{- if .Values.autoscaler.enabled (not .Values.keda.enabled) -}}
# horizontal pod autoscaler for academy-deployment
apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
name: academy-hpa
name: {{ include "a5Chart.fullname" . }}
spec:
scaleTargetRef:
apiVersion: apps/v1
Expand Down Expand Up @@ -41,4 +42,5 @@ spec:
value: {{ .Values.autoscaler.scaleUp.longScaleUpPeriodPodAmount }}
- periodSeconds: {{ .Values.autoscaler.scaleUp.shortScaleUpPeriod }}
type: Percent
value: {{ .Values.autoscaler.scaleUp.shortScaleUpPeriodPodPercent }}
value: {{ .Values.autoscaler.scaleUp.shortScaleUpPeriodPodPercent }}
{{- end }}
46 changes: 46 additions & 0 deletions academyfive/charts/a5Chart/templates/academy-keda.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{{- if .Values.keda.enabled (not .Values.controller.autoscaler.enabled) -}}
apiVersion: {{ .Values.keda.apiVersion }}
kind: ScaledObject
metadata:
labels:
{{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: controller
{{- with .Values.controller.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
name: {{ include "a5Chart.fullname" . }}
namespace: {{ include "a5Chart.namespace" . }}
{{- if .Values.keda.scaledObject.annotations }}
annotations: {{ toYaml .Values.keda.scaledObject.annotations | nindent 4 }}
{{- end }}
spec:
scaleTargetRef:
{{- if eq .Values.keda.apiVersion "keda.k8s.io/v1alpha1" }}
deploymentName: {{ include "a5Chart.fullname" . }}
{{- else if eq .Values.keda.apiVersion "keda.sh/v1alpha1" }}
name: {{ include "a5Chart.fullname" . }}
{{- end }}
pollingInterval: {{ .Values.keda.pollingInterval }}
cooldownPeriod: {{ .Values.keda.cooldownPeriod }}
minReplicaCount: {{ .Values.keda.minReplicas }}
maxReplicaCount: {{ .Values.keda.maxReplicas }}
{{- with .Values.keda.fallback }}
fallback:
failureThreshold: {{ .failureThreshold | default 3 }}
replicas: {{ .replicas | default $.Values.keda.maxReplicas }}
{{- end }}
triggers:
{{- with .Values.keda.triggers }}
{{ toYaml . | indent 2 }}
{{ end }}
advanced:
restoreToOriginalReplicaCount: {{ .Values.keda.restoreToOriginalReplicaCount }}
{{- if .Values.keda.behavior }}
horizontalPodAutoscalerConfig:
behavior:
{{ with .Values.keda.behavior -}}
{{ toYaml . | indent 8 }}
{{ end }}

{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions academyfive/charts/a5Chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ storage:
size: 2Gi

autoscaler:
enabled: true
minReplicas: 2
maxReplicas: 10
targetCPUUtilizationPercentage: 40
Expand All @@ -87,6 +88,9 @@ autoscaler:
longScaleUpPeriod: 120
longScaleUpPeriodPodAmount: 5

keda:
enabled: false

service:
type: ClusterIP
port: 80
4 changes: 3 additions & 1 deletion academyfive/charts/casChart/templates/cas-hpa.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if .Values.autoscaler.enabled (not .Values.keda.enabled) -}}
# horizontal pod autoscaler for cas-deployment
apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
Expand Down Expand Up @@ -41,4 +42,5 @@ spec:
value: {{ .Values.autoscaler.scaleUp.longScaleUpPeriodPodAmount }}
- periodSeconds: {{ .Values.autoscaler.scaleUp.shortScaleUpPeriod }}
type: Percent
value: {{ .Values.autoscaler.scaleUp.shortScaleUpPeriodPodPercent }}
value: {{ .Values.autoscaler.scaleUp.shortScaleUpPeriodPodPercent }}
{{- end }}
46 changes: 46 additions & 0 deletions academyfive/charts/casChart/templates/cas-keda.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{{- if .Values.keda.enabled (not .Values.controller.autoscaler.enabled) -}}
apiVersion: {{ .Values.keda.apiVersion }}
kind: ScaledObject
metadata:
labels:
{{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: controller
{{- with .Values.controller.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
name: {{ include "a5Chart.fullname" . }}
namespace: {{ include "a5Chart.namespace" . }}
{{- if .Values.keda.scaledObject.annotations }}
annotations: {{ toYaml .Values.keda.scaledObject.annotations | nindent 4 }}
{{- end }}
spec:
scaleTargetRef:
{{- if eq .Values.keda.apiVersion "keda.k8s.io/v1alpha1" }}
deploymentName: {{ include "a5Chart.fullname" . }}
{{- else if eq .Values.keda.apiVersion "keda.sh/v1alpha1" }}
name: {{ include "a5Chart.fullname" . }}
{{- end }}
pollingInterval: {{ .Values.keda.pollingInterval }}
cooldownPeriod: {{ .Values.keda.cooldownPeriod }}
minReplicaCount: {{ .Values.keda.minReplicas }}
maxReplicaCount: {{ .Values.keda.maxReplicas }}
{{- with .Values.keda.fallback }}
fallback:
failureThreshold: {{ .failureThreshold | default 3 }}
replicas: {{ .replicas | default $.Values.keda.maxReplicas }}
{{- end }}
triggers:
{{- with .Values.keda.triggers }}
{{ toYaml . | indent 2 }}
{{ end }}
advanced:
restoreToOriginalReplicaCount: {{ .Values.keda.restoreToOriginalReplicaCount }}
{{- if .Values.keda.behavior }}
horizontalPodAutoscalerConfig:
behavior:
{{ with .Values.keda.behavior -}}
{{ toYaml . | indent 8 }}
{{ end }}

{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions academyfive/charts/casChart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ storage:
size: 2Gi

autoscaler:
enabled: true
minReplicas: 2
maxReplicas: 10
targetCPUUtilizationPercentage: 50
Expand All @@ -64,6 +65,9 @@ autoscaler:
longScaleUpPeriod: 120
longScaleUpPeriodPodAmount: 5

keda:
enabled: false

service:
type: ClusterIP
port: 80
8 changes: 8 additions & 0 deletions academyfive/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,14 @@ a5Chart:
size: 2Gi

autoscaler:
enabled: true
minReplicas: 2
maxReplicas: 10
targetCPUUtilizationPercentage: 40

keda:
enabled: false

casChart:
enabled: true
envData:
Expand Down Expand Up @@ -103,10 +107,14 @@ casChart:
storageClass: "-"
size: 2Gi
autoscaler:
enabled: true
minReplicas: 2
maxReplicas: 10
targetCPUUtilizationPercentage: 50

keda:
enabled: false

deployment:
image: <YOUR_IMAGE_LOCATION>

Expand Down