Skip to content
Snippets Groups Projects
Commit 7d1dd805 authored by Martin Weise's avatar Martin Weise
Browse files

Merge branch 'master' into release-1.6

parents 84e932b5 c974fb2b
No related branches found
No related tags found
No related merge requests found
No preview for this file type
No preview for this file type
No preview for this file type
This diff is collapsed.
......@@ -6,6 +6,7 @@ metadata:
name: auth-service-setup-job
namespace: {{ include "common.names.namespace" . | quote }}
spec:
backoffLimit: {{ .Values.authservice.setupJob.backoffLimit | default "10" }}
template:
metadata:
name: auth-service-setup-job
......@@ -13,8 +14,8 @@ spec:
restartPolicy: OnFailure
containers:
- name: init
image: {{ .Values.authservice.init.image.name }}
imagePullPolicy: {{ .Values.authservice.init.image.pullPolicy | default "IfNotPresent" }}
image: {{ .Values.authservice.setupJob.image.name }}
imagePullPolicy: {{ .Values.authservice.setupJob.image.pullPolicy | default "IfNotPresent" }}
env:
- name: POD_IP
valueFrom:
......@@ -31,9 +32,9 @@ spec:
envFrom:
- secretRef:
name: auth-service-secret
{{- if .Values.authservice.init.resources }}
resources: {{- toYaml .Values.authservice.init.resources | nindent 12 }}
{{- else if ne .Values.authservice.init.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.authservice.init.resourcesPreset) | nindent 12 }}
{{- if .Values.authservice.setupJob.resources }}
resources: {{- toYaml .Values.authservice.setupJob.resources | nindent 12 }}
{{- else if ne .Values.authservice.setupJob.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.authservice.setupJob.resourcesPreset) | nindent 12 }}
{{- end }}
{{- end }}
......@@ -6,6 +6,7 @@ metadata:
name: storage-service-setup-job
namespace: {{ include "common.names.namespace" . | quote }}
spec:
backoffLimit: {{ .Values.storageservice.init.backoffLimit | default "10" }}
template:
metadata:
name: storage-service-setup-job
......
......@@ -129,9 +129,6 @@
"extraEnvVarsCM": {
"type": "string"
},
"extraStartupArgs": {
"type": "string"
},
"extraVolumeMounts": {
"items": {
"properties": {
......@@ -157,6 +154,14 @@
},
"type": "object"
},
"emptyDir": {
"properties": {
"sizeLimit": {
"type": "string"
}
},
"type": "object"
},
"name": {
"type": "string"
}
......@@ -176,21 +181,9 @@
},
"type": "object"
},
"init": {
"initdbScripts": {
"properties": {
"image": {
"properties": {
"name": {
"type": "string"
}
},
"type": "object"
},
"resources": {
"properties": {},
"type": "object"
},
"resourcesPreset": {
"import-realms.sh": {
"type": "string"
}
},
......@@ -237,6 +230,26 @@
"resourcesPreset": {
"type": "string"
},
"setupJob": {
"properties": {
"image": {
"properties": {
"name": {
"type": "string"
}
},
"type": "object"
},
"resources": {
"properties": {},
"type": "object"
},
"resourcesPreset": {
"type": "string"
}
},
"type": "object"
},
"tls": {
"properties": {
"enabled": {
......@@ -507,6 +520,14 @@
},
"extraEnvVarsSecret": {
"type": "string"
},
"updateStrategy": {
"properties": {
"type": {
"type": "string"
}
},
"type": "object"
}
},
"type": "object"
......
......@@ -89,8 +89,6 @@ authservice:
postgresPassword: postgres
## @param authservice.resourcesPreset The container resource presets
resourcesPreset: "small"
## @skip authservice.extraStartupArgs
extraStartupArgs: "--import-realm"
jwt:
## @param authservice.jwt.pubkey The JWT public key from the `dbrepo-client`.
pubkey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB"
......@@ -109,13 +107,19 @@ authservice:
id: dbrepo-client
## @param authservice.client.secret The client secret for the microservices.
secret: MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG
init:
## @skip authservice.initdbScripts
initdbScripts:
import-realms.sh: |
#!/bin/bash
kc.sh import --file /opt/keycloak/data/import/master-realm.json
kc.sh import --file /opt/keycloak/data/import/dbrepo-realm.json
setupJob:
image:
## @skip authservice.init.image.name
## @skip authservice.setupJob.image.name
name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.6.1
## @param authservice.init.resourcesPreset The container resource preset
## @param authservice.setupJob.resourcesPreset The container resource preset
resourcesPreset: "nano"
## @param authservice.init.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
## @param authservice.setupJob.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
resources: { }
## requests:
## cpu: 250m
......@@ -130,10 +134,15 @@ authservice:
- name: config-map
configMap:
name: auth-service-config
- name: cache
emptyDir:
sizeLimit: 100Mi
## @skip authservice.extraVolumeMounts
extraVolumeMounts:
- name: config-map
mountPath: /opt/bitnami/keycloak/data/import
mountPath: /opt/keycloak/data/import
- name: cache
mountPath: /bitnami/keycloak/
## @skip authservice.replicaCount The number of replicas.
replicaCount: 2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment