Skip to content

Commit

Permalink
dbildungs-iam-server
Browse files Browse the repository at this point in the history
  • Loading branch information
dbildungs-iam-server-gha committed Nov 20, 2024
1 parent 1966838 commit 5ce82bd
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 16 deletions.
2 changes: 1 addition & 1 deletion automation/dbildungs-iam-server/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ dependencies:
repository: https://charts.bitnami.com/bitnami
version: 11.0.6
digest: sha256:790bafa04fe9c1cc9f772dc12fada16eb847c282f738fd23df09f665af93ec74
generated: "2024-11-19T17:04:00.657423975Z"
generated: "2024-11-20T05:32:20.604931712Z"
4 changes: 2 additions & 2 deletions automation/dbildungs-iam-server/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: DBP-1081
appVersion: SPSH-1195
dependencies:
- condition: redis-cluster.enabled
name: redis-cluster
Expand All @@ -8,4 +8,4 @@ dependencies:
description: dBildungs-IAM-server
name: dbildungs-iam-server
type: application
version: 0.0.0-dbp-1081-20241119-1703
version: 0.0.0-spsh-1195-20241120-0532
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{{if .Values.backend.serviceMonitor.enabled }}
{{ if .Values.backend.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ template "common.names.name" . }}-backend
name: {{ template "common.names.name" . }}
namespace: {{ template "common.names.namespace" . }}
labels:
{{- include "common.labels" . | nindent 4 }}
Expand All @@ -13,9 +13,11 @@ spec:
- {{ include "common.names.namespace" . | quote }}
selector:
matchLabels:
app.kubernetes.io/name: {{ template "common.names.name" . }}-backend
app.kubernetes.io/name: {{ template "common.names.name" . }}
app.kubernetes.io/component: server-backend
endpoints:
- port: {{ (index .Values.backend.serviceMonitor.endpoints 0).port }}
path: {{ .Values.serviceMonitor.path }}
interval: {{ .Values.serviceMonitor.interval }}
{{ end }}

2 changes: 0 additions & 2 deletions automation/dbildungs-iam-server/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,3 @@ data:
BACKEND_HOSTNAME: "{{ .Values.backendHostname }}"
LDAP_URL: '{{ .Values.ldap.url | replace "spsh-xxx" .Release.Namespace }}'
LDAP_BIND_DN: "{{ .Values.ldap.bindDN }}"
LDAP_OEFFENTLICHE_SCHULEN_DOMAIN: "{{ .Values.ldap.oeffentlicheSchulenDomain }}"
LDAP_ERSATZSCHULEN_DOMAIN: "{{ .Values.ldap.ersatzschulenDomain }}"
19 changes: 11 additions & 8 deletions automation/dbildungs-iam-server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ database:
ldap:
url: ldap://dbildungs-iam-ldap.spsh-xxx.svc.cluster.local
bindDN: cn=admin,dc=schule-sh,dc=de
oeffentlicheSchulenDomain: schule-sh.de
ersatzschulenDomain: ersatzschule-sh.de

auth:
# existingSecret: Refers to a secret already present in the cluster, which is required.
Expand Down Expand Up @@ -70,8 +68,8 @@ backend:
memory: 200Mi
startupProbe:
enabled: true
initialDelaySeconds: 30
periodSeconds: 10
initialDelaySeconds: 60
periodSeconds: 60
failureThreshold: 5
httpGet:
scheme: 'HTTP'
Expand Down Expand Up @@ -130,7 +128,7 @@ backend:
# Reference: https://github.com/bitnami/charts/tree/main/bitnami/redis-cluster
redis-cluster:
enabled: true
persistence:
persistence:
enabled: false
size: 4Gi
image:
Expand Down Expand Up @@ -159,7 +157,7 @@ redis-cluster:
podLabels:
app.kubernetes.io/component: server-redis
commonLabels:
app.kubernetes.io/name: dbildungs-iam-server
app.kubernetes.io/name: dbildungs-iam-server
resources:
limits:
cpu: 300m
Expand All @@ -169,9 +167,14 @@ redis-cluster:
memory: 128Mi
metrics:
enabled: true

autoscaling:
enabled: false
minReplicas: 1
maxReplicas: 5
targetCPUUtilizationPercentage: 60
targetCPUUtilizationPercentage: 60

serviceMonitor:
enabled: true
path: "/api/metrics"
interval: 30s

0 comments on commit 5ce82bd

Please sign in to comment.