Skip to content

Commit

Permalink
Creating the release branch to run with Keycloak 25.x.
Browse files Browse the repository at this point in the history
Signed-off-by: Kamesh Akella <[email protected]>
  • Loading branch information
kami619 committed Jun 26, 2024
1 parent 077679e commit 23e227b
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
gh release create ${{ steps.get_version.outputs.VERSION }}
--target ${{ github.ref }}
--title 'Keycloak Benchmark ${{ steps.get_version.outputs.VERSION }}'
--notes 'Latest version built from the `${{ github.ref_name }}` branch.'
--notes 'Latest version built from the `${{ github.ref_name }}` branch.<br>Use this with Keycloak 25.x'
--prerelease
./dataset/target/keycloak-benchmark-dataset-${{ steps.get_version.outputs.VERSION }}.jar
./benchmark/target/keycloak-benchmark-${{ steps.get_version.outputs.VERSION }}.zip
Expand Down
2 changes: 1 addition & 1 deletion doc/benchmark/antora.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
title: Benchmark Guide
name: benchmark-guide
version: '0.10'
version: '0.13'
nav:
- modules/ROOT/nav.adoc
2 changes: 1 addition & 1 deletion doc/dataset/antora.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
title: Dataset Guide
name: dataset-guide
version: '0.10'
version: '0.13'
nav:
- modules/ROOT/nav.adoc

2 changes: 1 addition & 1 deletion doc/kubernetes/antora.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
title: Kubernetes Guide
name: kubernetes-guide
version: '0.10'
version: '0.13'
nav:
- modules/ROOT/nav.adoc
ext:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ To configure the deployment, see xref:customizing-deployment.adoc[] for details.

=== Installing Keycloak from the Operator Hub

By default the operator is installed directly via https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/refs/tags/nightly/kubernetes/kubernetes.yml[`keycloak-k8s-resources`].
By default the operator is installed directly via https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/refs/tags/25.0.1/kubernetes/kubernetes.yml[`keycloak-k8s-resources`].

To install the operator from the _Operator Hub_ using the _Operator Lifecycle Manager_ set:
[source,shell]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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-25.0.1.tar.gz` in folder `/quarkus/dist/target`.
. Configure the Minikube environment to use the locally built image.
+
.Example entry in the `.env` file
Expand Down Expand Up @@ -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-25.0.1.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]
Expand Down Expand Up @@ -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-25.0.1.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.
Expand Down
8 changes: 4 additions & 4 deletions provision/common/Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 "25.0.1" .KC_OPERATOR_TAG}}'
KC_CONTAINER_IMAGE: '{{default "" .KC_CONTAINER_IMAGE}}'
KC_INSTANCES: '{{default "1" .KC_INSTANCES}}'
KC_CPU_REQUESTS: '{{default "0" .KC_CPU_REQUESTS}}'
Expand Down Expand Up @@ -194,7 +194,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/25.0.1/keycloak-25.0.1.zip -o keycloak-cli/keycloak.zip
status:
- find keycloak-cli/keycloak.zip -mtime +1 -exec false {} +
sources:
Expand All @@ -207,11 +207,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-25.0.1
- 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-25.0.1 keycloak-cli/keycloak
sources:
- keycloak-cli/keycloak.zip
- minikube/.task/subtask-{{.TASK}}.yaml
Expand Down
2 changes: 1 addition & 1 deletion provision/keycloak-tasks/Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,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 "25.0.1" .KC_OPERATOR_TAG}}'
KC_CONTAINER_IMAGE: '{{default "" .KC_CONTAINER_IMAGE}}'
KC_INSTANCES: '{{default "1" .KC_INSTANCES}}'
KC_CPU_REQUESTS: '{{default "0" .KC_CPU_REQUESTS}}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
- name: latest
from:
kind: DockerImage
name: quay.io/keycloak/keycloak:nightly
name: quay.io/keycloak/keycloak:25.0.1
generation: 2
importPolicy:
importMode: Legacy
Expand Down

0 comments on commit 23e227b

Please sign in to comment.