Skip to content

Commit

Permalink
Merge branch 'main' into jans-auth-server-8216
Browse files Browse the repository at this point in the history
  • Loading branch information
yuriyz authored Apr 18, 2024
2 parents cfcb123 + 00e400f commit 81895a9
Show file tree
Hide file tree
Showing 268 changed files with 17,619 additions and 7,666 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ on:
simple_release_as:
description: 'Release version for docs'
required: true
default: '1.1.1'
default: '1.1.2'
java_release_as:
description: 'Release version for the java projects jans-*'
required: true
default: '1.1.1'
default: '1.1.2'
docker_release_as:
description: 'Release version for the docker images docker-*'
required: true
default: '1.1.1-1'
default: '1.1.2-1'
python_release_as:
description: 'Release version for the python projects'
required: true
default: '1.1.1'
default: '1.1.2'
mega_release_as:
description: 'Mega release version'
required: true
default: '1.1.1'
default: '1.1.2'
permissions:
contents: read

Expand Down
2 changes: 1 addition & 1 deletion agama/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>io.jans</groupId>
<artifactId>agama</artifactId>
<packaging>pom</packaging>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<name>agama parent</name>

<prerequisites>
Expand Down
2 changes: 1 addition & 1 deletion agama/transpiler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>io.jans</groupId>
<artifactId>agama</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</parent>

<properties>
Expand Down
8 changes: 4 additions & 4 deletions charts/janssen-all-in-one/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ annotations:
artifacthub.io/containsSecurityUpdates: 'true'
artifacthub.io/images: |
- name: all-in-one
image: ghcr.io/janssenproject/jans/all-in-one:1.1.1-1
image: ghcr.io/janssenproject/jans/all-in-one:1.1.2_dev
artifacthub.io/license: Apache-2.0
artifacthub.io/prerelease: 'false'
artifacthub.io/prerelease: 'true'
catalog.cattle.io/certified: partner
catalog.cattle.io/release-name: janssen-all-in-one
catalog.cattle.io/display-name: Janssen Cloud Identity and Access Management All-in-One
apiVersion: v2
appVersion: "1.1.1"
appVersion: "1.1.2-dev"
icon: >-
https://raw.githubusercontent.com/JanssenProject/jans/main/docs/assets/logo/janssen_project_favicon_transparent_50px_50px.png
home: https://jans.io
Expand All @@ -22,4 +22,4 @@ maintainers:
email: support@jans.io
description: Janssen Access and Identity Management All-in-One Chart. This chart deploys the selected janssen microservice all in one deployment.
name: janssen-all-in-one
version: 1.1.1
version: 1.1.2-dev
10 changes: 5 additions & 5 deletions charts/janssen-all-in-one/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# janssen-all-in-one

