From 76f3680c8d7735a6fc1fc3a8cf673084b1f8fe21 Mon Sep 17 00:00:00 2001
From: Marcello Teodori <151025+mteodori@users.noreply.github.com>
Date: Tue, 25 Jun 2024 13:34:05 +0200
Subject: [PATCH 1/7] HXOR-1508 Update kcadm to Keycloak 24.0.5

---
 .github/actions/setup-kcadm/action.yml       |  4 ++--
 .updatecli/values/github_releases/kcadm.yaml | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 .updatecli/values/github_releases/kcadm.yaml

diff --git a/.github/actions/setup-kcadm/action.yml b/.github/actions/setup-kcadm/action.yml
index b8510e009..2719d1496 100644
--- a/.github/actions/setup-kcadm/action.yml
+++ b/.github/actions/setup-kcadm/action.yml
@@ -4,7 +4,6 @@ inputs:
   version:
     description: 'Version of Keycloak'
     required: false
-    default: 17.0.1
 runs:
   using: "composite"
   steps:
@@ -15,4 +14,5 @@ runs:
         ln -s keycloak-$KEYCLOAK_VERSION keycloak && ln -s ${PWD}/keycloak/bin/kcadm.sh /usr/local/bin
         kcadm.sh help
       env:
-        KEYCLOAK_VERSION: ${{ inputs.version }}
+        KEYCLOAK_VERSION: ${{ inputs.version != '' && inputs.version || env.DEFAULT_RANCHER_CLI_VERSION }}
+        DEFAULT_KEYCLOAK_VERSION: '24.0.5'
diff --git a/.updatecli/values/github_releases/kcadm.yaml b/.updatecli/values/github_releases/kcadm.yaml
new file mode 100644
index 000000000..f1c132094
--- /dev/null
+++ b/.updatecli/values/github_releases/kcadm.yaml
@@ -0,0 +1,11 @@
+github:
+  prefix: 'build(deps)'
+  message: 'bump kcadm to {{ source "lastRelease" }}'
+
+github_release:
+  owner: 'keycloak'
+  repo: 'keycloak'
+
+target:
+  file: '.github/actions/setup-kcadm/action.yml'
+  key: '$.runs.steps[0].env.DEFAULT_KEYCLOAK_VERSION'

From 2c320d55746cf61ba1cea6ec414690adc37bc9d5 Mon Sep 17 00:00:00 2001
From: Marcello Teodori <151025+mteodori@users.noreply.github.com>
Date: Tue, 25 Jun 2024 13:45:36 +0200
Subject: [PATCH 2/7] fix

---
 .github/actions/setup-kcadm/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-kcadm/action.yml b/.github/actions/setup-kcadm/action.yml
index 2719d1496..0eac11843 100644
--- a/.github/actions/setup-kcadm/action.yml
+++ b/.github/actions/setup-kcadm/action.yml
@@ -15,4 +15,4 @@ runs:
         kcadm.sh help
       env:
         KEYCLOAK_VERSION: ${{ inputs.version != '' && inputs.version || env.DEFAULT_RANCHER_CLI_VERSION }}
-        DEFAULT_KEYCLOAK_VERSION: '24.0.5'
+        DEFAULT_KEYCLOAK_VERSION: 24.0.5

From ccca30b4d5d920cf1a4a4e45245e2fb6aa2063f3 Mon Sep 17 00:00:00 2001
From: Marcello Teodori <151025+mteodori@users.noreply.github.com>
Date: Tue, 25 Jun 2024 13:46:51 +0200
Subject: [PATCH 3/7] fix

---
 .github/workflows/updatecli.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml
index daa169c14..83af4f4da 100644
--- a/.github/workflows/updatecli.yml
+++ b/.github/workflows/updatecli.yml
@@ -38,7 +38,7 @@ jobs:
       - uses: updatecli/updatecli-action@eb158f6fd9e425b940a6750d6318f98e050ac390 # v2.61.0
 
       - name: Run Updatecli
-        run: "updatecli apply --config .updatecli/templates/github_releases.yaml --values .updatecli/values/github_releases/${{ matrix.file }}"
+        run: "updatecli apply -c .updatecli/templates/github_releases.yaml -v .updatecli/values/github_releases/${{ matrix.file }}"
         env:
           UPDATECLI_GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           USERNAME: ${{ github.actor }}

From a1663224d0b2a3d36f7f3ea044c01ba9eaaca61e Mon Sep 17 00:00:00 2001
From: Marcello Teodori <151025+mteodori@users.noreply.github.com>
Date: Tue, 25 Jun 2024 13:49:43 +0200
Subject: [PATCH 4/7] fix

