Skip to content
Snippets Groups Projects
Verified Commit 1fc439a3 authored by Martin Weise's avatar Martin Weise
Browse files
parent 9715320a
No related branches found
No related tags found
1 merge request!374Bumped version of DBRepo
File added
...@@ -14,9 +14,8 @@ if (process.env.NODE_ENV === 'development') { ...@@ -14,9 +14,8 @@ if (process.env.NODE_ENV === 'development') {
'^/pid': '/pid' '^/pid': '/pid'
} }
} }
process.env.VERSION = 'bun-dev'
process.env.NUXT_PUBLIC_API_SERVER = api process.env.NUXT_PUBLIC_API_SERVER = api
process.env.NUXT_OIDC_PROVIDERS_KEYCLOAK_REDIRECT_URI = api + ':3001/auth/keycloak/callback'
process.env.NUXT_OIDC_PROVIDERS_KEYCLOAK_LOGOUT_REDIRECT_URI = api + ':3001'
} }
/** /**
...@@ -114,7 +113,7 @@ export default defineNuxtConfig({ ...@@ -114,7 +113,7 @@ export default defineNuxtConfig({
providers: { providers: {
keycloak: { keycloak: {
clientId: '', clientId: '',
clientSecret: '', // inject on runtime clientSecret: '',
authorizationUrl: '', authorizationUrl: '',
userInfoUrl: '', userInfoUrl: '',
tokenUrl: '', tokenUrl: '',
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"type": "module", "type": "module",
"scripts": { "scripts": {
"build": "nuxt build", "build": "nuxt build",
"dev": "VERSION=bun-dev NUXT_OIDC_PROVIDERS_KEYCLOAK_CLIENT_SECRET=MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG NODE_ENV=development nuxt dev", "dev": "NODE_ENV=development nuxt dev",
"generate": "nuxt generate", "generate": "nuxt generate",
"preview": "nuxt preview", "preview": "nuxt preview",
"postinstall": "nuxt prepare", "postinstall": "nuxt prepare",
......
...@@ -44,6 +44,12 @@ export default { ...@@ -44,6 +44,12 @@ export default {
cacheUser () { cacheUser () {
return this.cacheStore.getUser return this.cacheStore.getUser
}, },
roles () {
return this.cacheStore.getRoles
},
access () {
return this.cacheStore.getAccess
},
isOwner () { isOwner () {
if (!this.database || !this.cacheUser) { if (!this.database || !this.cacheUser) {
return false return false
......
File added
...@@ -4,6 +4,9 @@ kind: ConfigMap ...@@ -4,6 +4,9 @@ kind: ConfigMap
metadata: metadata:
name: auth-service-config name: auth-service-config
namespace: {{ include "common.names.namespace" . | quote }} namespace: {{ include "common.names.namespace" . | quote }}
binaryData:
create-event-listener.jar: |-
{{ .Files.Get "files/create-event-listener.jar" | b64enc }}
data: data:
dbrepo-realm.json: |- dbrepo-realm.json: |-
{ {
......
...@@ -11,6 +11,8 @@ stringData: ...@@ -11,6 +11,8 @@ stringData:
AUTH_SERVICE_ENDPOINT: "{{ .Values.authservice.endpoint }}" AUTH_SERVICE_ENDPOINT: "{{ .Values.authservice.endpoint }}"
METADATA_DB: "{{ .Values.metadatadb.db.name }}" METADATA_DB: "{{ .Values.metadatadb.db.name }}"
METADATA_DB_PASSWORD: "{{ .Values.metadatadb.rootUser.password }}" METADATA_DB_PASSWORD: "{{ .Values.metadatadb.rootUser.password }}"
METADATA_SERVICE_ENDPOINT: "{{ .Values.metadataservice.endpoint }}/api/user"
METADATA_USERNAME: "{{ .Values.metadatadb.rootUser.user }}" METADATA_USERNAME: "{{ .Values.metadatadb.rootUser.user }}"
SYSTEM_USERNAME: "{{ .Values.identityservice.users }}" SYSTEM_USERNAME: "{{ .Values.identityservice.users }}"
SYSTEM_PASSWORD: "{{ .Values.identityservice.userPasswords }}"
{{- end }} {{- end }}
...@@ -44,7 +44,7 @@ data: ...@@ -44,7 +44,7 @@ data:
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://auth-service; proxy_pass https://auth-service;
proxy_read_timeout 90; proxy_read_timeout 90;
} }
...@@ -53,7 +53,7 @@ data: ...@@ -53,7 +53,7 @@ data:
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://auth-service; proxy_pass https://auth-service;
proxy_read_timeout 90; proxy_read_timeout 90;
} }
......
...@@ -87,6 +87,7 @@ authservice: ...@@ -87,6 +87,7 @@ authservice:
fullnameOverride: auth-db fullnameOverride: auth-db
auth: auth:
postgresPassword: postgres postgresPassword: postgres
production: true
## @param authservice.resourcesPreset The container resource presets ## @param authservice.resourcesPreset The container resource presets
resourcesPreset: "small" resourcesPreset: "small"
jwt: jwt:
...@@ -127,8 +128,8 @@ authservice: ...@@ -127,8 +128,8 @@ authservice:
## limits: ## limits:
## cpu: 500m ## cpu: 500m
## memory: 1024Mi ## memory: 1024Mi
## @skip authservice.extraEnvVarsCM ## @skip authservice.extraEnvVarsSecret
extraEnvVarsCM: auth-service-config extraEnvVarsSecret: auth-service-secret
## @skip authservice.extraVolumes ## @skip authservice.extraVolumes
extraVolumes: extraVolumes:
- name: config-map - name: config-map
...@@ -140,7 +141,14 @@ authservice: ...@@ -140,7 +141,14 @@ authservice:
## @skip authservice.extraVolumeMounts ## @skip authservice.extraVolumeMounts
extraVolumeMounts: extraVolumeMounts:
- name: config-map - name: config-map
mountPath: /opt/keycloak/data/import mountPath: /opt/keycloak/data/import/dbrepo-realm.json
subPath: dbrepo-realm.json
- name: config-map
mountPath: /opt/keycloak/data/import/master-realm.json
subPath: master-realm.json
- name: config-map
mountPath: /opt/bitnami/keycloak/providers/create-event-listener.jar
subPath: create-event-listener.jar
- name: cache - name: cache
mountPath: /bitnami/keycloak/ mountPath: /bitnami/keycloak/
## @skip authservice.replicaCount The number of replicas. ## @skip authservice.replicaCount The number of replicas.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment