mirror of
https://github.com/ansible-middleware/keycloak.git
synced 2026-11-21 14:48:50 +00:00
Merge pull request #452 from Maestro157/bump/keycloak-26.8.1
Bump Keycloak to 26.8.1 and RHBK to 26.6.7
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
|
||||
- name: Download keycloak archive to controller directory
|
||||
ansible.builtin.get_url: # noqa risky-file-permissions delegated, uses controller host user
|
||||
url: https://github.com/keycloak/keycloak/releases/download/26.7.3/keycloak-26.7.3.zip
|
||||
url: https://github.com/keycloak/keycloak/releases/download/26.8.1/keycloak-26.8.1.zip
|
||||
dest: /tmp/keycloak
|
||||
mode: '0640'
|
||||
validate_certs: false
|
||||
@@ -38,7 +38,7 @@
|
||||
client_id: "{{ rhn_username }}"
|
||||
client_secret: "{{ rhn_password }}"
|
||||
product_type: DISTRIBUTION
|
||||
product_version: "{{ keycloak_quarkus_version | default('26.7.3') }}"
|
||||
product_version: "{{ keycloak_quarkus_version | default('26.8.1') }}"
|
||||
product_category: "RHBK"
|
||||
register: rhn_products
|
||||
no_log: "{{ omit_rhn_output | default(true) }}"
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
- name: Determine install zipfile from search results
|
||||
ansible.builtin.set_fact:
|
||||
rhn_matched_products: "{{ rhn_products.results | selectattr('file_name', 'match', '.*keycloak-' + (keycloak_quarkus_version | default('26.7.3')) + '.zip$') }}"
|
||||
rhn_matched_products: "{{ rhn_products.results | selectattr('file_name', 'match', '.*keycloak-' + (keycloak_quarkus_version | default('26.8.1')) + '.zip$') }}"
|
||||
delegate_to: localhost
|
||||
run_once: true
|
||||
when:
|
||||
@@ -60,7 +60,7 @@
|
||||
client_id: "{{ rhn_username }}"
|
||||
client_secret: "{{ rhn_password }}"
|
||||
product_id: "{{ (rhn_matched_products | first).id }}"
|
||||
dest: "/tmp/keycloak/keycloak-{{ keycloak_quarkus_version | default('26.7.3') }}.zip"
|
||||
dest: "/tmp/keycloak/keycloak-{{ keycloak_quarkus_version | default('26.8.1') }}.zip"
|
||||
no_log: "{{ omit_rhn_output | default(true) }}"
|
||||
delegate_to: localhost
|
||||
run_once: true
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
keycloak_quarkus_systemd_wait_for_delay: 2
|
||||
keycloak_quarkus_systemd_wait_for_log: true
|
||||
keycloak_quarkus_restart_health_check: false # would fail because of self-signed cert
|
||||
keycloak_quarkus_version: 26.7.3
|
||||
keycloak_quarkus_version: 26.8.1
|
||||
keycloak_quarkus_java_heap_opts: "-Xms1024m -Xmx1024m"
|
||||
keycloak_quarkus_additional_env_vars:
|
||||
- key: KC_FEATURES_DISABLED
|
||||
@@ -39,16 +39,16 @@
|
||||
- key: default-connection-pool-size
|
||||
value: 10
|
||||
- id: spid-saml
|
||||
url: https://github.com/italia/spid-keycloak-provider/releases/download/26.7.1/spid-provider.jar
|
||||
url: https://github.com/italia/spid-keycloak-provider/releases/download/26.8.1/spid-provider.jar
|
||||
- id: spid-saml-w-checksum
|
||||
url: https://github.com/italia/spid-keycloak-provider/releases/download/26.7.1/spid-provider.jar
|
||||
checksum: sha256:65c16bc70f36af26dac5ab1506b45120674fdf89106320ce00ff53bf6bf1243e
|
||||
url: https://github.com/italia/spid-keycloak-provider/releases/download/26.8.1/spid-provider.jar
|
||||
checksum: sha256:a499161de815156c50208efb6d550a63c64be443e3e494523d737781c5494688
|
||||
- id: keycloak-kerberos-federation
|
||||
maven:
|
||||
repository_url: https://repo1.maven.org/maven2/ # https://mvnrepository.com/artifact/org.keycloak/keycloak-kerberos-federation/24.0.4
|
||||
group_id: org.keycloak
|
||||
artifact_id: keycloak-kerberos-federation
|
||||
version: 26.7.3 # optional
|
||||
version: 26.8.1 # optional
|
||||
# username: myUser # optional
|
||||
# password: myPAT # optional
|
||||
# - id: my-static-theme
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
- name: Download keycloak archive to controller directory
|
||||
ansible.builtin.get_url: # noqa risky-file-permissions delegated, uses controller host user
|
||||
url: https://github.com/keycloak/keycloak/releases/download/26.7.3/keycloak-26.7.3.zip
|
||||
url: https://github.com/keycloak/keycloak/releases/download/26.8.1/keycloak-26.8.1.zip
|
||||
dest: /tmp/keycloak
|
||||
mode: '0640'
|
||||
validate_certs: false
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
keycloak_quarkus_additional_env_vars:
|
||||
- key: KC_FEATURES_DISABLED
|
||||
value: ciba,device-flow,impersonation,kerberos,docker
|
||||
keycloak_quarkus_version: 26.7.3
|
||||
keycloak_quarkus_version: 26.8.1
|
||||
roles:
|
||||
- role: keycloak_quarkus
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
- vars.yml
|
||||
vars:
|
||||
sudo_pkg_name: sudo
|
||||
keycloak_quarkus_version: 26.6.2
|
||||
keycloak_quarkus_version: 26.7.3
|
||||
keycloak_quarkus_additional_env_vars:
|
||||
- key: KC_FEATURES_DISABLED
|
||||
value: impersonation,kerberos
|
||||
|
||||
@@ -249,6 +249,21 @@ def normalise_org(org):
|
||||
return org
|
||||
|
||||
|
||||
def merge_domains(desired_domains, current_domains):
|
||||
"""Overlay the requested domain settings on the existing domain representations.
|
||||
Keys the module does not manage (for example autoRedirect, added in Keycloak 26.8)
|
||||
are kept as returned by the server, so they neither break the comparison nor get
|
||||
reset on update.
|
||||
"""
|
||||
current_by_name = {d.get("name"): d for d in current_domains or []}
|
||||
merged = []
|
||||
for domain in desired_domains:
|
||||
merged_domain = dict(current_by_name.get(domain["name"], {}))
|
||||
merged_domain.update(domain)
|
||||
merged.append(merged_domain)
|
||||
return sorted(merged, key=lambda d: d.get("name", ""))
|
||||
|
||||
|
||||
def main():
|
||||
argument_spec = keycloak_argument_spec()
|
||||
|
||||
@@ -334,6 +349,8 @@ def main():
|
||||
)
|
||||
continue
|
||||
old_value = before_org.get(camel(param))
|
||||
if param == "domains":
|
||||
new_param_value = merge_domains(new_param_value, old_value)
|
||||
if new_param_value != old_value:
|
||||
changeset[camel(param)] = new_param_value
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ Role Defaults
|
||||
|
||||
| Variable | Description | Default |
|
||||
|:---------|:------------|:--------|
|
||||
|`keycloak_quarkus_version`| keycloak.org package version | `26.7.3` |
|
||||
|`keycloak_quarkus_version`| keycloak.org package version | `26.8.1` |
|
||||
|`keycloak_quarkus_offline_install` | Perform an offline install | `False`|
|
||||
|`keycloak_quarkus_dest`| Installation root path | `/opt/keycloak` |
|
||||
|`keycloak_quarkus_download_url` | Download URL for keycloak | `https://github.com/keycloak/keycloak/releases/download/{{ keycloak_quarkus_version }}/{{ keycloak_quarkus_archive }}` |
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
---
|
||||
### Configuration specific to keycloak
|
||||
keycloak_quarkus_version: 26.7.3
|
||||
keycloak_quarkus_version: 26.8.1
|
||||
keycloak_quarkus_archive: "keycloak-{{ keycloak_quarkus_version }}.zip"
|
||||
keycloak_quarkus_download_url: "https://github.com/keycloak/keycloak/releases/download/{{ keycloak_quarkus_version }}/{{ keycloak_quarkus_archive }}"
|
||||
keycloak_quarkus_installdir: "{{ keycloak_quarkus_dest }}/keycloak-{{ keycloak_quarkus_version }}"
|
||||
|
||||
@@ -2,7 +2,7 @@ argument_specs:
|
||||
main:
|
||||
options:
|
||||
keycloak_quarkus_version:
|
||||
default: "26.7.3"
|
||||
default: "26.8.1"
|
||||
description: "keycloak.org package version"
|
||||
type: "str"
|
||||
keycloak_quarkus_archive:
|
||||
@@ -542,7 +542,7 @@ argument_specs:
|
||||
downstream:
|
||||
options:
|
||||
rhbk_version:
|
||||
default: "26.4.15"
|
||||
default: "26.6.7"
|
||||
description: "Red Hat Build of Keycloak version"
|
||||
type: "str"
|
||||
rhbk_archive:
|
||||
|
||||
Reference in New Issue
Block a user