Skip to content

Commit

Permalink
Merge branch 'main' into docs-solo
Browse files Browse the repository at this point in the history
  • Loading branch information
ossdhaval authored Jan 24, 2025
2 parents 2d25d39 + ea02f86 commit 49546bc
Show file tree
Hide file tree
Showing 65 changed files with 241 additions and 232 deletions.
11 changes: 10 additions & 1 deletion .github/workflows/activate-nightly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ name: Activate Nightly Build

on:
workflow_dispatch:
inputs:
branch:
description: 'The branch to build night release from'
required: false
default: 'main'
schedule:
- cron: "0 23 * * *"
permissions:
Expand Down Expand Up @@ -37,4 +42,8 @@ jobs:
gh release delete ${NIGHTLY_VERSION} --cleanup-tag --yes || echo "${NIGHTLY_VERSION}" does not exist
gh release delete ${NIGHTLY_VERSION} --cleanup-tag --yes || echo "${NIGHTLY_VERSION}" does not exist
git push --delete origin ${NIGHTLY_VERSION} || echo "${NIGHTLY_VERSION}" does not exist
gh release create ${NIGHTLY_VERSION} --generate-notes --prerelease --title "${NIGHTLY_VERSION}"
TARGET_BRANCH=${{ github.event.inputs.branch }}
if [ -z "$TARGET_BRANCH" ]; then
TARGET_BRANCH="main"
fi
gh release create ${NIGHTLY_VERSION} --generate-notes --prerelease --title "${NIGHTLY_VERSION}" --target "${TARGET_BRANCH}"
2 changes: 1 addition & 1 deletion .github/workflows/build-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
id: run_build
run: |
cd flex/
sudo python${{ matrix.python_version }} flex_setup.py --jans-branch="main" --jans-setup-branch="main" -download-exit -yes --keep-downloads --keep-setup -force-download
sudo python${{ matrix.python_version }} flex_setup.py --jans-branch="v1.3.0" --jans-setup-branch="v1.3.0" -download-exit -yes --keep-downloads --keep-setup -force-download
cp -r /opt/dist flex-src/opt/
cp -r /opt/jans flex-src/opt/
touch flex-src/opt/jans/jans-setup/package
Expand Down
2 changes: 1 addition & 1 deletion admin-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gluu-admin-ui",
"version": "0.0.0",
"version": "5.3.0",
"description": "UI to administer the jans-sever features",
"keywords": [
"jans-server",
Expand Down
18 changes: 9 additions & 9 deletions automation/rancher-partner-charts/questions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ questions:
- variable: auth-server.image.tag
required: true
type: string
default: "0.0.0-nightly"
default: "1.3.0-1"
description: "The Auth Server Image tag"
label: Auth Server image tag
group: "Images"
Expand Down Expand Up @@ -732,7 +732,7 @@ questions:
- variable: admin-ui.image.tag
required: true
type: string
default: "0.0.0-nightly"
default: "5.3.0-1"
description: "The AdminUI Image tag"
label: AdminUI image tag
group: "Images"
Expand Down Expand Up @@ -761,7 +761,7 @@ questions:
- variable: auth-server-key-rotation.image.tag
required: true
type: string
default: "0.0.0-nightly"
default: "1.3.0-1"
description: "The Auth Server Image tag"
label: Auth Server KeyRotation image tag
group: "Images"
Expand Down Expand Up @@ -790,7 +790,7 @@ questions:
- variable: casa.image.tag
required: true
type: string
default: "0.0.0-nightly"
default: "1.3.0-1"
description: "The Casa Image tag"
label: Casa image tag
group: "Images"
Expand Down Expand Up @@ -819,7 +819,7 @@ questions:
- variable: config.image.tag
required: true
type: string
default: "0.0.0-nightly"
default: "1.3.0-1"
description: "The Configurator Image tag"
label: Configurator image tag
group: "Images"
Expand Down Expand Up @@ -848,7 +848,7 @@ questions:
- variable: config-api.image.tag
required: true
type: string
default: "0.0.0-nightly"
default: "1.3.0-1"
description: "The ConfigAPI Image tag"
label: ConfigAPI image tag
group: "Images"
Expand Down Expand Up @@ -877,7 +877,7 @@ questions:
- variable: fido2.image.tag
required: true
type: string
default: "0.0.0-nightly"
default: "1.3.0-1"
description: "The Fido2 Image tag"
label: Fido2 image tag
group: "Images"
Expand Down Expand Up @@ -906,7 +906,7 @@ questions:
- variable: persistence.image.tag
required: true
type: string
default: "0.0.0-nightly"
default: "1.3.0-1"
description: "The Persistence Image tag"
label: Persistence image tag
group: "Images"
Expand Down Expand Up @@ -935,7 +935,7 @@ questions:
- variable: scim.image.tag
required: true
type: string
default: "0.0.0-nightly"
default: "1.3.0-1"
description: "The SCIM Image tag"
label: SCIM image tag
group: "Images"
Expand Down
2 changes: 1 addition & 1 deletion automation/startflexdemo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if [[ $GLUU_PERSISTENCE != "MYSQL" ]] && [[ $GLUU_PERSISTENCE != "PGSQL" ]]; the
exit 1
fi
if [[ -z $GLUU_VERSION ]]; then
GLUU_VERSION="0.0.0-nightly"
GLUU_VERSION="5.3.0"
fi
LOG_TARGET="FILE"
LOG_LEVEL="TRACE"
Expand Down
6 changes: 3 additions & 3 deletions charts/gluu-all-in-one/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ annotations:
artifacthub.io/containsSecurityUpdates: 'true'
artifacthub.io/images: |
- name: all-in-one
image: ghcr.io/gluufederation/flex/flex-all-in-one:0.0.0-nightly
image: ghcr.io/gluufederation/flex/flex-all-in-one:5.3.0-1
artifacthub.io/license: Apache-2.0
catalog.cattle.io/certified: partner
catalog.cattle.io/release-name: gluu-all-in-one
catalog.cattle.io/display-name: Gluu Flex Cloud Identity and Access Management All-in-One
apiVersion: v2
appVersion: "0.0.0-nightly"
appVersion: "5.3.0"
icon: >-
https://gluu.org/docs/gluu-server/favicon.ico
home: https://docs.gluu.org
Expand All @@ -21,4 +21,4 @@ maintainers:
email: [email protected]
description: Gluu Access and Identity Management All-in-One Chart. This chart deploys the selected janssen microservice all in one deployment.
name: gluu-all-in-one
version: 0.0.0-nightly
version: 5.3.0
12 changes: 6 additions & 6 deletions charts/gluu-all-in-one/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# gluu-all-in-one

![Version: 0.0.0-nightly](https://img.shields.io/badge/Version-0.0.0--nightly-informational?style=flat-square) ![AppVersion: 0.0.0-nightly](https://img.shields.io/badge/AppVersion-0.0.0--nightly-informational?style=flat-square)
![Version: 5.3.0](https://img.shields.io/badge/Version-5.3.0-informational?style=flat-square) ![AppVersion: 5.3.0](https://img.shields.io/badge/AppVersion-5.3.0-informational?style=flat-square)

Gluu Access and Identity Management All-in-One Chart. This chart deploys the selected janssen microservice all in one deployment.

Expand Down Expand Up @@ -35,7 +35,7 @@ Kubernetes: `>=v1.22.0-0`
| adminPassword | string | `"Test1234#"` | Admin password to log in to the UI. |
| alb.ingress | bool | `false` | switches the service to Nodeport for ALB ingress |
| auth-server | object | `{"appLoggers":{"auditStatsLogLevel":"INFO","auditStatsLogTarget":"FILE","authLogLevel":"INFO","authLogTarget":"STDOUT","enableStdoutLogPrefix":"true","httpLogLevel":"INFO","httpLogTarget":"FILE","persistenceDurationLogLevel":"INFO","persistenceDurationLogTarget":"FILE","persistenceLogLevel":"INFO","persistenceLogTarget":"FILE","scriptLogLevel":"INFO","scriptLogTarget":"FILE"},"authEncKeys":"RSA1_5 RSA-OAEP","authSigKeys":"RS256 RS384 RS512 ES256 ES384 ES512 PS256 PS384 PS512","enabled":true,"ingress":{"authServerAdditionalAnnotations":{},"authServerEnabled":true,"authServerLabels":{},"authServerProtectedRegister":false,"authServerProtectedRegisterAdditionalAnnotations":{},"authServerProtectedRegisterLabels":{},"authServerProtectedToken":false,"authServerProtectedTokenAdditionalAnnotations":{},"authServerProtectedTokenLabels":{},"authzenAdditionalAnnotations":{},"authzenConfigEnabled":true,"authzenConfigLabels":{},"deviceCodeAdditionalAnnotations":{},"deviceCodeEnabled":true,"deviceCodeLabels":{},"firebaseMessagingAdditionalAnnotations":{},"firebaseMessagingEnabled":true,"firebaseMessagingLabels":{},"lockAdditionalAnnotations":{},"lockConfigAdditionalAnnotations":{},"lockConfigEnabled":false,"lockConfigLabels":{},"lockEnabled":false,"lockLabels":{},"openidAdditionalAnnotations":{},"openidConfigEnabled":true,"openidConfigLabels":{},"u2fAdditionalAnnotations":{},"u2fConfigEnabled":true,"u2fConfigLabels":{},"uma2AdditionalAnnotations":{},"uma2ConfigEnabled":true,"uma2ConfigLabels":{},"webdiscoveryAdditionalAnnotations":{},"webdiscoveryEnabled":true,"webdiscoveryLabels":{},"webfingerAdditionalAnnotations":{},"webfingerEnabled":true,"webfingerLabels":{}},"lockEnabled":false}` | Parameters used globally across all services helm charts. |
| auth-server-key-rotation | object | `{"additionalAnnotations":{},"additionalLabels":{},"customCommand":[],"customScripts":[],"dnsConfig":{},"dnsPolicy":"","enabled":true,"image":{"pullPolicy":"IfNotPresent","pullSecrets":[],"repository":"ghcr.io/janssenproject/jans/certmanager","tag":"0.0.0-nightly"},"initKeysLife":48,"keysLife":48,"keysPushDelay":0,"keysPushStrategy":"NEWER","keysStrategy":"NEWER","lifecycle":{},"resources":{"limits":{"cpu":"300m","memory":"300Mi"},"requests":{"cpu":"300m","memory":"300Mi"}},"usrEnvs":{"normal":{},"secret":{}},"volumeMounts":[],"volumes":[]}` | Responsible for regenerating auth-keys per x hours |
| auth-server-key-rotation | object | `{"additionalAnnotations":{},"additionalLabels":{},"customCommand":[],"customScripts":[],"dnsConfig":{},"dnsPolicy":"","enabled":true,"image":{"pullPolicy":"IfNotPresent","pullSecrets":[],"repository":"ghcr.io/janssenproject/jans/certmanager","tag":"1.3.0-1"},"initKeysLife":48,"keysLife":48,"keysPushDelay":0,"keysPushStrategy":"NEWER","keysStrategy":"NEWER","lifecycle":{},"resources":{"limits":{"cpu":"300m","memory":"300Mi"},"requests":{"cpu":"300m","memory":"300Mi"}},"usrEnvs":{"normal":{},"secret":{}},"volumeMounts":[],"volumes":[]}` | Responsible for regenerating auth-keys per x hours |
| auth-server-key-rotation.additionalAnnotations | object | `{}` | Additional annotations that will be added across the gateway in the format of {cert-manager.io/issuer: "letsencrypt-prod"} |
| auth-server-key-rotation.additionalLabels | object | `{}` | Additional labels that will be added across the gateway in the format of {mylabel: "myapp"} |
| auth-server-key-rotation.customCommand | list | `[]` | Add custom job's command. If passed, it will override the default conditional command. |
Expand All @@ -46,7 +46,7 @@ Kubernetes: `>=v1.22.0-0`
| auth-server-key-rotation.image.pullPolicy | string | `"IfNotPresent"` | Image pullPolicy to use for deploying. |
| auth-server-key-rotation.image.pullSecrets | list | `[]` | Image Pull Secrets |
| auth-server-key-rotation.image.repository | string | `"ghcr.io/janssenproject/jans/certmanager"` | Image to use for deploying. |
| auth-server-key-rotation.image.tag | string | `"0.0.0-nightly"` | Image tag to use for deploying. |
| auth-server-key-rotation.image.tag | string | `"1.3.0-1"` | Image tag to use for deploying. |
| auth-server-key-rotation.initKeysLife | int | `48` | The initial auth server key rotation keys life in hours |
| auth-server-key-rotation.keysLife | int | `48` | Auth server key rotation keys life in hours |
| auth-server-key-rotation.keysPushDelay | int | `0` | Delay (in seconds) before pushing private keys to Auth server |
Expand Down Expand Up @@ -278,7 +278,7 @@ Kubernetes: `>=v1.22.0-0`
| image.pullPolicy | string | `"IfNotPresent"` | Image pullPolicy to use for deploying. |
| image.pullSecrets | list | `[]` | Image Pull Secrets |
| image.repository | string | `"ghcr.io/gluufederation/flex/flex-all-in-one"` | Image to use for deploying. |
| image.tag | string | `"0.0.0-nightly"` | Image tag to use for deploying. |
| image.tag | string | `"5.3.0-1"` | Image tag to use for deploying. |
| isFqdnRegistered | bool | `false` | Boolean flag to enable mapping lbIp to fqdn inside pods on clouds that provide static ip for load balancers. On cloud that provide only addresses to the LB this flag will enable a script to actively scan config.configmap.lbAddr and update the hosts file inside the pods automatically. |
| istio.additionalAnnotations | object | `{}` | Additional annotations that will be added across the gateway in the format of {cert-manager.io/issuer: "letsencrypt-prod"} |
| istio.additionalLabels | object | `{}` | Additional labels that will be added across the gateway in the format of {mylabel: "myapp"} |
Expand All @@ -287,7 +287,7 @@ Kubernetes: `>=v1.22.0-0`
| istio.ingress | bool | `false` | Boolean flag that enables using istio gateway for Gluu. This assumes istio ingress is installed and hence the LB is available. |
| istio.namespace | string | `"istio-system"` | The namespace istio is deployed in. The is normally istio-system. |
| istio.tlsSecretName | string | `"istio-tls-certificate"` | |
| kc-scheduler | object | `{"additionalAnnotations":{},"additionalLabels":{},"customCommand":[],"customScripts":[],"dnsConfig":{},"dnsPolicy":"","enabled":false,"image":{"pullPolicy":"IfNotPresent","pullSecrets":[],"repository":"ghcr.io/janssenproject/jans/kc-scheduler","tag":"0.0.0-nightly"},"interval":10,"lifecycle":{},"resources":{"limits":{"cpu":"300m","memory":"300Mi"},"requests":{"cpu":"300m","memory":"300Mi"}},"usrEnvs":{"normal":{},"secret":{}},"volumeMounts":[],"volumes":[]}` | Responsible for synchronizing Keycloak SAML clients |
| kc-scheduler | object | `{"additionalAnnotations":{},"additionalLabels":{},"customCommand":[],"customScripts":[],"dnsConfig":{},"dnsPolicy":"","enabled":false,"image":{"pullPolicy":"IfNotPresent","pullSecrets":[],"repository":"ghcr.io/janssenproject/jans/kc-scheduler","tag":"1.3.0-1"},"interval":10,"lifecycle":{},"resources":{"limits":{"cpu":"300m","memory":"300Mi"},"requests":{"cpu":"300m","memory":"300Mi"}},"usrEnvs":{"normal":{},"secret":{}},"volumeMounts":[],"volumes":[]}` | Responsible for synchronizing Keycloak SAML clients |
| kc-scheduler.additionalAnnotations | object | `{}` | Additional annotations that will be added across the gateway in the format of {cert-manager.io/issuer: "letsencrypt-prod"} |
| kc-scheduler.additionalLabels | object | `{}` | Additional labels that will be added across the gateway in the format of {mylabel: "myapp"} |
| kc-scheduler.customCommand | list | `[]` | Add custom job's command. If passed, it will override the default conditional command. |
Expand All @@ -298,7 +298,7 @@ Kubernetes: `>=v1.22.0-0`
| kc-scheduler.image.pullPolicy | string | `"IfNotPresent"` | Image pullPolicy to use for deploying. |
| kc-scheduler.image.pullSecrets | list | `[]` | Image Pull Secrets |
| kc-scheduler.image.repository | string | `"ghcr.io/janssenproject/jans/kc-scheduler"` | Image to use for deploying. |
| kc-scheduler.image.tag | string | `"0.0.0-nightly"` | Image tag to use for deploying. |
| kc-scheduler.image.tag | string | `"1.3.0-1"` | Image tag to use for deploying. |
| kc-scheduler.interval | int | `10` | Interval of running the scheduler (in minutes) |
| kc-scheduler.resources | object | `{"limits":{"cpu":"300m","memory":"300Mi"},"requests":{"cpu":"300m","memory":"300Mi"}}` | Resource specs. |
| kc-scheduler.resources.limits.cpu | string | `"300m"` | CPU limit. |
Expand Down
6 changes: 3 additions & 3 deletions charts/gluu-all-in-one/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ auth-server-key-rotation:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/certmanager
# -- Image tag to use for deploying.
tag: 0.0.0-nightly
tag: 1.3.0-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Auth server key rotation keys life in hours
Expand Down Expand Up @@ -713,7 +713,7 @@ image:
# -- Image to use for deploying.
repository: ghcr.io/gluufederation/flex/flex-all-in-one
# -- Image tag to use for deploying.
tag: 0.0.0-nightly
tag: 5.3.0-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down Expand Up @@ -792,7 +792,7 @@ kc-scheduler:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/kc-scheduler
# -- Image tag to use for deploying.
tag: 0.0.0-nightly
tag: 1.3.0-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Resource specs.
Expand Down
56 changes: 28 additions & 28 deletions charts/gluu/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,35 @@ annotations:
artifacthub.io/containsSecurityUpdates: "true"
artifacthub.io/images: |
- name: auth-server
image: ghcr.io/janssenproject/jans/auth-server:0.0.0-nightly
image: ghcr.io/janssenproject/jans/auth-server:1.3.0-1
- name: auth-server-key-rotation
image: ghcr.io/janssenproject/jans/certmanager:0.0.0-nightly
image: ghcr.io/janssenproject/jans/certmanager:1.3.0-1
- name: configuration-manager
image: ghcr.io/janssenproject/jans/configurator:0.0.0-nightly
image: ghcr.io/janssenproject/jans/configurator:1.3.0-1
- name: config-api
image: ghcr.io/janssenproject/jans/config-api:0.0.0-nightly
image: ghcr.io/janssenproject/jans/config-api:1.3.0-1
- name: fido2
image: ghcr.io/janssenproject/jans/fido2:0.0.0-nightly
image: ghcr.io/janssenproject/jans/fido2:1.3.0-1
- name: persistence
image: ghcr.io/janssenproject/jans/persistence-loader:0.0.0-nightly
image: ghcr.io/janssenproject/jans/persistence-loader:1.3.0-1
- name: scim
image: ghcr.io/janssenproject/jans/scim:0.0.0-nightly
image: ghcr.io/janssenproject/jans/scim:1.3.0-1
- name: casa
image: ghcr.io/janssenproject/jans/casa:0.0.0-nightly
image: ghcr.io/janssenproject/jans/casa:1.3.0-1
- name: admin-ui
image: ghcr.io/gluufederation/flex/admin-ui:0.0.0-nightly
image: ghcr.io/gluufederation/flex/admin-ui:5.3.0-1
- name: link
image: ghcr.io/janssenproject/jans/link:0.0.0-nightly
image: ghcr.io/janssenproject/jans/link:1.3.0-1
- name: saml
image: ghcr.io/janssenproject/jans/saml:0.0.0-nightly
image: ghcr.io/janssenproject/jans/saml:1.3.0-1
- name: kc-scheduler
image: ghcr.io/janssenproject/jans/kc-scheduler:0.0.0-nightly
image: ghcr.io/janssenproject/jans/kc-scheduler:1.3.0-1
artifacthub.io/license: Apache-2.0
catalog.cattle.io/certified: partner
catalog.cattle.io/release-name: gluu
catalog.cattle.io/display-name: Gluu Cloud Identity and Access Management
apiVersion: v2
appVersion: "0.0.0-nightly"
appVersion: "5.3.0"
icon: https://gluu.org/docs/gluu-server/favicon.ico
home: https://www.gluu.org
sources:
Expand All @@ -41,60 +41,60 @@ maintainers:
email: [email protected]
description: Gluu Access and Identity Management
name: gluu
version: 0.0.0-nightly
version: 5.3.0
dependencies:
- name: config
condition: global.config.enabled
version: 0.0.0-nightly
version: 1.3.0

- name: config-api
condition: global.config-api.enabled
version: 0.0.0-nightly
version: 1.3.0

- name: auth-server
condition: global.auth-server.enabled
version: 0.0.0-nightly
version: 1.3.0

- name: admin-ui
condition: global.admin-ui.enabled
version: 0.0.0-nightly
version: 5.3.0

- name: fido2
condition: global.fido2.enabled
version: 0.0.0-nightly
version: 1.3.0

- name: scim
condition: global.scim.enabled
version: 0.0.0-nightly
version: 1.3.0

- name: nginx-ingress
condition: global.nginx-ingress.enabled
version: 0.0.0-nightly
version: 1.3.0

- name: casa
version: 0.0.0-nightly
version: 1.3.0
condition: global.casa.enabled

- name: auth-server-key-rotation
condition: global.auth-server-key-rotation.enabled
version: 0.0.0-nightly
version: 1.3.0

- name: persistence
condition: global.persistence.enabled
version: 0.0.0-nightly
version: 1.3.0

- name: cn-istio-ingress
condition: global.istio.ingress
version: 0.0.0-nightly
version: 1.3.0

- name: link
condition: global.link.enabled
version: 0.0.0-nightly
version: 1.3.0

- name: saml
condition: global.saml.enabled
version: 0.0.0-nightly
version: 1.3.0

- name: kc-scheduler
condition: global.kc-scheduler.enabled
version: 0.0.0-nightly
version: 1.3.0
Loading

0 comments on commit 49546bc

Please sign in to comment.