From 7db2c11c8335a35873c08387060454e8eb30d8e2 Mon Sep 17 00:00:00 2001 From: Isman Firmansyah Date: Wed, 10 May 2023 14:04:38 +0700 Subject: [PATCH] fix(docker-jans-loadtesting-jmeter): rename incorrect reference to OCI image (#4908) * fix(docker-jans-loadtesting-jmeter): rename incorrect reference to OCI image * docs: fix image reference and links to GH repo --- .../docker-jans-loadtesting-jmeter/Dockerfile | 2 +- .../docker-jans-loadtesting-jmeter/Makefile | 2 +- .../yaml/load-test/load_test_auth_code.yaml | 4 ++-- .../yaml/load-users/load_users_couchbase_job.yaml | 2 +- .../yaml/load-users/load_users_ldap_job.yaml | 2 +- .../yaml/load-users/load_users_rdbms_job.yaml | 2 +- .../yaml/load-users/load_users_spanner_job.yaml | 2 +- docs/admin/planning/benchmarking.md | 12 ++++++------ docs/admin/recipes/benchmark.md | 9 +++++---- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/Dockerfile b/demos/benchmarking/docker-jans-loadtesting-jmeter/Dockerfile index 027b03d8cb7..887c80cc8c4 100644 --- a/demos/benchmarking/docker-jans-loadtesting-jmeter/Dockerfile +++ b/demos/benchmarking/docker-jans-loadtesting-jmeter/Dockerfile @@ -67,7 +67,7 @@ RUN mkdir -p /root/.bzt/jmeter-taurus \ && tar zxvf /scripts/apache-jmeter-5.5.tgz -C /root/.bzt/jmeter-taurus \ && mv /root/.bzt/jmeter-taurus/apache-jmeter-5.5 /root/.bzt/jmeter-taurus/5.5 -LABEL org.opencontainers.image.url="ghcr.io/janssenproject/jans/demo_loadtesting" \ +LABEL org.opencontainers.image.url="ghcr.io/janssenproject/jans/loadtesting-jmeter" \ org.opencontainers.image.authors="Janssen Project " \ org.opencontainers.image.vendor="Janssen Project" \ org.opencontainers.image.version="1.0.13" \ diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/Makefile b/demos/benchmarking/docker-jans-loadtesting-jmeter/Makefile index eb80c31e65f..9596f242a98 100644 --- a/demos/benchmarking/docker-jans-loadtesting-jmeter/Makefile +++ b/demos/benchmarking/docker-jans-loadtesting-jmeter/Makefile @@ -1,5 +1,5 @@ CN_VERSION?=1.0.13-SNAPSHOT -IMAGE_NAME=ghcr.io/janssenproject/jans/demo_loadtesting +IMAGE_NAME=ghcr.io/janssenproject/jans/loadtesting-jmeter DEV_VERSION?=$(shell echo ${CN_VERSION} | cut -d '-' -f 1)_dev # pass extra build args, i.e. `make build-dev BUILD_ARGS="--no-cache"` diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-test/load_test_auth_code.yaml b/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-test/load_test_auth_code.yaml index 2e4ed08ecf1..0e8f2bcb80c 100644 --- a/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-test/load_test_auth_code.yaml +++ b/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-test/load_test_auth_code.yaml @@ -36,7 +36,7 @@ spec: - envFrom: - configMapRef: name: load-testing-cm - image: janssenproject/demo_loadtesting:1.0.12_dev + image: ghcr.io/janssenproject/jans/loadtesting-jmeter:1.0.13_dev imagePullPolicy: Always name: load-testing resources: @@ -45,4 +45,4 @@ spec: cpu: "1300m" limits: memory: "8000Mi" - cpu: "1300m" \ No newline at end of file + cpu: "1300m" diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_couchbase_job.yaml b/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_couchbase_job.yaml index 6eda677dc50..a0c32e8d8ee 100644 --- a/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_couchbase_job.yaml +++ b/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_couchbase_job.yaml @@ -31,7 +31,7 @@ spec: - envFrom: - configMapRef: name: load-users-cb-cm - image: janssenproject/demo_loadtesting:1.0.12_dev + image: ghcr.io/janssenproject/jans/loadtesting-jmeter:1.0.13_dev name: load-users resources: limits: diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_ldap_job.yaml b/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_ldap_job.yaml index 22fe0a6df4f..ce2c46b0833 100644 --- a/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_ldap_job.yaml +++ b/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_ldap_job.yaml @@ -31,7 +31,7 @@ spec: - envFrom: - configMapRef: name: load-users-ldap-cm - image: janssenproject/demo_loadtesting:1.0.12_dev + image: ghcr.io/janssenproject/jans/loadtesting-jmeter:1.0.13_dev name: load-users resources: limits: diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_rdbms_job.yaml b/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_rdbms_job.yaml index 2f148bfc282..937cec00d39 100644 --- a/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_rdbms_job.yaml +++ b/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_rdbms_job.yaml @@ -34,7 +34,7 @@ spec: - envFrom: - configMapRef: name: load-users-mysql-cm - image: janssenproject/demo_loadtesting:1.0.12_dev + image: ghcr.io/janssenproject/jans/loadtesting-jmeter:1.0.13_dev name: load-users-mysql resources: limits: diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_spanner_job.yaml b/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_spanner_job.yaml index c79708aef14..962cca77909 100644 --- a/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_spanner_job.yaml +++ b/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_spanner_job.yaml @@ -38,7 +38,7 @@ spec: - envFrom: - configMapRef: name: load-users-spanner-cm - image: janssenproject/demo_loadtesting:1.0.12_dev + image: ghcr.io/janssenproject/jans/loadtesting-jmeter:1.0.13_dev volumeMounts: - mountPath: /etc/certs/google_service_account.json name: google-sa diff --git a/docs/admin/planning/benchmarking.md b/docs/admin/planning/benchmarking.md index 307427deb98..a653c588949 100644 --- a/docs/admin/planning/benchmarking.md +++ b/docs/admin/planning/benchmarking.md @@ -58,8 +58,8 @@ justified. **Prerequisite** 1. Create OpenID Connect client with - 1. Response Types: ['code', 'id_token] - 1. Grant Types: ['authorization_code', `implicit`, 'refresh_token'] + 1. Response Types: `['code', 'id_token']` + 1. Grant Types: `['authorization_code', 'implicit', 'refresh_token']` 1. Redirect Uri: valid redirect uri which is resolvable by machine which runs this load test Change the `FQDN` below and execute: ```bash @@ -106,7 +106,7 @@ Download or build [config-cli-tui](../config-guide/jans-tui/README.md) and run: ``` 1. Create users by pattern: -Set the following [env vars](../../../demos/benchmarking/docker-jans-loadtesting-jmeter/README.md#loading-users) +Set the following [env vars](https://github.com/JanssenProject/jans/blob/vreplace-janssen-version/demos/benchmarking/docker-jans-loadtesting-jmeter/README.md#loading-users) | ENV | Example | |------------------------------|--------------------| @@ -120,7 +120,7 @@ Set the following [env vars](../../../demos/benchmarking/docker-jans-loadtesting | `USER_NUMBER_ENDING_POINT` | 10000 | -Run the following script [add_sequenced_jans_user_rdbm.py](../../../demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/add_users_rdbm.py) +Run the following script [load_users_rdbms_job.py](https://github.com/JanssenProject/jans/blob/vreplace-janssen-version/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_rdbms_job.yaml) **Threads&RampUp** @@ -140,7 +140,7 @@ jmeter -n -t Authorization_Code_Flow_jans.jmx ### Authorization Code Flow jmeter test -For load testing with Authorization Code Flow jmeter test is used located [here](https://github.com/JanssenProject/jans/blob/main/demos/load-testing/jmeter/test/Authorization%20Code%20Flow_jans.jmx) +For load testing with Authorization Code Flow jmeter test is used located [here](https://github.com/JanssenProject/jans/blob/vreplace-janssen-version/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/authorization_code_flow.jmx) 1. Configure Script 1. Open jmeter script by GUI @@ -163,7 +163,7 @@ If everything was done correctly you should see: ### Resource Owner Password Grant (ROPC) Flow jmeter test -For load testing with Resource Owner Password Grant (ROPC) Flow jmeter test is used located [here](https://github.com/JanssenProject/jans/blob/main/demos/load-testing/jmeter/test/ResourceOwnerPasswordCredentials_jans.jmx) +For load testing with Resource Owner Password Grant (ROPC) Flow jmeter test is used located [here](https://github.com/JanssenProject/jans/blob/vreplace-janssen-version/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/tests/resource_owner_password_credentials.jmx) 1. Configure Script 1. Open jmeter script by GUI diff --git a/docs/admin/recipes/benchmark.md b/docs/admin/recipes/benchmark.md index 1c45b56c67b..5eeb5bbe152 100644 --- a/docs/admin/recipes/benchmark.md +++ b/docs/admin/recipes/benchmark.md @@ -90,7 +90,7 @@ A Kubernetes cluster can be created with three nodes or more in one region and t ```yaml config: image: - repository: janssenproject/configurator + repository: ghcr.io/janssenproject/jans/configurator tag: 1.0.13_dev countryCode: US email: support@gluu.org @@ -134,17 +134,17 @@ A Kubernetes cluster can be created with three nodes or more in one region and t auth-server: image: pullPolicy: IfNotPresent - repository: janssenproject/auth-server + repository: ghcr.io/janssenproject/jans/auth-server tag: 1.0.13_dev config-api: image: pullPolicy: IfNotPresent - repository: janssenproject/config-api + repository: ghcr.io/janssenproject/jans/config-api tag: 1.0.13_dev persistence: image: pullPolicy: IfNotPresent - repository: janssenproject/persistence-loader + repository: ghcr.io/janssenproject/jans/persistence-loader tag: 1.0.13_dev nginx-ingress: ingress: @@ -178,6 +178,7 @@ Loading users requires a hefty but temporary amount of resources. By default, th ```bash mkdir add_users && cd add_users ``` + 2. Copy the following [yaml](https://github.com/JanssenProject/jans/blob/vreplace-janssen-version/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_rdbms_job.yaml) into the folder under the name `load_users.yaml`. 3. Open the file and modify the sql connection parameters. To speed the loading process increase the CPU requests and limits.