---
 version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.txt b/version.txt
index d552e7ed1..e2339e91c 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v5.29.5
+v5.29.6

From ccef1af7a0988ea904fa69761a55d4d741666f29 Mon Sep 17 00:00:00 2001
From: Marcello Teodori <151025+mteodori@users.noreply.github.com>
Date: Tue, 25 Jun 2024 13:54:47 +0200
Subject: [PATCH 5/7] fix

---
 .github/actions/setup-kcadm/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-kcadm/action.yml b/.github/actions/setup-kcadm/action.yml
index 0eac11843..fd354b4bd 100644
--- a/.github/actions/setup-kcadm/action.yml
+++ b/.github/actions/setup-kcadm/action.yml
@@ -10,9 +10,9 @@ runs:
     - name: Setup kcadm
       shell: bash
       run: |
+        KEYCLOAK_VERSION=${{ inputs.version != '' && inputs.version || env.DEFAULT_RANCHER_CLI_VERSION }}
         curl -fsSL https://github.com/keycloak/keycloak/releases/download/${KEYCLOAK_VERSION}/keycloak-${KEYCLOAK_VERSION}.tar.gz | tar xz
         ln -s keycloak-$KEYCLOAK_VERSION keycloak && ln -s ${PWD}/keycloak/bin/kcadm.sh /usr/local/bin
         kcadm.sh help
       env:
-        KEYCLOAK_VERSION: ${{ inputs.version != '' && inputs.version || env.DEFAULT_RANCHER_CLI_VERSION }}
         DEFAULT_KEYCLOAK_VERSION: 24.0.5

From 4a9b044a7e03e2f43a409294e1a4e50fcc962bb7 Mon Sep 17 00:00:00 2001
From: Marcello Teodori <151025+mteodori@users.noreply.github.com>
Date: Tue, 25 Jun 2024 14:03:48 +0200
Subject: [PATCH 6/7] fix

---
 .github/actions/setup-kcadm/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-kcadm/action.yml b/.github/actions/setup-kcadm/action.yml
index fd354b4bd..54df89c64 100644
--- a/.github/actions/setup-kcadm/action.yml
+++ b/.github/actions/setup-kcadm/action.yml
@@ -10,9 +10,9 @@ runs:
     - name: Setup kcadm
       shell: bash
       run: |
-        KEYCLOAK_VERSION=${{ inputs.version != '' && inputs.version || env.DEFAULT_RANCHER_CLI_VERSION }}
         curl -fsSL https://github.com/keycloak/keycloak/releases/download/${KEYCLOAK_VERSION}/keycloak-${KEYCLOAK_VERSION}.tar.gz | tar xz
         ln -s keycloak-$KEYCLOAK_VERSION keycloak && ln -s ${PWD}/keycloak/bin/kcadm.sh /usr/local/bin
         kcadm.sh help
       env:
         DEFAULT_KEYCLOAK_VERSION: 24.0.5
+        KEYCLOAK_VERSION: ${{ inputs.version != '' && inputs.version || env.DEFAULT_KEYCLOAK_VERSION }}

From da96fc265c59169f2fce72dac9975a77f26db65c Mon Sep 17 00:00:00 2001
From: Marcello Teodori <151025+mteodori@users.noreply.github.com>
Date: Tue, 25 Jun 2024 14:08:01 +0200
Subject: [PATCH 7/7] fix

---
 .github/actions/setup-kcadm/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-kcadm/action.yml b/.github/actions/setup-kcadm/action.yml
index 54df89c64..b226c8cef 100644
--- a/.github/actions/setup-kcadm/action.yml
+++ b/.github/actions/setup-kcadm/action.yml
@@ -10,9 +10,9 @@ runs:
     - name: Setup kcadm
       shell: bash
       run: |
+        KEYCLOAK_VERSION=${{ inputs.version != '' && inputs.version || env.DEFAULT_KEYCLOAK_VERSION }}
         curl -fsSL https://github.com/keycloak/keycloak/releases/download/${KEYCLOAK_VERSION}/keycloak-${KEYCLOAK_VERSION}.tar.gz | tar xz
         ln -s keycloak-$KEYCLOAK_VERSION keycloak && ln -s ${PWD}/keycloak/bin/kcadm.sh /usr/local/bin
         kcadm.sh help
       env:
         DEFAULT_KEYCLOAK_VERSION: 24.0.5
-        KEYCLOAK_VERSION: ${{ inputs.version != '' && inputs.version || env.DEFAULT_KEYCLOAK_VERSION }}