![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![AppVersion: 1.1.1](https://img.shields.io/badge/AppVersion-1.1.1-informational?style=flat-square)
![Version: 1.1.2-dev](https://img.shields.io/badge/Version-1.1.2--dev-informational?style=flat-square) ![AppVersion: 1.1.2-dev](https://img.shields.io/badge/AppVersion-1.1.2--dev-informational?style=flat-square)

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

Expand Down Expand Up @@ -30,7 +30,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","ldapStatsLogLevel":"INFO","ldapStatsLogTarget":"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":{"authServerEnabled":true,"deviceCodeEnabled":true,"firebaseMessagingEnabled":true,"openidConfigEnabled":true,"u2fConfigEnabled":true,"uma2ConfigEnabled":true,"webdiscoveryEnabled":true,"webfingerEnabled":true},"lockEnabled":false}` | Parameters used globally across all services helm charts. |
| auth-server-key-rotation | object | `{"additionalAnnotations":{},"additionalLabels":{},"customScripts":[],"dnsConfig":{},"dnsPolicy":"","enabled":true,"image":{"pullPolicy":"IfNotPresent","pullSecrets":[],"repository":"ghcr.io/janssenproject/jans/certmanager","tag":"1.1.1-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 | object | `{"additionalAnnotations":{},"additionalLabels":{},"customScripts":[],"dnsConfig":{},"dnsPolicy":"","enabled":true,"image":{"pullPolicy":"IfNotPresent","pullSecrets":[],"repository":"ghcr.io/janssenproject/jans/certmanager","tag":"1.1.2_dev"},"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.customScripts | list | `[]` | Add custom scripts that have been mounted to run before the entrypoint. - /tmp/custom.sh - /tmp/custom2.sh |
Expand All @@ -40,7 +40,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 | `"1.1.1-1"` | Image tag to use for deploying. |
| auth-server-key-rotation.image.tag | string | `"1.1.2_dev"` | 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 @@ -225,7 +225,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/janssenproject/jans/all-in-one"` | Image to use for deploying. |
| image.tag | string | `"1.1.1-1"` | Image tag to use for deploying. |
| image.tag | string | `"1.1.2_dev"` | 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 Down Expand Up @@ -338,4 +338,4 @@ Kubernetes: `>=v1.22.0-0`
| volumes | list | `[]` | Configure any additional volumes that need to be attached to the pod |

----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
4 changes: 2 additions & 2 deletions charts/janssen-all-in-one/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ auth-server-key-rotation:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/certmanager
# -- Image tag to use for deploying.
tag: 1.1.1-1
tag: 1.1.2_dev
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Auth server key rotation keys life in hours
Expand Down Expand Up @@ -675,7 +675,7 @@ image:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/all-in-one
# -- Image tag to use for deploying.
tag: 1.1.1-1
tag: 1.1.2_dev
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down
52 changes: 26 additions & 26 deletions charts/janssen/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,34 @@ annotations:
artifacthub.io/containsSecurityUpdates: 'true'
artifacthub.io/images: |
- name: auth-server
image: ghcr.io/janssenproject/jans/auth-server:1.1.1-1
image: ghcr.io/janssenproject/jans/auth-server:1.1.2_dev
- name: auth-server-key-rotation
image: ghcr.io/janssenproject/jans/certmanager:1.1.1-1
image: ghcr.io/janssenproject/jans/certmanager:1.1.2_dev
- name: configuration-manager
image: ghcr.io/janssenproject/jans/configurator:1.1.1-1
image: ghcr.io/janssenproject/jans/configurator:1.1.2_dev
- name: config-api
image: ghcr.io/janssenproject/jans/config-api:1.1.1-1
image: ghcr.io/janssenproject/jans/config-api:1.1.2_dev
- name: fido2
image: ghcr.io/janssenproject/jans/fido2:1.1.1-1
image: ghcr.io/janssenproject/jans/fido2:1.1.2_dev
- name: opendj
image: gluufederation/opendj:5.0.0_dev
- name: persistence
image: ghcr.io/janssenproject/jans/persistence-loader:1.1.1-1
image: ghcr.io/janssenproject/jans/persistence-loader:1.1.2_dev
- name: casa
image: ghcr.io/janssenproject/jans/casa:1.1.1-1
image: ghcr.io/janssenproject/jans/casa:1.1.2_dev
- name: scim
image: ghcr.io/janssenproject/jans/scim:1.1.1-1
image: ghcr.io/janssenproject/jans/scim:1.1.2_dev
- name: link
image: ghcr.io/janssenproject/jans/link:1.1.1-1
image: ghcr.io/janssenproject/jans/link:1.1.2_dev
- name: saml
image: ghcr.io/janssenproject/jans/saml:1.1.1-1
image: ghcr.io/janssenproject/jans/saml:1.1.2_dev
artifacthub.io/license: Apache-2.0
artifacthub.io/prerelease: 'false'
artifacthub.io/prerelease: 'true'
catalog.cattle.io/certified: partner
catalog.cattle.io/release-name: janssen
catalog.cattle.io/display-name: Janssen Cloud Identity and Access Management Microservices
apiVersion: v2
appVersion: "1.1.1"
appVersion: "1.1.2-dev"
icon: >-
https://raw.githubusercontent.com/JanssenProject/jans/main/docs/assets/logo/janssen_project_favicon_transparent_50px_50px.png
home: https://jans.io
Expand All @@ -42,56 +42,56 @@ maintainers:
email: support@jans.io
description: Janssen Access and Identity Management Microservices Chart. This chart deploys each janssen microservice as a separate deployment.
name: janssen
version: 1.1.1
version: 1.1.2-dev
dependencies:
- name: casa
version: 1.1.1
version: 1.1.2-dev
condition: global.casa.enabled

- name: config
condition: global.config.enabled
version: 1.1.1
version: 1.1.2-dev

- name: config-api
condition: global.config-api.enabled
version: 1.1.1
version: 1.1.2-dev

- name: opendj
condition: global.opendj.enabled
version: 1.1.1
version: 1.1.2-dev

- name: auth-server
condition: global.auth-server.enabled
version: 1.1.1
version: 1.1.2-dev

- name: fido2
condition: global.fido2.enabled
version: 1.1.1
version: 1.1.2-dev

- name: scim
condition: global.scim.enabled
version: 1.1.1
version: 1.1.2-dev

- name: nginx-ingress
condition: global.nginx-ingress.enabled
version: 1.1.1
version: 1.1.2-dev

- name: auth-server-key-rotation
condition: global.auth-server-key-rotation.enabled
version: 1.1.1
version: 1.1.2-dev

- name: persistence
condition: global.persistence.enabled
version: 1.1.1
version: 1.1.2-dev

- name: link
condition: global.link.enabled
version: 1.1.1
version: 1.1.2-dev

- name: saml
condition: global.saml.enabled
version: 1.1.1
version: 1.1.2-dev

- name: cn-istio-ingress
condition: global.istio.ingress
version: 1.1.1
version: 1.1.2-dev
Loading

0 comments on commit 81895a9

Please sign in to comment.