Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Hub setup wizard to Keycloak 26.x #121

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

Update Hub setup wizard to Keycloak 26.x #121

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24f0691
Update Hub setup wizard to Keycloak 25.x
SailReal Jan 28, 2025
4874008
Update Keycloak to 26.1.2
SailReal Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions assets/js/hubsetup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ ${e}`;
result += '# * KC_DB\n# * KC_HEALTH_ENABLED\n# * KC_HTTP_RELATIVE_PATH\n\n';
}

result += '# Generated using script version 6\n\n';
result += '# Generated using script version 7\n\n';

return result;
}
Expand Down Expand Up @@ -431,7 +431,7 @@ EOF`;
'init-config': {condition: 'service_completed_successfully'},
'postgres': {condition: 'service_healthy'}
},
image: 'ghcr.io/cryptomator/keycloak:24.0.4',
image: 'ghcr.io/cryptomator/keycloak:26.1.2',
command: startCmd,
volumes: ['kc-config:/opt/keycloak/data/import'],
deploy: {
Expand All @@ -441,7 +441,7 @@ EOF`;
},
...(!this.cfg.compose.includeTraefik && {ports: [`${this.getPort(this.cfg.keycloak.publicUrl)}:8080`]}),
healthcheck: {
test: ['CMD', 'curl', '-f', `http://localhost:8080${this.getPathname(HubSetup.urlWithTrailingSlash(this.cfg.keycloak.publicUrl))}health/live`],
test: ['CMD', 'curl', '-f', `http://localhost:9000${this.getPathname(HubSetup.urlWithTrailingSlash(this.cfg.keycloak.publicUrl))}health/live`],
interval: '60s',
timeout: '3s',
},
Expand All @@ -454,10 +454,10 @@ EOF`;
KC_DB_USERNAME: 'keycloak',
KC_DB_PASSWORD: this.cfg.db.keycloakPw,
KC_HEALTH_ENABLED: 'true',
KC_HOSTNAME: devMode ? null : this.getHostname(this.cfg.keycloak.publicUrl),
KC_HOSTNAME: devMode ? null : 'https://' + this.getHostname(this.cfg.keycloak.publicUrl),
// KC_HOSTNAME_PORT: devMode ? null : this.getPort(this.cfg.keycloak.publicUrl), // FIXME as string!! FIXME does not work at all!!
KC_HTTP_ENABLED: 'true',
KC_PROXY: 'edge',
KC_PROXY_HEADERS: 'xforwarded',
KC_HTTP_RELATIVE_PATH: this.getPathname(this.cfg.keycloak.publicUrl),
},
...(this.cfg.compose.includeTraefik && this.getTraefikConfig(this.cfg.keycloak.publicUrl, 'kc'))
Expand All @@ -478,7 +478,7 @@ EOF`;
},
...(!this.cfg.compose.includeTraefik && {ports: [`${this.getPort(this.cfg.hub.publicUrl)}:8080`]}),
healthcheck: {
test: ['CMD-SHELL', '(curl -f http://localhost:8080/q/health/live && curl -f http://localhost:8080/api/config) || exit 1'],
test: ['CMD-SHELL', '(curl -f http://localhost:9000/q/health/live && curl -f http://localhost:8080/api/config) || exit 1'],
interval: '10s',
timeout: '3s',
},
Expand Down Expand Up @@ -657,7 +657,7 @@ class KubernetesConfigBuilder extends ConfigBuilder {
args: [
'/bin/sh',
'-c',
`set -x; while ! wget -q --spider "http://keycloak-svc:8080${this.getPathname(HubSetup.urlWithTrailingSlash(this.cfg.keycloak.publicUrl))}health/live" 2>>/dev/null; do sleep 10; done`
`set -x; while ! wget -q --spider "http://keycloak-svc:9000${this.getPathname(HubSetup.urlWithTrailingSlash(this.cfg.keycloak.publicUrl))}health/live" 2>>/dev/null; do sleep 10; done`
]
}] : [])],
containers: [{
Expand Down Expand Up @@ -775,11 +775,11 @@ class KubernetesConfigBuilder extends ConfigBuilder {
{name: 'KC_DB_PASSWORD', valueFrom: {secretKeyRef: {name: 'hub-secrets', key: 'db_kc_pass'}}},
{name: 'KC_HEALTH_ENABLED', value: 'true'},
{name: 'KC_HTTP_ENABLED', value: 'true'},
{name: 'KC_PROXY', value: 'edge'},
{name: 'KC_PROXY_HEADERS', value: 'xforwarded'},
{name: 'KC_HTTP_RELATIVE_PATH', value: this.getPathname(this.cfg.keycloak.publicUrl)}
];
if (!devMode) {
env.push({name: 'KC_HOSTNAME', value: this.getHostname(this.cfg.keycloak.publicUrl)});
env.push({name: 'KC_HOSTNAME', value: 'https://' + this.getHostname(this.cfg.keycloak.publicUrl)});
// env.push({name: 'KC_HOSTNAME_PORT', value: '' + this.getPort(this.cfg.keycloak.publicUrl)}); // FIXME as string!! FIXME does not work at all!!
}
let deployment = {
Expand All @@ -803,20 +803,20 @@ class KubernetesConfigBuilder extends ConfigBuilder {
}],
containers: [{
name: 'keycloak',
image: 'ghcr.io/cryptomator/keycloak:24.0.4',
image: 'ghcr.io/cryptomator/keycloak:26.1.2',
command: startCmd,
ports: [{containerPort: 8080}],
resources: {
requests: {cpu: '25m', memory: '512Mi'},
limits: {cpu: '1000m', memory: '1024Mi'},
},
livenessProbe: {
httpGet: {path: `${this.getPathname(HubSetup.urlWithTrailingSlash(this.cfg.keycloak.publicUrl))}health/live`, port: 8080},
httpGet: {path: `${this.getPathname(HubSetup.urlWithTrailingSlash(this.cfg.keycloak.publicUrl))}health/live`, port: 9000},
initialDelaySeconds: 120,
periodSeconds: 60
},
readinessProbe: {
httpGet: {path: `${this.getPathname(HubSetup.urlWithTrailingSlash(this.cfg.keycloak.publicUrl))}health/ready`, port: 8080},
httpGet: {path: `${this.getPathname(HubSetup.urlWithTrailingSlash(this.cfg.keycloak.publicUrl))}health/ready`, port: 9000},
initialDelaySeconds: 10,
periodSeconds: 3
},
Expand Down Expand Up @@ -878,7 +878,8 @@ class KubernetesConfigBuilder extends ConfigBuilder {
spec: {
selector: {app: 'keycloak'},
ports: [
{protocol: 'TCP', port: 8080}
{protocol: 'TCP', port: 8080},
{protocol: 'TCP', port: 9000}
]
}
}
Expand Down