Skip to content

Commit 0fe1fb8

Browse files
DemonsthereDemonsthere
authored
chore: update ory components (#597)
1 parent 3c172a2 commit 0fe1fb8

22 files changed

+85
-89
lines changed

‎.prettierignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.github/pull_request_template.md
22
.github/ISSUE_TEMPLATE/
3-
helm/charts/
43
docs/helm/charts/index.yaml
4+
helm/charts/**/templates/*.yaml
5+
helm/charts/**/tests/*.yaml
6+
helm/charts/**/README.md

‎helm/charts/example-idp/Chart.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
apiVersion: v2
22
appVersion: "1.4.6"
3-
description: A Helm chart for deploying the reference implementation for the User Login and Consent Flow in Kubernetes
3+
description:
4+
A Helm chart for deploying the reference implementation for the User Login and
5+
Consent Flow in Kubernetes
46
name: example-idp
57
version: 0.31.0
68
type: application

‎helm/charts/example-idp/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ A Helm chart for deploying the reference implementation for the User Login and C
2626
| ingress.tls | list | `[]` | |
2727
| nameOverride | string | `""` | |
2828
| nodeSelector | object | `{}` | |
29-
| resources | object | `{}` | We usually recommend not to specify default resources and to leave this as a conscious choice for the user. This also increases chances charts run on environments with little resources, such as Minikube. If you do want to specify resources, uncomment the following lines, adjust them as necessary, and remove the curly braces after 'resources:'. limits: cpu: 100m memory: 128Mi requests: cpu: 100m memory: 128Mi |
29+
| resources | object | `{}` | We usually recommend not to specify default resources and to leave this as a conscious choice for the user. This also increases chances charts run on environments with little resources, such as Minikube. If you do want to specify resources, uncomment the following lines, adjust them as necessary, and remove the curly braces after 'resources:'. limits: cpu: 100m memory: 128Mi requests: cpu: 100m memory: 128Mi |
3030
| service.annotations | object | `{}` | If you do want to specify annotations, uncomment the following lines, adjust them as necessary, and remove the curly braces after 'annotations:'. |
3131
| service.port | int | `3000` | |
3232
| service.type | string | `"ClusterIP"` | |

‎helm/charts/example-idp/values.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ service:
2222
ingress:
2323
enabled: false
2424
className: ""
25-
annotations: {}
25+
annotations:
26+
{}
2627
# kubernetes.io/ingress.class: nginx
2728
# kubernetes.io/tls-acme: "true"
2829
hosts:
@@ -40,7 +41,7 @@ ingress:
4041
# baseUrl: ""
4142
# mockTlsTermination: ""
4243

43-
# -- We usually recommend not to specify default resources and to leave this as a conscious choice for the user.
44+
# -- We usually recommend not to specify default resources and to leave this as a conscious choice for the user.
4445
# This also increases chances charts run on environments with little
4546
# resources, such as Minikube. If you do want to specify resources, uncomment the following
4647
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.

‎helm/charts/hydra-maester/values.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ adminService:
3535
forwardedProto:
3636

3737
deployment:
38-
resources: {}
38+
resources:
39+
{}
3940
# We usually recommend not to specify default resources and to leave this as a conscious
4041
# choice for the user. This also increases chances charts run on environments with little
4142
# resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -51,7 +52,7 @@ deployment:
5152
securityContext:
5253
capabilities:
5354
drop:
54-
- ALL
55+
- ALL
5556
seccompProfile:
5657
type: RuntimeDefault
5758
readOnlyRootFilesystem: true

‎helm/charts/hydra/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: "v2.0.3"
2+
appVersion: "v2.1.1"
33
description: A Helm chart for deploying ORY Hydra in Kubernetes
44
name: hydra
55
icon: https://raw.githubusercontent.com/ory/docs/master/docs/static/img/logo-hydra.svg

‎helm/charts/hydra/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# hydra
22

3-
![Version: 0.31.0](https://img.shields.io/badge/Version-0.31.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.0.3](https://img.shields.io/badge/AppVersion-v2.0.3-informational?style=flat-square)
3+
![Version: 0.31.0](https://img.shields.io/badge/Version-0.31.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.1.1](https://img.shields.io/badge/AppVersion-v2.1.1-informational?style=flat-square)
44

55
A Helm chart for deploying ORY Hydra in Kubernetes
66

@@ -47,9 +47,9 @@ A Helm chart for deploying ORY Hydra in Kubernetes
4747
| deployment.automigration.extraEnv | list | `[]` | Array of extra envs to be passed to the initContainer. Kubernetes format is expected - name: FOO value: BAR |
4848
| deployment.automountServiceAccountToken | bool | `true` | |
4949
| deployment.autoscaling | object | `{"enabled":false,"maxReplicas":3,"minReplicas":1,"targetCPU":{},"targetMemory":{}}` | Configure HPA |
50-
| deployment.customLivenessProbe | object | `{}` | Configure a custom livenessProbe. This overwrites the default object |
51-
| deployment.customReadinessProbe | object | `{}` | Configure a custom readinessProbe. This overwrites the default object |
52-
| deployment.customStartupProbe | object | `{}` | Configure a custom startupProbe. This overwrites the default object |
50+
| deployment.customLivenessProbe | object | `{}` | Configure a custom livenessProbe. This overwrites the default object |
51+
| deployment.customReadinessProbe | object | `{}` | Configure a custom readinessProbe. This overwrites the default object |
52+
| deployment.customStartupProbe | object | `{}` | Configure a custom startupProbe. This overwrites the default object |
5353
| deployment.dnsConfig | object | `{}` | Configure pod dnsConfig. |
5454
| deployment.extraContainers | string | `""` | If you want to add extra sidecar containers. |
5555
| deployment.extraEnv | list | `[]` | Array of extra envs to be passed to the deployment. Kubernetes format is expected - name: FOO value: BAR |
@@ -92,10 +92,10 @@ A Helm chart for deploying ORY Hydra in Kubernetes
9292
| hydra.automigration.type | string | `"job"` | Configure the way to execute database migration. Possible values: job, initContainer When set to job, the migration will be executed as a job on release or upgrade. When set to initContainer, the migration will be executed when kratos pod is created Defaults to job |
9393
| hydra.config | object | `{"secrets":{},"serve":{"admin":{"port":4445},"public":{"port":4444},"tls":{"allow_termination_from":["10.0.0.0/8","172.16.0.0/12","192.168.0.0/16"]}},"urls":{"self":{}}}` | The ORY Hydra configuration. For a full list of available settings, check: https://www.ory.sh/docs/hydra/reference/configuration |
9494
| hydra.config.secrets | object | `{}` | The secrets have to be provided as a string slice, example: system: - "OG5XbmxXa3dYeGplQXpQanYxeEFuRUFa" - "foo bar 123 456 lorem" - "foo bar 123 456 lorem 1" - "foo bar 123 456 lorem 2" - "foo bar 123 456 lorem 3" |
95-
| hydra.dev | bool | `false` | Enable dev mode, not secure in production environments |
95+
| hydra.dev | bool | `false` | Enable dev mode, not secure in production environments |
9696
| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
9797
| image.repository | string | `"oryd/hydra"` | ORY Hydra image |
98-
| image.tag | string | `"v2.0.3"` | ORY Hydra version |
98+
| image.tag | string | `"v2.1.1"` | ORY Hydra version |
9999
| imagePullSecrets | list | `[]` | Image pull secrets |
100100
| ingress | object | `{"admin":{"annotations":{},"className":"","enabled":false,"hosts":[{"host":"admin.hydra.localhost","paths":[{"path":"/","pathType":"ImplementationSpecific"}]}]},"public":{"annotations":{},"className":"","enabled":false,"hosts":[{"host":"public.hydra.localhost","paths":[{"path":"/","pathType":"ImplementationSpecific"}]}]}}` | Configure ingress |
101101
| ingress.admin.enabled | bool | `false` | En-/Disable the api ingress. |

‎helm/charts/hydra/values.yaml

+8-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ image:
55
# -- ORY Hydra image
66
repository: oryd/hydra
77
# -- ORY Hydra version
8-
tag: v2.0.3
8+
tag: v2.1.1
99
# -- Image pull policy
1010
pullPolicy: IfNotPresent
1111

@@ -167,7 +167,7 @@ hydra:
167167
# -- resource requests and limits for the automigration initcontainer
168168
resources: {}
169169

170-
# -- Enable dev mode, not secure in production environments
170+
# -- Enable dev mode, not secure in production environments
171171
dev: false
172172

173173
deployment:
@@ -230,11 +230,10 @@ deployment:
230230

231231
# -- Parameters for the automigration initContainer
232232
automigration:
233-
234233
# -- Array of extra envs to be passed to the initContainer. Kubernetes format is expected
235234
# - name: FOO
236235
# value: BAR
237-
extraEnv: []
236+
extraEnv: []
238237

239238
# -- Configure node tolerations.
240239
tolerations: []
@@ -336,11 +335,11 @@ deployment:
336335
# - name: ...
337336
# image: ...
338337

339-
# -- Configure a custom livenessProbe. This overwrites the default object
340-
customLivenessProbe: {}
341-
# -- Configure a custom readinessProbe. This overwrites the default object
338+
# -- Configure a custom livenessProbe. This overwrites the default object
339+
customLivenessProbe: {}
340+
# -- Configure a custom readinessProbe. This overwrites the default object
342341
customReadinessProbe: {}
343-
# -- Configure a custom startupProbe. This overwrites the default object
342+
# -- Configure a custom startupProbe. This overwrites the default object
344343
customStartupProbe: {}
345344

346345
# -- Values for initialization job
@@ -450,7 +449,7 @@ watcher:
450449
# -- Extra pod level annotations
451450
annotations: {}
452451
# -- Label key used for managing applications
453-
watchLabelKey: 'ory.sh/watcher'
452+
watchLabelKey: "ory.sh/watcher"
454453

455454
## -- pod securityContext for watcher deployment
456455
podSecurityContext: {}

‎helm/charts/keto/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ version: 0.31.0
2525
# This is the version number of the application being deployed. This version number should be
2626
# incremented each time you make changes to the application. Versions are not expected to
2727
# follow Semantic Versioning. They should reflect the version the application is using.
28-
appVersion: "v0.10.0"
28+
appVersion: "v0.11.0"

‎helm/charts/keto/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# keto
22

3-
![Version: 0.31.0](https://img.shields.io/badge/Version-0.31.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.10.0](https://img.shields.io/badge/AppVersion-v0.10.0-informational?style=flat-square)
3+
![Version: 0.31.0](https://img.shields.io/badge/Version-0.31.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.11.0](https://img.shields.io/badge/AppVersion-v0.11.0-informational?style=flat-square)
44

55
Access Control Policies as a Server
66

@@ -28,8 +28,8 @@ Access Control Policies as a Server
2828
| deployment.automigration.extraEnv | list | `[]` | Array of extra envs to be passed to the initContainer. Kubernetes format is expected - name: FOO value: BAR |
2929
| deployment.autoscaling | object | `{"enabled":false,"maxReplicas":100,"minReplicas":1,"targetCPU":{},"targetMemory":{}}` | Autoscaling for keto deployment |
3030
| deployment.customLivenessProbe | object | `{}` | Configure a custom livenessProbe. This overwrites the default object |
31-
| deployment.customReadinessProbe | object | `{}` | Configure a custom readinessProbe. This overwrites the default object |
32-
| deployment.customStartupProbe | object | `{}` | Configure a custom startupProbe. This overwrites the default object |
31+
| deployment.customReadinessProbe | object | `{}` | Configure a custom readinessProbe. This overwrites the default object |
32+
| deployment.customStartupProbe | object | `{}` | Configure a custom startupProbe. This overwrites the default object |
3333
| deployment.dnsConfig | object | `{}` | Configure pod dnsConfig. |
3434
| deployment.extraContainers | string | `""` | If you want to add extra sidecar containers. |
3535
| deployment.extraEnv | list | `[]` | Array of extra Envs to be added to the deployment. K8s format expected - name: FOO value: BAR |
@@ -51,7 +51,7 @@ Access Control Policies as a Server
5151
| fullnameOverride | string | `""` | |
5252
| image.pullPolicy | string | `"IfNotPresent"` | Default image pull policy |
5353
| image.repository | string | `"oryd/keto"` | Ory KETO image |
54-
| image.tag | string | `"v0.10.0"` | Ory KETO version |
54+
| image.tag | string | `"v0.11.1"` | Ory KETO version |
5555
| imagePullSecrets | list | `[]` | |
5656
| ingress | object | `{"read":{"annotations":{},"className":"","enabled":false,"hosts":[{"host":"chart-example.local","paths":[{"path":"/read","pathType":"Prefix"}]}],"tls":[]},"write":{"annotations":{},"className":"","enabled":false,"hosts":[{"host":"chart-example.local","paths":[{"path":"/write","pathType":"Prefix"}]}],"tls":[]}}` | Ingress definitions |
5757
| job | object | `{"annotations":{"helm.sh/hook":"pre-install, pre-upgrade","helm.sh/hook-delete-policy":"before-hook-creation,hook-succeeded","helm.sh/hook-weight":"1"},"automountServiceAccountToken":true,"extraContainers":"","extraEnv":[],"extraInitContainers":"","lifecycle":"","nodeSelector":{},"podMetadata":{"annotations":{},"labels":{}},"serviceAccount":{"annotations":{"helm.sh/hook":"pre-install, pre-upgrade","helm.sh/hook-delete-policy":"before-hook-creation","helm.sh/hook-weight":"0"},"create":true,"name":""},"shareProcessNamespace":false,"spec":{"backoffLimit":10},"tolerations":[]}` | Values for initialization job |
@@ -74,9 +74,9 @@ Access Control Policies as a Server
7474
| job.tolerations | list | `[]` | Configure node tolerations. |
7575
| keto | object | `{"automigration":{"customArgs":[],"customCommand":[],"enabled":false,"type":"job"},"config":{"dsn":"memory","namespaces":[{"id":0,"name":"sample"}],"serve":{"metrics":{"port":4468},"read":{"port":4466},"write":{"port":4467}}}}` | Main application config. |
7676
| keto.automigration | object | `{"customArgs":[],"customCommand":[],"enabled":false,"type":"job"}` | Enables database migration |
77-
| keto.automigration.customArgs | list | `[]` | Ability to override arguments of the entrypoint. Can be used in-depended of customCommand eg: - sleep 5; - keto |
77+
| keto.automigration.customArgs | list | `[]` | Ability to override arguments of the entrypoint. Can be used in-depended of customCommand eg: - sleep 5; - keto |
7878
| keto.automigration.customCommand | list | `[]` | Ability to override the entrypoint of the automigration container (e.g. to source dynamic secrets or export environment dynamic variables) |
79-
| keto.automigration.type | string | `"job"` | Configure the way to execute database migration. Possible values: job, initContainer When set to job, the migration will be executed as a job on release or upgrade. When set to initContainer, the migration will be executed when kratos pod is created Defaults to job |
79+
| keto.automigration.type | string | `"job"` | Configure the way to execute database migration. Possible values: job, initContainer When set to job, the migration will be executed as a job on release or upgrade. When set to initContainer, the migration will be executed when kratos pod is created Defaults to job |
8080
| keto.config | object | `{"dsn":"memory","namespaces":[{"id":0,"name":"sample"}],"serve":{"metrics":{"port":4468},"read":{"port":4466},"write":{"port":4467}}}` | Direct keto config. Full documentation can be found in https://www.ory.sh/keto/docs/reference/configuration |
8181
| nameOverride | string | `""` | |
8282
| pdb | object | `{"enabled":false,"spec":{"minAvailable":1}}` | PodDistributionBudget configuration |

‎helm/charts/keto/values.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ image:
1111
pullPolicy: IfNotPresent
1212
# Overrides the image tag whose default is the chart appVersion.
1313
# -- Ory KETO version
14-
tag: "v0.10.0"
14+
tag: "v0.11.1"
1515

1616
imagePullSecrets: []
1717
nameOverride: ""
@@ -207,12 +207,12 @@ keto:
207207
# -- Configure the way to execute database migration. Possible values: job, initContainer
208208
# When set to job, the migration will be executed as a job on release or upgrade.
209209
# When set to initContainer, the migration will be executed when kratos pod is created
210-
# Defaults to job
210+
# Defaults to job
211211
type: job
212212
# -- Ability to override the entrypoint of the automigration container
213213
# (e.g. to source dynamic secrets or export environment dynamic variables)
214214
customCommand: []
215-
# -- Ability to override arguments of the entrypoint. Can be used in-depended of customCommand
215+
# -- Ability to override arguments of the entrypoint. Can be used in-depended of customCommand
216216
# eg:
217217
# - sleep 5;
218218
# - keto
@@ -268,10 +268,10 @@ deployment:
268268
periodSeconds: 1
269269
timeoutSeconds: 1
270270
# -- Configure a custom livenessProbe. This overwrites the default object
271-
customLivenessProbe: {}
272-
# -- Configure a custom readinessProbe. This overwrites the default object
271+
customLivenessProbe: {}
272+
# -- Configure a custom readinessProbe. This overwrites the default object
273273
customReadinessProbe: {}
274-
# -- Configure a custom startupProbe. This overwrites the default object
274+
# -- Configure a custom startupProbe. This overwrites the default object
275275
customStartupProbe: {}
276276

277277
# -- Add custom annotations to the deployment
@@ -365,7 +365,7 @@ deployment:
365365
# -- Array of extra envs to be passed to the initContainer. Kubernetes format is expected
366366
# - name: FOO
367367
# value: BAR
368-
extraEnv: []
368+
extraEnv: []
369369

370370
# -- Watcher sidecar configuration
371371
watcher:
@@ -380,7 +380,7 @@ watcher:
380380
# -- Extra pod level annotations
381381
annotations: {}
382382
# -- Label key used for managing applications
383-
watchLabelKey: 'ory.sh/watcher'
383+
watchLabelKey: "ory.sh/watcher"
384384

385385
# -- PodDistributionBudget configuration
386386
pdb:

‎helm/charts/kratos-selfservice-ui-node/values.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,13 @@ service:
3030
ingress:
3131
enabled: false
3232
className: ""
33-
annotations: {}
33+
annotations:
34+
{}
3435
# kubernetes.io/ingress.class: nginx
3536
# kubernetes.io/tls-acme: "true"
3637
hosts:
3738
- host: chart-example.local
38-
paths:
39+
paths:
3940
- path: /
4041
pathType: ImplementationSpecific
4142
tls: []
@@ -47,7 +48,7 @@ ingress:
4748
securityContext:
4849
capabilities:
4950
drop:
50-
- ALL
51+
- ALL
5152
seccompProfile:
5253
type: RuntimeDefault
5354
readOnlyRootFilesystem: true

‎helm/charts/kratos/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: v0.11.1
2+
appVersion: "v0.13.0"
33
description: A ORY Kratos Helm chart for Kubernetes
44
name: kratos
55
icon: https://raw.githubusercontent.com/ory/docs/master/docs/static/img/logo-kratos.svg

0 commit comments

Comments
 (0)