Preparing release branch for KC23

Signed-off-by: Alexander Schwartz <[email protected]>
keycloak · Jan 16, 2024 · bfb39d8 · bfb39d8
1 parent 7a86701
commit bfb39d8
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -66,6 +66,7 @@ jobs:
           prerelease: true
           body: |
             Latest version built from the `${{ github.ref_name }}` branch.
+            Use this branch for Keycloak releases up to 23.x.
       - name: Publish dataset
         uses: actions/upload-release-asset@v1
         env:

diff --git a/ansible/env_example.yml b/ansible/env_example.yml
@@ -11,6 +11,6 @@ instance_volume_size: 30
 # kcb_version: 0.9-SNAPSHOT
 
 # This will use a locally built version
-kcb_zip: ../benchmark/target/keycloak-benchmark-0.10-SNAPSHOT.zip
+kcb_zip: ../benchmark/target/keycloak-benchmark-0.11-SNAPSHOT.zip
 
 kcb_heap_size: 1G
diff --git a/ansible/env_rosa_benchmark.yml b/ansible/env_rosa_benchmark.yml
@@ -1,5 +1,5 @@
 # Setting use for ROSA default benchmark
 cluster_size: 5
-kcb_zip: ../benchmark/target/keycloak-benchmark-0.10-SNAPSHOT.zip
+kcb_zip: ../benchmark/target/keycloak-benchmark-0.11-SNAPSHOT.zip
 # GitHub actions seem to use different IP addresses for a single runner, which would then be rejected
 cidr_ip: '0.0.0.0/0'
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.keycloak.benchmark</groupId>
     <artifactId>keycloak-benchmark</artifactId>
-    <version>0.10-SNAPSHOT</version>
+    <version>0.11-SNAPSHOT</version>
 
     <properties>
         <scala.version>2.12.10</scala.version>

diff --git a/dataset/pom.xml b/dataset/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-benchmark-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>0.10-SNAPSHOT</version>
+        <version>0.11-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/doc/benchmark/modules/ROOT/pages/report/rosa-benchmark-key-results.adoc b/doc/benchmark/modules/ROOT/pages/report/rosa-benchmark-key-results.adoc
@@ -149,7 +149,7 @@ See xref:run/running-benchmark-ansible.adoc[] for details.
 cluster_size: 5
 instance_type: t3.small
 instance_volume_size: 30
-kcb_zip: ../benchmark/target/keycloak-benchmark-0.10-SNAPSHOT.zip
+kcb_zip: ../benchmark/target/keycloak-benchmark-0.11-SNAPSHOT.zip
 kcb_heap_size: 1G
 ----
 

diff --git a/doc/benchmark/modules/ROOT/pages/run/running-benchmark-ansible.adoc b/doc/benchmark/modules/ROOT/pages/run/running-benchmark-ansible.adoc
@@ -122,7 +122,7 @@ Use the file `link:{github-files}/ansible/env_example.yml[env_example.yaml]` as
 .Example contents to configure the benchmark execution via `env.yml`
 [source,yaml]
 ----
-kcb_zip: ../benchmark/target/keycloak-benchmark-0.10-SNAPSHOT.zip
+kcb_zip: ../benchmark/target/keycloak-benchmark-0.11-SNAPSHOT.zip
 kcb_heap_size: 1G
 ----
 

diff --git a/doc/kubernetes/modules/ROOT/pages/util/custom-image-for-keycloak.adoc b/doc/kubernetes/modules/ROOT/pages/util/custom-image-for-keycloak.adoc
@@ -27,7 +27,7 @@ KC_CONTAINER_IMAGE=quay.io/keycloak/keycloak:20.0.1
 == Building a custom Keycloak image for minikube
 
 . Check out https://github.com/keycloak/keycloak[Keycloak's Git repository].
-. Build using `mvn clean install -DskipTests -am -pl quarkus/dist` to create a `keycloak-999.0.0-SNAPSHOT.tar.gz` in folder `/quarkus/dist/target`.
+. Build using `mvn clean install -DskipTests -am -pl quarkus/dist` to create a `keycloak-23.0.4.tar.gz` in folder `/quarkus/dist/target`.
 . Configure the Minikube environment to use the locally built image.
 +
 .Example entry in the `.env` file
@@ -66,7 +66,7 @@ task
 == Building a custom Keycloak image for OpenShift
 
 . Check out https://github.com/keycloak/keycloak[Keycloak's Git repository].
