Skip to content
This repository was archived by the owner on Nov 25, 2024. It is now read-only.

Commit 4452833

Browse files
wrenixwrenix
authored
chore(helm): use empty/nil storageClass for helm-docs (#3245)
i believe that `nil` would be false in the if : ```yaml storageClass: ``` is still handled correct. --- In past ( #3191 ), will have the problem with an empty string `""`: ```yaml storageClass: "" ``` --- do you take another look @S7evinK ? Signed-off-by: WrenIX <[email protected]>
1 parent 4892b08 commit 4452833

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

‎helm/dendrite/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# dendrite
33

4-
![Version: 0.13.7](https://img.shields.io/badge/Version-0.13.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.13.6](https://img.shields.io/badge/AppVersion-0.13.6-informational?style=flat-square)
4+
![Version: 0.13.8](https://img.shields.io/badge/Version-0.13.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.13.6](https://img.shields.io/badge/AppVersion-0.13.6-informational?style=flat-square)
55
Dendrite Matrix Homeserver
66

77
Status: **NOT PRODUCTION READY**
@@ -48,13 +48,16 @@ Create a folder `appservices` and place your configurations in there. The confi
4848
| signing_key.create | bool | `true` | Create a new signing key, if not exists |
4949
| signing_key.existingSecret | string | `""` | Use an existing secret |
5050
| resources | object | sets some sane default values | Default resource requests/limits. |
51-
| persistence.jetstream | object | `{"capacity":"1Gi","existingClaim":""}` | The storage class to use for volume claims. Used unless specified at the specific component. Defaults to the cluster default storage class. # If defined, storageClassName: <storageClass> # If set to "-", storageClassName: "", which disables dynamic provisioning # If undefined (the default) or set to null, no storageClassName spec is # set, choosing the default provisioner. (gp2 on AWS, standard on # GKE, AWS & OpenStack) # storageClass: "" |
51+
| persistence.storageClass | string | `nil` | The storage class to use for volume claims. Used unless specified at the specific component. Defaults to the cluster default storage class. If defined, storageClassName: <storageClass> If set to "-", storageClassName: "", which disables dynamic provisioning If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner. (gp2 on AWS, standard on GKE, AWS & OpenStack) |
5252
| persistence.jetstream.existingClaim | string | `""` | Use an existing volume claim for jetstream |
5353
| persistence.jetstream.capacity | string | `"1Gi"` | PVC Storage Request for the jetstream volume |
54+
| persistence.jetstream.storageClass | string | `nil` | The storage class to use for volume claims. Defaults to persistence.storageClass If defined, storageClassName: <storageClass> If set to "-", storageClassName: "", which disables dynamic provisioning If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner. (gp2 on AWS, standard on GKE, AWS & OpenStack) |
5455
| persistence.media.existingClaim | string | `""` | Use an existing volume claim for media files |
5556
| persistence.media.capacity | string | `"1Gi"` | PVC Storage Request for the media volume |
57+
| persistence.media.storageClass | string | `nil` | The storage class to use for volume claims. Defaults to persistence.storageClass If defined, storageClassName: <storageClass> If set to "-", storageClassName: "", which disables dynamic provisioning If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner. (gp2 on AWS, standard on GKE, AWS & OpenStack) |
5658
| persistence.search.existingClaim | string | `""` | Use an existing volume claim for the fulltext search index |
5759
| persistence.search.capacity | string | `"1Gi"` | PVC Storage Request for the search volume |
60+
| persistence.search.storageClass | string | `nil` | The storage class to use for volume claims. Defaults to persistence.storageClass If defined, storageClassName: <storageClass> If set to "-", storageClassName: "", which disables dynamic provisioning If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner. (gp2 on AWS, standard on GKE, AWS & OpenStack) |
5861
| extraVolumes | list | `[]` | Add additional volumes to the Dendrite Pod |
5962
| extraVolumeMounts | list | `[]` | Configure additional mount points volumes in the Dendrite Pod |
6063
| strategy.type | string | `"RollingUpdate"` | Strategy to use for rolling updates (e.g. Recreate, RollingUpdate) If you are using ReadWriteOnce volumes, you should probably use Recreate |

‎helm/dendrite/values.yaml

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -26,55 +26,52 @@ persistence:
2626
# -- The storage class to use for volume claims.
2727
# Used unless specified at the specific component.
2828
# Defaults to the cluster default storage class.
29-
## If defined, storageClassName: <storageClass>
30-
## If set to "-", storageClassName: "", which disables dynamic provisioning
31-
## If undefined (the default) or set to null, no storageClassName spec is
32-
## set, choosing the default provisioner. (gp2 on AWS, standard on
33-
## GKE, AWS & OpenStack)
34-
##
35-
# storageClass: ""
29+
# If defined, storageClassName: <storageClass>
30+
# If set to "-", storageClassName: "", which disables dynamic provisioning
31+
# If undefined (the default) or set to null, no storageClassName spec is
32+
# set, choosing the default provisioner. (gp2 on AWS, standard on
33+
# GKE, AWS & OpenStack)
34+
#
35+
storageClass:
3636
jetstream:
3737
# -- Use an existing volume claim for jetstream
3838
existingClaim: ""
3939
# -- PVC Storage Request for the jetstream volume
4040
capacity: "1Gi"
4141
# -- The storage class to use for volume claims.
4242
# Defaults to persistence.storageClass
43-
## If defined, storageClassName: <storageClass>
44-
## If set to "-", storageClassName: "", which disables dynamic provisioning
45-
## If undefined (the default) or set to null, no storageClassName spec is
46-
## set, choosing the default provisioner. (gp2 on AWS, standard on
47-
## GKE, AWS & OpenStack)
48-
##
49-
# storageClass: ""
43+
# If defined, storageClassName: <storageClass>
44+
# If set to "-", storageClassName: "", which disables dynamic provisioning
45+
# If undefined (the default) or set to null, no storageClassName spec is
46+
# set, choosing the default provisioner. (gp2 on AWS, standard on
47+
# GKE, AWS & OpenStack)
48+
storageClass:
5049
media:
5150
# -- Use an existing volume claim for media files
5251
existingClaim: ""
5352
# -- PVC Storage Request for the media volume
5453
capacity: "1Gi"
5554
# -- The storage class to use for volume claims.
5655
# Defaults to persistence.storageClass
57-
## If defined, storageClassName: <storageClass>
58-
## If set to "-", storageClassName: "", which disables dynamic provisioning
59-
## If undefined (the default) or set to null, no storageClassName spec is
60-
## set, choosing the default provisioner. (gp2 on AWS, standard on
61-
## GKE, AWS & OpenStack)
62-
##
63-
# storageClass: ""
56+
# If defined, storageClassName: <storageClass>
57+
# If set to "-", storageClassName: "", which disables dynamic provisioning
58+
# If undefined (the default) or set to null, no storageClassName spec is
59+
# set, choosing the default provisioner. (gp2 on AWS, standard on
60+
# GKE, AWS & OpenStack)
61+
storageClass:
6462
search:
6563
# -- Use an existing volume claim for the fulltext search index
6664
existingClaim: ""
6765
# -- PVC Storage Request for the search volume
6866
capacity: "1Gi"
6967
# -- The storage class to use for volume claims.
7068
# Defaults to persistence.storageClass
71-
## If defined, storageClassName: <storageClass>
72-
## If set to "-", storageClassName: "", which disables dynamic provisioning
73-
## If undefined (the default) or set to null, no storageClassName spec is
74-
## set, choosing the default provisioner. (gp2 on AWS, standard on
75-
## GKE, AWS & OpenStack)
76-
##
77-
# storageClass: ""
69+
# If defined, storageClassName: <storageClass>
70+
# If set to "-", storageClassName: "", which disables dynamic provisioning
71+
# If undefined (the default) or set to null, no storageClassName spec is
72+
# set, choosing the default provisioner. (gp2 on AWS, standard on
73+
# GKE, AWS & OpenStack)
74+
storageClass:
7875

7976
# -- Add additional volumes to the Dendrite Pod
8077
extraVolumes: []

0 commit comments

Comments
 (0)