Skip to content
This repository has been archived by the owner on Mar 12, 2024. It is now read-only.

Commit

Permalink
Merge pull request #39 from mercedes-benz/chore/whitespace
Browse files Browse the repository at this point in the history
chore(daps): remove whitespace
  • Loading branch information
carslen authored Jun 7, 2023
2 parents f2f5fb8 + 4c7e9c6 commit dd8e0af
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 17 deletions.
13 changes: 5 additions & 8 deletions charts/daps-server/templates/configmap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ data:
- "securityProfile"
- "referringConnector"
omejdn.yml: |-
---
issuer: https://{{ .Values.ingress.host }}
Expand All @@ -74,15 +72,14 @@ data:
- https://{{ .Values.ingress.host }}{{ .Values.ingress.rootPath }}token
- idsc:IDS_CONNECTORS_ALL
access_token:
expiration: 3600
algorithm: RS256
expiration: 3600
algorithm: RS256
id_token:
expiration: 3600
algorithm: RS256
expiration: 3600
algorithm: RS256
user_backend:
- yaml
{{- if .Values.omejdn.createDefaultAdmin }}
clients.yml: |-
---
Expand Down
10 changes: 5 additions & 5 deletions charts/daps-server/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
securityContext:
{{- toYaml .Values.securityContext | nindent 10 }}
command:
command:
- "sh"
- "-c"
args:
Expand Down Expand Up @@ -133,14 +133,14 @@ spec:
#livenessProbe:
# httpGet:
# path: /.well-known/jwks.json
# port: http
# port: http
# scheme: HTTP
# failureThreshold: 3
# periodSeconds: 3
#readinessProbe:
# httpGet:
# path: /.well-known/jwks.json
# port: http
# port: http
# scheme: HTTP
# failureThreshold: 3
# periodSeconds: 1
Expand All @@ -161,7 +161,7 @@ spec:
- mountPath: {{ .Values.omejdn.serverKeyFolderPath }}/keys
name: config
subPath: keys
readOnly: false
readOnly: false
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand All @@ -174,7 +174,7 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}

volumes:
- name: config
persistentVolumeClaim:
Expand Down
4 changes: 1 addition & 3 deletions charts/daps-server/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
pathType: Prefix
backend:
{{- if semverCompare ">=1.20-0" .Capabilities.KubeVersion.GitVersion }}
service:
service:
name: {{ $svcName }}
port:
number: {{ $svcPort }}
Expand All @@ -49,7 +49,6 @@ spec:
{{- end }}
servicePort: {{ default $svcPort .port }}
{{- end }}

---
{{- if semverCompare ">=1.20-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1
Expand Down Expand Up @@ -86,5 +85,4 @@ spec:
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end }}

{{- end }}
2 changes: 1 addition & 1 deletion charts/daps-server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ env:
# -- Additional env variables
config: {}
# -- Additional env variables that should be stored in encrypted way
secret: {}
secret: {}

# -- Pod resources requests and limits configuration
resources:
Expand Down

0 comments on commit dd8e0af

Please sign in to comment.