Skip to content

Commit

Permalink
chore(release): prepare for 5.1.2 release (#1742)
Browse files Browse the repository at this point in the history
* chore(release): prepare for 5.1.2 release triggered by JanssenProject/jans#8607

Signed-off-by: moabu <[email protected]>

* fix(charts): resolve overlapping cronjobs (#1744)

Signed-off-by: iromli <[email protected]>

* chore(release): adjust to jans patch

Signed-off-by: moabu <[email protected]>

---------

Signed-off-by: moabu <[email protected]>
Signed-off-by: iromli <[email protected]>
Co-authored-by: Isman Firmansyah <[email protected]>
  • Loading branch information
moabu and iromli authored Jun 6, 2024
1 parent 33acd2f commit 0da8048
Show file tree
Hide file tree
Showing 62 changed files with 224 additions and 222 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker_build_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
DOCKER_IMAGE=ghcr.io/$REPOSITORY/${{ matrix.docker-images }}
VERSION=${MAIN_VERSION}_dev
if [[ ${{ matrix.docker-images }} == "flex-monolith" ]]; then
VERSION=5.1.2_dev
VERSION=5.1.2-1
DOCKER_IMAGE=ghcr.io/$REPOSITORY/monolith
fi
BUILD=true
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": "5.1.2-dev",
"version": "5.1.2",
"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 @@ -862,7 +862,7 @@ questions:
- variable: auth-server.image.tag
required: true
type: string
default: "1.1.2_dev"
default: "1.1.2-2"
description: "The Auth Server Image tag"
label: Auth Server image tag
group: "Images"
Expand Down Expand Up @@ -891,7 +891,7 @@ questions:
- variable: admin-ui.image.tag
required: true
type: string
default: "5.1.2_dev"
default: "5.1.2-1"
description: "The AdminUI Image tag"
label: AdminUI image tag
group: "Images"
Expand Down Expand Up @@ -920,7 +920,7 @@ questions:
- variable: auth-server-key-rotation.image.tag
required: true
type: string
default: "1.1.2_dev"
default: "1.1.2-2"
description: "The Auth Server Image tag"
label: Auth Server KeyRotation image tag
group: "Images"
Expand Down Expand Up @@ -949,7 +949,7 @@ questions:
- variable: casa.image.tag
required: true
type: string
default: "1.1.2_dev"
default: "1.1.2-2"
description: "The Casa Image tag"
label: Casa image tag
group: "Images"
Expand Down Expand Up @@ -978,7 +978,7 @@ questions:
- variable: config.image.tag
required: true
type: string
default: "1.1.2_dev"
default: "1.1.2-2"
description: "The Configurator Image tag"
label: Configurator image tag
group: "Images"
Expand Down Expand Up @@ -1007,7 +1007,7 @@ questions:
- variable: config-api.image.tag
required: true
type: string
default: "1.1.2_dev"
default: "1.1.2-2"
description: "The ConfigAPI Image tag"
label: ConfigAPI image tag
group: "Images"
Expand Down Expand Up @@ -1036,7 +1036,7 @@ questions:
- variable: fido2.image.tag
required: true
type: string
default: "1.1.2_dev"
default: "1.1.2-2"
description: "The Fido2 Image tag"
label: Fido2 image tag
group: "Images"
Expand Down Expand Up @@ -1094,7 +1094,7 @@ questions:
- variable: persistence.image.tag
required: true
type: string
default: "1.1.2_dev"
default: "1.1.2-2"
description: "The Persistence Image tag"
label: Persistence image tag
group: "Images"
Expand Down Expand Up @@ -1123,7 +1123,7 @@ questions:
- variable: scim.image.tag
required: true
type: string
default: "1.1.2_dev"
default: "1.1.2-2"
description: "The SCIM Image tag"
label: SCIM image tag
group: "Images"
Expand Down
4 changes: 2 additions & 2 deletions charts/gluu-all-in-one/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ annotations:
artifacthub.io/containsSecurityUpdates: 'true'
artifacthub.io/images: |
- name: all-in-one
image: ghcr.io/gluufederation/flex/flex-all-in-one:5.1.2_dev
image: ghcr.io/gluufederation/flex/flex-all-in-one:5.1.2-1
artifacthub.io/license: Apache-2.0
catalog.cattle.io/certified: partner
catalog.cattle.io/release-name: gluu-all-in-one
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: 5.1.2-dev
version: 5.1.2
14 changes: 7 additions & 7 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: 5.1.2-dev](https://img.shields.io/badge/Version-5.1.2--dev-informational?style=flat-square) ![AppVersion: 5.1.2](https://img.shields.io/badge/AppVersion-5.1.2-informational?style=flat-square)
![Version: 5.1.2](https://img.shields.io/badge/Version-5.1.2-informational?style=flat-square) ![AppVersion: 5.1.2](https://img.shields.io/badge/AppVersion-5.1.2-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 @@ -33,7 +33,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,"authServerProtectedRegister":false,"authServerProtectedToken":false,"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.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 | object | `{"additionalAnnotations":{},"additionalLabels":{},"customScripts":[],"dnsConfig":{},"dnsPolicy":"","enabled":true,"image":{"pullPolicy":"IfNotPresent","pullSecrets":[],"repository":"ghcr.io/janssenproject/jans/certmanager","tag":"1.1.2-2"},"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 @@ -43,7 +43,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.2_dev"` | Image tag to use for deploying. |
| auth-server-key-rotation.image.tag | string | `"1.1.2-2"` | 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 @@ -235,7 +235,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 | `"5.1.2_dev"` | Image tag to use for deploying. |
| image.tag | string | `"5.1.2-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 @@ -244,7 +244,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":{},"customScripts":[],"dnsConfig":{},"dnsPolicy":"","enabled":false,"image":{"pullPolicy":"IfNotPresent","pullSecrets":[],"repository":"ghcr.io/janssenproject/jans/kc-scheduler","tag":"1.1.2_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 | object | `{"additionalAnnotations":{},"additionalLabels":{},"customScripts":[],"dnsConfig":{},"dnsPolicy":"","enabled":false,"image":{"pullPolicy":"IfNotPresent","pullSecrets":[],"repository":"ghcr.io/janssenproject/jans/kc-scheduler","tag":"1.1.2-2"},"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 @@ -254,7 +254,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.2_dev"` | Image tag to use for deploying. |
| kc-scheduler.image.tag | string | `"1.1.2-2"` | 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 @@ -370,4 +370,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.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
2 changes: 2 additions & 0 deletions charts/gluu-all-in-one/templates/cronjobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ spec:
restartPolicy: Never
{{- end }}

---

{{ if and (index .Values "kc-scheduler" "enabled") (.Values.saml.enabled) -}}
kind: CronJob
apiVersion: batch/v1
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 @@ -265,7 +265,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.2_dev
tag: 1.1.2-2
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Auth server key rotation keys life in hours
Expand Down Expand Up @@ -697,7 +697,7 @@ image:
# -- Image to use for deploying.
repository: ghcr.io/gluufederation/flex/flex-all-in-one
# -- Image tag to use for deploying.
tag: 5.1.2_dev
tag: 5.1.2-1
# -- Image Pull Secrets
pullSecrets: [ ]
# -- Service replica number.
Expand Down Expand Up @@ -775,7 +775,7 @@ kc-scheduler:
# -- Image to use for deploying.
repository: ghcr.io/janssenproject/jans/kc-scheduler
# -- Image tag to use for deploying.
tag: 1.1.2_dev
tag: 1.1.2-2
# -- 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,29 +3,29 @@ annotations:
artifacthub.io/containsSecurityUpdates: "true"
artifacthub.io/images: |
- name: auth-server
image: ghcr.io/janssenproject/jans/auth-server:1.1.2_dev
image: ghcr.io/janssenproject/jans/auth-server:1.1.2-2
- name: auth-server-key-rotation
image: ghcr.io/janssenproject/jans/certmanager:1.1.2_dev
image: ghcr.io/janssenproject/jans/certmanager:1.1.2-2
- name: configuration-manager
image: ghcr.io/janssenproject/jans/configurator:1.1.2_dev
image: ghcr.io/janssenproject/jans/configurator:1.1.2-2
- name: config-api
image: ghcr.io/janssenproject/jans/config-api:1.1.2_dev
image: ghcr.io/janssenproject/jans/config-api:1.1.2-2
- name: fido2
image: ghcr.io/janssenproject/jans/fido2:1.1.2_dev
image: ghcr.io/janssenproject/jans/fido2:1.1.2-2
- name: persistence
image: ghcr.io/janssenproject/jans/persistence-loader:1.1.2_dev
image: ghcr.io/janssenproject/jans/persistence-loader:1.1.2-2
- name: scim
image: ghcr.io/janssenproject/jans/scim:1.1.2_dev
image: ghcr.io/janssenproject/jans/scim:1.1.2-2
- name: casa
image: ghcr.io/janssenproject/jans/casa:1.1.2_dev
image: ghcr.io/janssenproject/jans/casa:1.1.2-2
- name: admin-ui
image: ghcr.io/gluufederation/flex/admin-ui:5.1.2_dev
image: ghcr.io/gluufederation/flex/admin-ui:5.1.2-1
- name: link
image: ghcr.io/janssenproject/jans/link:1.1.2_dev
image: ghcr.io/janssenproject/jans/link:1.1.2-2
- name: saml
image: ghcr.io/janssenproject/jans/saml:1.1.2_dev
image: ghcr.io/janssenproject/jans/saml:1.1.2-2
- name: kc-scheduler
image: ghcr.io/janssenproject/jans/kc-scheduler:1.1.2_dev
image: ghcr.io/janssenproject/jans/kc-scheduler:1.1.2-2
artifacthub.io/license: Apache-2.0
catalog.cattle.io/certified: partner
catalog.cattle.io/release-name: gluu
Expand All @@ -41,64 +41,64 @@ maintainers:
email: [email protected]
description: Gluu Access and Identity Management
name: gluu
version: 5.1.2-dev
version: 5.1.2
dependencies:
- name: config
condition: global.config.enabled
version: 1.1.2-dev
version: 1.1.2

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

- name: opendj
condition: global.opendj.enabled
version: 5.1.2-dev
version: 5.1.2

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

- name: admin-ui
condition: global.admin-ui.enabled
version: 5.1.2-dev
version: 5.1.2

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

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

- name: nginx-ingress
condition: global.nginx-ingress.enabled
version: 5.1.2-dev
version: 5.1.2

- name: casa
version: 1.1.2-dev
version: 1.1.2
condition: global.casa.enabled

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

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

- name: cn-istio-ingress
condition: global.istio.ingress
version: 5.1.2-dev
version: 5.1.2

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

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

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

0 comments on commit 0da8048

Please sign in to comment.