-. Build using `mvn clean install -DskipTests -am -pl quarkus/dist` to create a `keycloak-999.0.0-SNAPSHOT.tar.gz` in folder `/quarkus/dist/target`.
+. Build using `mvn clean install -DskipTests -am -pl quarkus/dist` to create a `keycloak-23.0.4.tar.gz` in folder `/quarkus/dist/target`.
 . Build the container using https://docs.openshift.com/container-platform/4.14/cicd/builds/creating-build-inputs.html[OpenShift's binary build].
 +
 [source,bash]
@@ -99,7 +99,7 @@ task
 == Building a custom Keycloak image for generic Kubernetes
 
 . Check out https://github.com/keycloak/keycloak[Keycloak's Git repository].
-. Build using `mvn clean install -DskipTests -am -pl quarkus/dist` to create a `keycloak-999.0.0-SNAPSHOT.tar.gz` in folder `/quarkus/dist/target`.
+. Build using `mvn clean install -DskipTests -am -pl quarkus/dist` to create a `keycloak-23.0.4.tar.gz` in folder `/quarkus/dist/target`.
 . Build the container, either with Podman or with Docker.
 +
 In the following examples, replace `quay.io` and `quay.io/namespace/repository:tag` with the registry and the image name you are using.

diff --git a/pom.xml b/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.keycloak</groupId>
   <artifactId>keycloak-benchmark-parent</artifactId>
-  <version>0.10-SNAPSHOT</version>
+  <version>0.11-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Keycloak Benchmark Parent</name>
   <description>Keycloak Benchmark Parent</description>
 
   <properties>
-    <keycloak.version>999.0.0-SNAPSHOT</keycloak.version>
+    <keycloak.version>23.0.4</keycloak.version>
     <junit5.version>5.9.3</junit5.version>
     <httpclient.version>4.5.14</httpclient.version>
     <maven.surefire.plugin.version>3.1.2</maven.surefire.plugin.version>

diff --git a/provision/common/Taskfile.yaml b/provision/common/Taskfile.yaml
@@ -9,7 +9,7 @@ vars:
   KC_DB_POOL_MAX_SIZE: '{{default "10" .KC_DB_POOL_MAX_SIZE}}'
   KC_DB_POOL_MIN_SIZE: '{{default "5" .KC_DB_POOL_MIN_SIZE}}'
   KC_DATABASE: '{{default "postgres" .KC_DATABASE}}'
-  KC_OPERATOR_TAG: '{{default "nightly" .KC_OPERATOR_TAG}}'
+  KC_OPERATOR_TAG: '{{default "23.0.4" .KC_OPERATOR_TAG}}'
   KC_CONTAINER_IMAGE: '{{default "" .KC_CONTAINER_IMAGE}}'
   KC_INSTANCES: '{{default "1" .KC_INSTANCES}}'
   KC_CPU_REQUESTS: '{{default "0" .KC_CPU_REQUESTS}}'
@@ -156,7 +156,7 @@ tasks:
       - mkdir -p keycloak-cli
       - rm -f keycloak-cli/*.zip
       - >
-        curl -L -f https://github.com/keycloak/keycloak/releases/download/nightly/keycloak-999.0.0-SNAPSHOT.zip -o keycloak-cli/keycloak.zip
+        curl -L -f https://github.com/keycloak/keycloak/releases/download/23.0.4/keycloak-23.0.4.zip -o keycloak-cli/keycloak.zip
     status:
       - find keycloak-cli/keycloak.zip -mtime +1 -exec false {} +
     sources:
@@ -169,11 +169,11 @@ tasks:
     dir: ..
     cmds:
       # remove temporary folders to be extra safe
-      - rm -rf keycloak-cli/keycloak-999.0.0-SNAPSHOT
+      - rm -rf keycloak-cli/keycloak-23.0.4
       - rm -rf keycloak-cli/keycloak
       - unzip -o -q keycloak-cli/keycloak.zip -d keycloak-cli
       # the output folder depends on the version we're about to unpack
-      - mv keycloak-cli/keycloak-999.0.0-SNAPSHOT keycloak-cli/keycloak
+      - mv keycloak-cli/keycloak-23.0.4 keycloak-cli/keycloak
     sources:
       - keycloak-cli/keycloak.zip
       - minikube/.task/subtask-{{.TASK}}.yaml

diff --git a/provision/rosa-cross-dc/keycloak-benchmark-crossdc-tests/pom.xml b/provision/rosa-cross-dc/keycloak-benchmark-crossdc-tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.keycloak</groupId>
         <artifactId>keycloak-benchmark-parent</artifactId>
-        <version>0.10-SNAPSHOT</version>
+        <version>0.11-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>