Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): prep work for 1.1.4-SNAPSHOT and dev #8895

Merged
merged 2 commits into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ on:
workflow_dispatch:
inputs:
version:
description: 'Version tag (e.g."v1.1.3")'
default: "v1.1.3"
description: 'Version tag (e.g."v1.1.4")'
default: "v1.1.4"
required: false
concurrency:
group: run-once
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test_docker_linux_installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ jobs:
run: |
ip=$(ifconfig eth0 | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')
sudo chmod u+x automation/startjanssenmonolithdemo.sh
export RUN_TESTS=true
sudo bash ./automation/startjanssenmonolithdemo.sh "demoexample.jans.io" "${{ matrix.persistence-backends }}" "${ip}" "${{ github.sha }}"
persistence=$(echo "${{ matrix.persistence-backends }}" | tr '[:upper:]' '[:lower:]')
mv /tmp/reports /${{ matrix.persistence-backends }}-reports
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.3</version>
<version>1.1.4-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.3</version>
<version>1.1.4-SNAPSHOT</version>
</parent>

<properties>
Expand Down
8 changes: 8 additions & 0 deletions automation/startjanssenmonolithdemo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ JANS_PERSISTENCE=$2
EXT_IP=$3
# commit to build jans off
JANS_BUILD_COMMIT=$4
IS_FQDN_REGISTERED=""
RUN_TESTS=""
if [[ ! "$JANS_FQDN" ]]; then
read -rp "Enter Hostname [demoexample.jans.io]: " JANS_FQDN
fi
Expand Down Expand Up @@ -71,6 +73,12 @@ if [[ "$JANS_BUILD_COMMIT" ]]; then
python3 -c "from pathlib import Path ; import ruamel.yaml ; compose = Path('/tmp/jans/docker-jans-monolith/jans-ldap-compose.yml') ; yaml = ruamel.yaml.YAML() ; data = yaml.load(compose) ; data['services']['jans']['build'] = '.' ; del data['services']['jans']['image'] ; yaml.dump(data, compose)"
fi
# --
if [[ "$IS_FQDN_REGISTERED" ]]; then
python3 -c "from dockerfile_parse import DockerfileParser ; dfparser = DockerfileParser('/tmp/jans/docker-jans-monolith') ; dfparser.envs['IS_FQDN_REGISTERED'] = 'true'"
fi
if [[ "$RUN_TESTS" ]]; then
python3 -c "from dockerfile_parse import DockerfileParser ; dfparser = DockerfileParser('/tmp/jans/docker-jans-monolith') ; dfparser.envs['RUN_TESTS'] = 'true'"
fi
if [[ $JANS_PERSISTENCE == "MYSQL" ]]; then
bash /tmp/jans/docker-jans-monolith/up.sh mysql
elif [[ $JANS_PERSISTENCE == "PGSQL" ]]; then
Expand Down
6 changes: 3 additions & 3 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.3-1
image: ghcr.io/janssenproject/jans/all-in-one:1.1.4_dev
artifacthub.io/license: Apache-2.0
artifacthub.io/prerelease: 'false'
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.3"
appVersion: "1.1.4-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.3
version: 1.1.4-dev
14 changes: 7 additions & 7 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.3](https://img.shields.io/badge/Version-1.1.3-informational?style=flat-square) ![AppVersion: 1.1.3](https://img.shields.io/badge/AppVersion-1.1.3-informational?style=flat-square)
![Version: 1.1.4-dev](https://img.shields.io/badge/Version-1.1.4--dev-informational?style=flat-square) ![AppVersion: 1.1.4-dev](https://img.shields.io/badge/AppVersion-1.1.4--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,"lockConfigEnabled":false,"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.3-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.4_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.3-1"` | Image tag to use for deploying. |
| auth-server-key-rotation.image.tag | string | `"1.1.4_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.3-1"` | Image tag to use for deploying. |
| image.tag | string | `"1.1.4_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 All @@ -234,7 +234,7 @@ Kubernetes: `>=v1.22.0-0`
| istio.ingress | bool | `false` | Boolean flag that enables using istio gateway for Janssen. 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":{},"customScripts":[],"dnsConfig":{},"dnsPolicy":"","enabled":false,"image":{"pullPolicy":"IfNotPresent","pullSecrets":[],"repository":"ghcr.io/janssenproject/jans/kc-scheduler","tag":"1.1.3-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 | object | `{"additionalAnnotations":{},"additionalLabels":{},"customScripts":[],"dnsConfig":{},"dnsPolicy":"","enabled":false,"image":{"pullPolicy":"IfNotPresent","pullSecrets":[],"repository":"ghcr.io/janssenproject/jans/kc-scheduler","tag":"1.1.4_dev"},"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.customScripts | list | `[]` | Add custom scripts that have been mounted to run before the entrypoint. - /tmp/custom.sh - /tmp/custom2.sh |
Expand All @@ -244,7 +244,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 | `"1.1.3-1"` | Image tag to use for deploying. |
| kc-scheduler.image.tag | string | `"1.1.4_dev"` | 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 Expand Up @@ -362,4 +362,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.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
6 changes: 3 additions & 3 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.3-1
tag: 1.1.4_dev
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Auth server key rotation keys life in hours
Expand Down Expand Up @@ -679,7 +679,7 @@ image:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/all-in-one
# -- Image tag to use for deploying.
tag: 1.1.3-1
tag: 1.1.4_dev
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down Expand Up @@ -757,7 +757,7 @@ kc-scheduler:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/kc-scheduler
# -- Image tag to use for deploying.
tag: 1.1.3-1
tag: 1.1.4_dev
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Resource specs.
Expand Down
54 changes: 27 additions & 27 deletions charts/janssen/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,36 @@ annotations:
artifacthub.io/containsSecurityUpdates: 'true'
artifacthub.io/images: |
- name: auth-server
image: ghcr.io/janssenproject/jans/auth-server:1.1.3-1
image: ghcr.io/janssenproject/jans/auth-server:1.1.4_dev
- name: auth-server-key-rotation
image: ghcr.io/janssenproject/jans/certmanager:1.1.3-1
image: ghcr.io/janssenproject/jans/certmanager:1.1.4_dev
- name: configuration-manager
image: ghcr.io/janssenproject/jans/configurator:1.1.3-1
image: ghcr.io/janssenproject/jans/configurator:1.1.4_dev
- name: config-api
image: ghcr.io/janssenproject/jans/config-api:1.1.3-1
image: ghcr.io/janssenproject/jans/config-api:1.1.4_dev
- name: fido2
image: ghcr.io/janssenproject/jans/fido2:1.1.3-1
image: ghcr.io/janssenproject/jans/fido2:1.1.4_dev
- name: opendj
image: gluufederation/opendj:5.0.0_dev
- name: persistence
image: ghcr.io/janssenproject/jans/persistence-loader:1.1.3-1
image: ghcr.io/janssenproject/jans/persistence-loader:1.1.4_dev
- name: casa
image: ghcr.io/janssenproject/jans/casa:1.1.3-1
image: ghcr.io/janssenproject/jans/casa:1.1.4_dev
- name: scim
image: ghcr.io/janssenproject/jans/scim:1.1.3-1
image: ghcr.io/janssenproject/jans/scim:1.1.4_dev
- name: link
image: ghcr.io/janssenproject/jans/link:1.1.3-1
image: ghcr.io/janssenproject/jans/link:1.1.4_dev
- name: saml
image: ghcr.io/janssenproject/jans/saml:1.1.3-1
image: ghcr.io/janssenproject/jans/saml:1.1.4_dev
- name: kc-scheduler
image: ghcr.io/janssenproject/jans/kc-scheduler:1.1.3-1
image: ghcr.io/janssenproject/jans/kc-scheduler:1.1.4_dev
artifacthub.io/license: Apache-2.0
artifacthub.io/prerelease: 'false'
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.3"
appVersion: "1.1.4-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 @@ -44,60 +44,60 @@ 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.3
version: 1.1.4-dev
dependencies:
- name: casa
version: 1.1.3
version: 1.1.4-dev
condition: global.casa.enabled

- name: config
condition: global.config.enabled
version: 1.1.3
version: 1.1.4-dev

- name: config-api
condition: global.config-api.enabled
version: 1.1.3
version: 1.1.4-dev

- name: opendj
condition: global.opendj.enabled
version: 1.1.3
version: 1.1.4-dev

- name: auth-server
condition: global.auth-server.enabled
version: 1.1.3
version: 1.1.4-dev

- name: fido2
condition: global.fido2.enabled
version: 1.1.3
version: 1.1.4-dev

- name: scim
condition: global.scim.enabled
version: 1.1.3
version: 1.1.4-dev

- name: nginx-ingress
condition: global.nginx-ingress.enabled
version: 1.1.3
version: 1.1.4-dev

- name: auth-server-key-rotation
condition: global.auth-server-key-rotation.enabled
version: 1.1.3
version: 1.1.4-dev

- name: persistence
condition: global.persistence.enabled
version: 1.1.3
version: 1.1.4-dev

- name: link
condition: global.link.enabled
version: 1.1.3
version: 1.1.4-dev

- name: saml
condition: global.saml.enabled
version: 1.1.3
version: 1.1.4-dev

- name: cn-istio-ingress
condition: global.istio.ingress
version: 1.1.3
version: 1.1.4-dev

- name: kc-scheduler
condition: global.kc-scheduler.enabled
version: 1.1.3
version: 1.1.4-dev
Loading