Skip to content

Commit fd7ee00

Browse files
authored
upgrade keycloak to v20 (#897)
* keycloak in dev now v20 * tested - dev realm json works has openid * adding openid to realm.json for kubernetes deployments
1 parent d76b2c4 commit fd7ee00

File tree

8 files changed

+71
-12
lines changed

8 files changed

+71
-12
lines changed

deployments/kubernetes/charts/clowder2/files/realm.json

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@
197197
"acr",
198198
"roles",
199199
"profile",
200-
"email"
200+
"email",
201+
"openid"
201202
],
202203
"optionalClientScopes": [
203204
"address",
@@ -472,6 +473,18 @@
472473
}
473474
]
474475
},
476+
{
477+
"id": "27b15f8c-ea65-4288-bfd5-bd88eb1d05cf",
478+
"name": "openid",
479+
"description": "",
480+
"protocol": "openid-connect",
481+
"attributes": {
482+
"include.in.token.scope": "true",
483+
"display.on.consent.screen": "true",
484+
"gui.order": "",
485+
"consent.screen.text": ""
486+
}
487+
},
475488
{
476489
"id": "9489cfcc-4415-4d08-a792-988d995a3edb",
477490
"name": "web-origins",
@@ -942,7 +955,8 @@
942955
"email",
943956
"roles",
944957
"web-origins",
945-
"acr"
958+
"acr",
959+
"openid"
946960
],
947961
"defaultOptionalClientScopes": [
948962
"offline_access",

docker-compose.dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ services:
7575
POSTGRES_PASSWORD: password
7676

7777
keycloak:
78-
image: quay.io/keycloak/keycloak:19.0
78+
image: quay.io/keycloak/keycloak:20.0
7979
volumes:
8080
- ./scripts/keycloak/clowder-realm-dev.json:/opt/keycloak/data/import/realm.json:ro
8181
- ./scripts/keycloak/clowder-theme/:/opt/keycloak/themes/clowder-theme/:ro

scripts/keycloak/clowder-realm-dev.json

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,8 @@
332332
"web-origins",
333333
"roles",
334334
"profile",
335-
"email"
335+
"email",
336+
"openid"
336337
],
337338
"optionalClientScopes": [
338339
"address",
@@ -506,6 +507,18 @@
506507
}
507508
]
508509
},
510+
{
511+
"id": "27b15f8c-ea65-4288-bfd5-bd88eb1d05cf",
512+
"name": "openid",
513+
"description": "",
514+
"protocol": "openid-connect",
515+
"attributes": {
516+
"include.in.token.scope": "true",
517+
"display.on.consent.screen": "true",
518+
"gui.order": "",
519+
"consent.screen.text": ""
520+
}
521+
},
509522
{
510523
"id": "aeeafc25-f5bc-4f8d-88c5-0b4150415d50",
511524
"name": "roles",
@@ -931,7 +944,8 @@
931944
"profile",
932945
"email",
933946
"roles",
934-
"web-origins"
947+
"web-origins",
948+
"openid"
935949
],
936950
"defaultOptionalClientScopes": [
937951
"offline_access",

scripts/keycloak/clowder-realm-prod.json

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,8 @@
610610
"web-origins",
611611
"roles",
612612
"profile",
613-
"email"
613+
"email",
614+
"openid"
614615
],
615616
"optionalClientScopes": [
616617
"address",
@@ -807,6 +808,18 @@
807808
}
808809
]
809810
},
811+
{
812+
"id": "27b15f8c-ea65-4288-bfd5-bd88eb1d05cf",
813+
"name": "openid",
814+
"description": "",
815+
"protocol": "openid-connect",
816+
"attributes": {
817+
"include.in.token.scope": "true",
818+
"display.on.consent.screen": "true",
819+
"gui.order": "",
820+
"consent.screen.text": ""
821+
}
822+
},
810823
{
811824
"id": "aeeafc25-f5bc-4f8d-88c5-0b4150415d50",
812825
"name": "roles",
@@ -1234,7 +1247,8 @@
12341247
"email",
12351248
"roles",
12361249
"web-origins",
1237-
"acr"
1250+
"acr",
1251+
"openid"
12381252
],
12391253
"defaultOptionalClientScopes": [
12401254
"offline_access",

scripts/keycloak/full-kube-clowder-realm-prod.json

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,8 @@
316316
"web-origins",
317317
"roles",
318318
"profile",
319-
"email"
319+
"email",
320+
"openid"
320321
],
321322
"optionalClientScopes": [
322323
"address",
@@ -472,6 +473,18 @@
472473
}
473474
]
474475
},
476+
{
477+
"id": "27b15f8c-ea65-4288-bfd5-bd88eb1d05cf",
478+
"name": "openid",
479+
"description": "",
480+
"protocol": "openid-connect",
481+
"attributes": {
482+
"include.in.token.scope": "true",
483+
"display.on.consent.screen": "true",
484+
"gui.order": "",
485+
"consent.screen.text": ""
486+
}
487+
},
475488
{
476489
"id": "9489cfcc-4415-4d08-a792-988d995a3edb",
477490
"name": "web-origins",
@@ -942,7 +955,8 @@
942955
"email",
943956
"roles",
944957
"web-origins",
945-
"acr"
958+
"acr",
959+
"openid"
946960
],
947961
"defaultOptionalClientScopes": [
948962
"offline_access",

scripts/keycloak/mini-clowder-realm-dev.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
"web-origins",
6262
"roles",
6363
"profile",
64-
"email"
64+
"email",
65+
"openid"
6566
],
6667
"optionalClientScopes": [
6768
"address",

scripts/keycloak/mini-clowder-realm-prod.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@
6363
"web-origins",
6464
"roles",
6565
"profile",
66-
"email"
66+
"email",
67+
"openid"
6768
],
6869
"optionalClientScopes": [
6970
"address",

scripts/keycloak/mini-kube-clowder-realm-prod.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
"web-origins",
3737
"roles",
3838
"profile",
39-
"email"
39+
"email",
40+
"openid"
4041
],
4142
"optionalClientScopes": [
4243
"address",

0 commit comments

Comments
 (0)