Skip to content

Commit

Permalink
Update docs, revert beta image usage
Browse files Browse the repository at this point in the history
  • Loading branch information
BWibo committed Aug 21, 2023
1 parent a9ffa0a commit ed07d7d
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 12 deletions.
16 changes: 8 additions & 8 deletions charts/sddi-ckan/charts/ckan/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ A Helm chart for SDDI enabled CKAN.
| form.create_on_ui_requires_resources | bool | `false` | CKAN form settings, see [CKAN configuration form](https://docs.ckan.org/en/latest/maintaining/configuration.html#form-settings) |
| fullnameOverride | string | `"ckan"` | Override fullname |
| image.pullPolicy | string | `"IfNotPresent"` | [Image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) |
| image.repository | string | `"ghcr.io/tum-gis/ckan-sddi-dev"` | [Image repository](https://kubernetes.io/docs/concepts/containers/images/) |
| image.repository | string | `"ghcr.io/tum-gis/ckan-sddi"` | [Image repository](https://kubernetes.io/docs/concepts/containers/images/) |
| image.tag | string | `""` | Overrides the image tag whose default is the chart `appVersion`. |
| imagePullSecrets | list | `[]` | [Image pull secrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) |
| ingress.annotations | string | `nil` | Additional Ingress annotations |
Expand Down Expand Up @@ -137,14 +137,14 @@ A Helm chart for SDDI enabled CKAN.
| serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
| serviceAccount.create | bool | `false` | Specifies whether a service account should be created |
| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
| session.beakerSamesite | string | `nil` | |
| session.beakerSessionHttpOnly | string | `nil` | |
| session.beakerSamesite | string | `nil` | defaults to "Lax" if left empty. |
| session.beakerSessionHttpOnly | string | `nil` | defaults to `True` if left empty. |
| session.beakerSessionKey | string | `"ckan-session"` | [CKAN beaker session key](https://docs.ckan.org/en/latest/maintaining/configuration.html#beaker-session-key), defaults to *ckan* if left empty. |
| session.beakerSessionSecret | string | `nil` | [CKAN beaker session secret](https://docs.ckan.org/en/latest/maintaining/configuration.html#beaker-session-secret): If left empty, a [64 char random AlphaNum](https://docs.gomplate.ca/functions/random/#random-alphanum) is used. **Note:** In a cluster environment this values need to be the same on each instance. |
| session.beakerSessionSecure | string | `nil` | |
| session.beakerSessionTimeout | string | `nil` | |
| session.beakerSessionType | string | `nil` | |
| session.beakerSessionValidateKey | string | `nil` | [CKAN beaker session validate key](https://docs.ckan.org/en/latest/maintaining/configuration.html#beaker-session-validate-key): If left empty, a [64 char random AlphaNum](https://docs.gomplate.ca/functions/random/#random-alphanum) is used. **Note:** In a cluster environment this values need to be the same on each instance. |
| session.beakerSessionSecret | string | `nil` | [CKAN beaker session secret](https://docs.ckan.org/en/latest/maintaining/configuration.html#beaker-session-secret): If left empty, a [64 char random AlphaNum](https://docs.gomplate.ca/functions/random/#random-alphanum) is generated. **Note:** In a cluster environment this values need to be the same on each instance. |
| session.beakerSessionSecure | string | `nil` | defaults to `False` if left empty. |
| session.beakerSessionTimeout | string | `nil` | defaults to 600 if left empty. |
| session.beakerSessionType | string | `nil` | defaults to "cookie" if left empty. |
| session.beakerSessionValidateKey | string | `nil` | [CKAN beaker session validate key](https://docs.ckan.org/en/latest/maintaining/configuration.html#beaker-session-validate-key): If left empty, a [64 char random AlphaNum](https://docs.gomplate.ca/functions/random/#random-alphanum) is generated. **Note:** In a cluster environment this values need to be the same on each instance. |
| siteAbout | string | `"My CKAN about info. You can use Markdown here."` | [CKAN config about](https://docs.ckan.org/en/latest/maintaining/configuration.html#ckan-site-about) |
| siteDescription | string | `"This is my SDDI CKAN instance description."` | [CKAN config site_id](https://docs.ckan.org/en/latest/maintaining/configuration.html#ckan-site-description) |
| siteId | string | `"default"` | [CKAN config site_id](https://docs.ckan.org/en/latest/maintaining/configuration.html#ckan-site-id) |
Expand Down
18 changes: 14 additions & 4 deletions charts/sddi-ckan/charts/ckan/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fullnameOverride: ckan

image:
# -- [Image repository](https://kubernetes.io/docs/concepts/containers/images/)
repository: ghcr.io/tum-gis/ckan-sddi-dev
repository: ghcr.io/tum-gis/ckan-sddi
# -- [Image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy)
pullPolicy: IfNotPresent
# -- Overrides the image tag whose default is the chart `appVersion`.
Expand Down Expand Up @@ -226,20 +226,30 @@ sysadmin:

session:
# -- [CKAN beaker session secret](https://docs.ckan.org/en/latest/maintaining/configuration.html#beaker-session-secret):
# If left empty, a [64 char random AlphaNum](https://docs.gomplate.ca/functions/random/#random-alphanum) is used.
# If left empty, a [64 char random AlphaNum](https://docs.gomplate.ca/functions/random/#random-alphanum) is generated.
# **Note:** In a cluster environment this values need to be the same on each instance.
beakerSessionSecret:
# -- [CKAN beaker session validate key](https://docs.ckan.org/en/latest/maintaining/configuration.html#beaker-session-validate-key):
# If left empty, a [64 char random AlphaNum](https://docs.gomplate.ca/functions/random/#random-alphanum) is used.
# **Note:** In a cluster environment this values need to be the same on each instance.
# If left empty, a [64 char random AlphaNum](https://docs.gomplate.ca/functions/random/#random-alphanum) is generated.
# **Note:** In a cluster environment this values need to be the same on each instance.
beakerSessionValidateKey:
# -- [CKAN beaker session key](https://docs.ckan.org/en/latest/maintaining/configuration.html#beaker-session-key),
# defaults to *ckan* if left empty.
beakerSessionKey: ckan-session
# -- [CKAN beaker session type](https://docs.ckan.org/en/latest/maintaining/configuration.html#beaker-session-type),
# -- defaults to "cookie" if left empty.
beakerSessionType:
# -- [CKAN beaker session timeout](https://docs.ckan.org/en/latest/maintaining/configuration.html#beaker-session-timeout),
# -- defaults to 600 if left empty.
beakerSessionTimeout:
# -- [CKAN beaker session secure](https://docs.ckan.org/en/latest/maintaining/configuration.html#beaker-session-secure),
# -- defaults to `False` if left empty.
beakerSessionSecure:
# -- [CKAN beaker session samesite](https://docs.ckan.org/en/latest/maintaining/configuration.html#beaker-session-samesite),
# -- defaults to "Lax" if left empty.
beakerSamesite:
# -- [CKAN beaker session http only](https://docs.ckan.org/en/latest/maintaining/configuration.html#beaker-session-httponly),
# -- defaults to `True` if left empty.
beakerSessionHttpOnly:

apiToken:
Expand Down

0 comments on commit ed07d7d

Please sign in to comment.