diff --git a/charts/daps-server/templates/configmap.yml b/charts/daps-server/templates/configmap.yml index 53076fb..d7738cd 100644 --- a/charts/daps-server/templates/configmap.yml +++ b/charts/daps-server/templates/configmap.yml @@ -59,8 +59,6 @@ data: - "securityProfile" - "referringConnector" - - omejdn.yml: |- --- issuer: https://{{ .Values.ingress.host }} @@ -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: |- --- diff --git a/charts/daps-server/templates/deployment.yaml b/charts/daps-server/templates/deployment.yaml index b0bbd66..0c3f158 100644 --- a/charts/daps-server/templates/deployment.yaml +++ b/charts/daps-server/templates/deployment.yaml @@ -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: @@ -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 @@ -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 }} @@ -174,7 +174,7 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} - + volumes: - name: config persistentVolumeClaim: diff --git a/charts/daps-server/templates/ingress.yaml b/charts/daps-server/templates/ingress.yaml index f33c4b1..3e6b0e9 100644 --- a/charts/daps-server/templates/ingress.yaml +++ b/charts/daps-server/templates/ingress.yaml @@ -37,7 +37,7 @@ spec: pathType: Prefix backend: {{- if semverCompare ">=1.20-0" .Capabilities.KubeVersion.GitVersion }} - service: + service: name: {{ $svcName }} port: number: {{ $svcPort }} @@ -49,7 +49,6 @@ spec: {{- end }} servicePort: {{ default $svcPort .port }} {{- end }} - --- {{- if semverCompare ">=1.20-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1 @@ -86,5 +85,4 @@ spec: serviceName: {{ $fullName }} servicePort: {{ $svcPort }} {{- end }} - {{- end }} diff --git a/charts/daps-server/values.yaml b/charts/daps-server/values.yaml index d9ff264..13d3e41 100644 --- a/charts/daps-server/values.yaml +++ b/charts/daps-server/values.yaml @@ -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: