From 8f390636a74546c8b196ec58aace522bdc0e899a Mon Sep 17 00:00:00 2001 From: David Wobrock Date: Sun, 16 Jun 2024 13:16:06 +0200 Subject: [PATCH] Implement token lifespans config from hydra-maester. --- helm/charts/hydra-maester/Chart.yaml | 2 +- helm/charts/hydra-maester/README.md | 4 +- .../hydra-maester/crds/crd-oauth2clients.yaml | 64 +++++++++++++++++++ helm/charts/hydra-maester/values.yaml | 2 +- 4 files changed, 68 insertions(+), 4 deletions(-) diff --git a/helm/charts/hydra-maester/Chart.yaml b/helm/charts/hydra-maester/Chart.yaml index b44688b639..b8914dc4fe 100644 --- a/helm/charts/hydra-maester/Chart.yaml +++ b/helm/charts/hydra-maester/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "v0.0.33" +appVersion: "v0.0.34" description: A Helm chart for Kubernetes name: hydra-maester icon: https://raw.githubusercontent.com/ory/docs/master/docs/static/img/logo-hydra.svg diff --git a/helm/charts/hydra-maester/README.md b/helm/charts/hydra-maester/README.md index 5ed91287c6..4d68e7f993 100644 --- a/helm/charts/hydra-maester/README.md +++ b/helm/charts/hydra-maester/README.md @@ -1,6 +1,6 @@ # hydra-maester -![Version: 0.44.0](https://img.shields.io/badge/Version-0.44.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.0.33](https://img.shields.io/badge/AppVersion-v0.0.33-informational?style=flat-square) +![Version: 0.44.0](https://img.shields.io/badge/Version-0.44.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.0.34](https://img.shields.io/badge/AppVersion-v0.0.34-informational?style=flat-square) A Helm chart for Kubernetes @@ -52,7 +52,7 @@ A Helm chart for Kubernetes | forwardedProto | string | `nil` | | | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | | image.repository | string | `"oryd/hydra-maester"` | Ory Hydra-maester image | -| image.tag | string | `"v0.0.33-amd64"` | Ory Hydra-maester version | +| image.tag | string | `"v0.0.34-amd64"` | Ory Hydra-maester version | | imagePullSecrets | list | `[]` | Image pull secrets | | pdb.enabled | bool | `false` | | | pdb.spec.maxUnavailable | string | `""` | | diff --git a/helm/charts/hydra-maester/crds/crd-oauth2clients.yaml b/helm/charts/hydra-maester/crds/crd-oauth2clients.yaml index 57c2154236..16ecde750d 100644 --- a/helm/charts/hydra-maester/crds/crd-oauth2clients.yaml +++ b/helm/charts/hydra-maester/crds/crd-oauth2clients.yaml @@ -236,6 +236,70 @@ spec: Indication which authentication method shoud be used for the token endpoint type: string + tokenLifespans: + description: Configuration about token lifespans. + properties: + authorization_code_grant_access_token_lifespan: + description: + The lifespan of the access token issued during + authorization_code grant type. + pattern: [0-9]+(ns|us|ms|s|m|h) + type: string + authorization_code_grant_id_token_lifespan: + description: + The lifespan of the id token issued during + authorization_code grant type. + pattern: [0-9]+(ns|us|ms|s|m|h) + type: string + authorization_code_grant_refresh_token_lifespan: + description: + The lifespan of the refresh token issued during + authorization_code grant type. + pattern: [0-9]+(ns|us|ms|s|m|h) + type: string + client_credentials_grant_access_token_lifespan: + description: + The lifespan of the access token issued during + client_credentials grant type. + pattern: [0-9]+(ns|us|ms|s|m|h) + type: string + implicit_grant_access_token_lifespan: + description: + The lifespan of the access token issued during implicit + grant type. + pattern: [0-9]+(ns|us|ms|s|m|h) + type: string + implicit_grant_id_token_lifespan: + description: + The lifespan of the id token issued during implicit + grant type. + pattern: [0-9]+(ns|us|ms|s|m|h) + type: string + jwt_bearer_grant_access_token_lifespan: + description: + The lifespan of the access token issued during + jwt_bearer grant type. + pattern: [0-9]+(ns|us|ms|s|m|h) + type: string + refresh_token_grant_access_token_lifespan: + description: + The lifespan of the access token issued during + refresh_token grant type. + pattern: [0-9]+(ns|us|ms|s|m|h) + type: string + refresh_token_grant_id_token_lifespan: + description: + The lifespan of the id token issued during refresh_token + grant type. + pattern: [0-9]+(ns|us|ms|s|m|h) + type: string + refresh_token_grant_refresh_token_lifespan: + description: + The lifespan of the refresh token issued during + refresh_token grant type. + pattern: [0-9]+(ns|us|ms|s|m|h) + type: string + type: object required: - grantTypes - scope diff --git a/helm/charts/hydra-maester/values.yaml b/helm/charts/hydra-maester/values.yaml index 8c0dd87c46..5fe84b565d 100644 --- a/helm/charts/hydra-maester/values.yaml +++ b/helm/charts/hydra-maester/values.yaml @@ -12,7 +12,7 @@ image: # -- Ory Hydra-maester image repository: oryd/hydra-maester # -- Ory Hydra-maester version - tag: v0.0.33-amd64 + tag: v0.0.34-amd64 # -- Image pull policy pullPolicy: IfNotPresent