diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4e8a935..dd3c649 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/norwoodj/helm-docs - rev: v1.11.0 + rev: v1.13.0 hooks: - id: helm-docs args: diff --git a/charts/sddi-ckan/Chart.yaml b/charts/sddi-ckan/Chart.yaml index 57ab16f..07492ef 100644 --- a/charts/sddi-ckan/Chart.yaml +++ b/charts/sddi-ckan/Chart.yaml @@ -48,3 +48,8 @@ dependencies: condition: cert-manager.enabled version: "^1" repository: https://charts.jetstack.io + - name: common + repository: oci://registry-1.docker.io/bitnamicharts + tags: + - bitnami-common + version: 2.x.x diff --git a/charts/sddi-ckan/README.md b/charts/sddi-ckan/README.md index 8afae06..b2bdc4f 100644 --- a/charts/sddi-ckan/README.md +++ b/charts/sddi-ckan/README.md @@ -32,6 +32,7 @@ Kubernetes: `>= 1.23.0-0` | | solr | * | | https://charts.jetstack.io | cert-manager(cert-manager) | ^1 | | https://kubernetes.github.io/ingress-nginx | ingress-nginx(ingress-nginx) | ^4 | +| oci://registry-1.docker.io/bitnamicharts | common | 2.x.x | ## Values @@ -74,5 +75,3 @@ Kubernetes: `>= 1.23.0-0` | redis.enabled | bool | `true` | Enable/disable Redis instance. Disable, if an external Redis instance is used. | | solr.enabled | bool | `true` | Enable/disable Apache Solr instance. Disable, if an external Solr instance is used. | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/charts/sddi-ckan/charts/certIssuer/README.md b/charts/sddi-ckan/charts/certIssuer/README.md index 84f0b63..9a866b1 100644 --- a/charts/sddi-ckan/charts/certIssuer/README.md +++ b/charts/sddi-ckan/charts/certIssuer/README.md @@ -12,5 +12,3 @@ Namespace Issuers for CertManager. | enabled | bool | `true` | Enable/disable namespace [Issuers](https://cert-manager.io/docs/concepts/issuer/) for CertManager. | | issuerEmail | string | `"example@email.com"` | eMail address for registration with Let's Encrypt account. Note: This is overwritten by `global.ingress.certManager.issuerEmail`, if set. | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/charts/sddi-ckan/charts/ckan/README.md b/charts/sddi-ckan/charts/ckan/README.md index b99be89..17bf980 100644 --- a/charts/sddi-ckan/charts/ckan/README.md +++ b/charts/sddi-ckan/charts/ckan/README.md @@ -66,9 +66,12 @@ A Helm chart for SDDI enabled CKAN. | db.dbname | string | `"ckan_default"` | CKAN database database name, used to build `sqlalchemy.url` see [CKAN database settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#database-settings) | | db.host | string | `"postgis"` | CKAN database host, used to build `sqlalchemy.url` see [CKAN database settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#database-settings) | | db.port | int | `5432` | CKAN database port, used to build `sqlalchemy.url` see [CKAN database settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#database-settings) | -| defaultViews | string | `"image_view recline_view text_view geo_view geojson_view wmts_view shp_view"` | [CKAN config dafault_views](https://docs.ckan.org/en/latest/maintaining/configuration.html#ckan-views-default-views): **Note**: Make sure the required view plugins are loaded! | +| defaultViews | string | See [`values.yml`](values.yml) for the default values. | [CKAN config dafault_views](https://docs.ckan.org/en/latest/maintaining/configuration.html#ckan-views-default-views): **Note**: Make sure the required view plugins are loaded! | | enabled | bool | `true` | Enable/disable CKAN | | extraEnv | object | `{}` | Extra environment variables. Values need to be quoted. This can be used to overwrite or extend [CKAN settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#ckan-configuration-file). See [ckanext-envvars](https://github.com/okfn/ckanext-envvars) for variable naming conventions. | +| extraInitContainers | list | `[]` | Sets additional [`initContainers`](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/). The initContainers specified here, are appended to the ones specified in `initContainers`. | +| extraVolumeMounts | list | `[]` | Sets additional [`volumeMounts`](https://kubernetes.io/docs/concepts/storage/volumes). The volumeMounts specified here, are appended to the ones specified in `volumeMounts`. | +| extraVolumes | list | `[]` | Sets additional [`volumes`](https://kubernetes.io/docs/concepts/storage/volumes). The volumes specified here, are appended to the ones specified in `volumes`. | | favicon | string | `"/base/images/ckan.ico"` | Path to CKAN favicon. Custom logos will be located in e.g. `/webassets/`. See `webassets.path` setting. [CKAN config site_id](https://docs.ckan.org/en/latest/maintaining/configuration.html#ckan-site-logo) | | featured.groups | string | `"dataset online-application online-service project software method device geoobject"` | [CKAN featured groups settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#ckan-featured-groups) | | featured.orgs | string | `"bayerische-vermessungsverwaltung lehrstuhl-fur-geoinformatik bayern-innovativ"` | [CKAN featured orgs settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#ckan-featured-orgs) | @@ -79,7 +82,7 @@ A Helm chart for SDDI enabled CKAN. | 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 | -| ingress.certManager | object | `{"issuerEmail":"me@example.com","issuerName":"letsencrypt-staging","issuerType":"namespace"}` | Additional Ingress annotation for e.g. CORS, timeouts, SSL settings. See [nginx-ingress annotations docs](https://github.com/kubernetes/ingress-nginx/blob/main/docs/user-guide/nginx-configuration/annotations.md) for more. | +| ingress.certManager | object | See [`values.yml`](values.yml) for the default values. | Additional Ingress annotation for e.g. CORS, timeouts, SSL settings. See [nginx-ingress annotations docs](https://github.com/kubernetes/ingress-nginx/blob/main/docs/user-guide/nginx-configuration/annotations.md) for more. | | ingress.certManager.issuerEmail | string | `"me@example.com"` | eMail address for ACME registration with Let's Encrypt. Only used for issuerType = namespace. | | ingress.certManager.issuerName | string | `"letsencrypt-staging"` | Name of the Issuer to use. For certManager.type = namespace `letsencrypt-staging`, `letsencrypt-prod` and `self-signed` are available. | | ingress.certManager.issuerType | string | `"namespace"` | Type of [cert-manager](https://cert-manager.io/docs/) Issuer: Use either "namespace" or "cluster". | @@ -95,9 +98,8 @@ A Helm chart for SDDI enabled CKAN. | ingress.stickySessions.sessionCookie.path | string | `"/"` | [Nginx Ingress Controller Sticky sessions](https://kubernetes.github.io/ingress-nginx/examples/affinity/cookie/) | | ingress.stickySessions.sessionCookie.secure | string | `"false"` | [Nginx Ingress Controller Sticky sessions](https://kubernetes.github.io/ingress-nginx/examples/affinity/cookie/) | | ingress.tls.secretName | string | `nil` | Specify a custom tls secret name. This overwrites `global.ingress.tls.secretName`. | -| initContainers.initdata.image | object | `{"repository":"busybox","tag":"latest"}` | Image used to initialize `persistence.storagePath`. | -| initContainers.pgready.image | object | `{"repository":"bwibo/k8s-init-container","tag":"latest"}` | Image used for testing PostgresSQL database readiness. | -| licensesGroupUrl | string | `"https://raw.githubusercontent.com/tum-gis/ckanext-grouphierarchy-sddi/main/ckanext/grouphierarchy/licenses_SDDI.json"` | [CKAN licences group url](https://docs.ckan.org/en/latest/maintaining/configuration.html#licenses-group-url): A URL pointing to a JSON file containing a list of license objects. | +| initContainers | list | See `values.yml` for the list of default initContainers. | Sets [`initContainers`](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/). Set to `[]` to disable the default initContainers. Set to any list of initContainer definitions to overwrite the default initContainers. Use `extraInitContainers` to extend the default initContainers. | +| licensesGroupUrl | string | See [`values.yml`](values.yml) for the default values. | [CKAN licences group url](https://docs.ckan.org/en/latest/maintaining/configuration.html#licenses-group-url): A URL pointing to a JSON file containing a list of license objects. | | liveness.failureThreshold | int | `6` | Failure threshold for the liveness probe | | liveness.initialDelaySeconds | int | `20` | Initial delay for the liveness probe | | liveness.periodSeconds | int | `10` | Check interval for the liveness probe | @@ -105,7 +107,7 @@ A Helm chart for SDDI enabled CKAN. | locale.default | string | `"de"` | CKAN default locale, see [CKAN internationalization settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#internationalisation-settings) | | locale.filtered_out | string | `"en_GB"` | CKAN locales filtered out, see [CKAN internationalization settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#internationalisation-settings) | | locale.offered | string | `"de en"` | CKAN locales offered, see [CKAN internationalization settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#internationalisation-settings) | -| locale.order | string | `"de en pt_BR ja it cs_CZ ca es fr el sv sr sr@latin no sk fi ru de pl nl bg ko_KR hu sa sl lv"` | CKAN locale order, see [CKAN internationalization settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#internationalisation-settings) | +| locale.order | string | See [`values.yml`](values.yml) for the default values. | CKAN locale order, see [CKAN internationalization settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#internationalisation-settings) | | maxUploadSizeMB | int | `250` | Max file upload size in MB. Note: This setting is mapped to the `nginx.ingress.kubernetes.io/proxy-body-size: "600m"` and `nginx.org/client-max-body-size: "600m"` CKAN Ingress annotations too. | | nameOverride | string | `""` | Override name | | nodeSelector | object | `{}` | [k8s: Assign pods to nodes](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) | @@ -173,7 +175,7 @@ A Helm chart for SDDI enabled CKAN. | sysadmin.password | string | `"changeMe"` | CKAN admin password: Note: Min. password length = 8 chars! | | sysadmin.user | string | `"admin"` | CKAN admin username | | tolerations | list | `[]` | [k8S: Taints and tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) | +| volumeMounts | list | See [`values.yml`](values.yml) for the list of default volumeMounts. | Sets [`volumeMounts`](https://kubernetes.io/docs/concepts/storage/volumes). Set to `[]` to disable the default volumeMounts. Set to any list of volumeMount definitions to overwrite the default volumeMounts. Use `extraVolumeMounts` to extend the default volumeMounts. | +| volumes | list | See [`values.yml`](values.yml) for the list of default volumes. | Sets [`volumes`](https://kubernetes.io/docs/concepts/storage/volumes). Set to `[]` to disable the default volumes. Set to any list of volume definitions to overwrite the default volumes. Use `extraVolumes` to extend the default volumes. | | webassets.path | string | `nil` | Webassets storage path, see [CKAN webassets settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#webassets-settings) This should point to the location of webassets in the CKAN image. The path may vary depending on the CKAN Docker image used. | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/charts/sddi-ckan/charts/ckan/templates/ckan-depl.yml b/charts/sddi-ckan/charts/ckan/templates/ckan-depl.yml index 4f73b7e..c403619 100755 --- a/charts/sddi-ckan/charts/ckan/templates/ckan-depl.yml +++ b/charts/sddi-ckan/charts/ckan/templates/ckan-depl.yml @@ -42,37 +42,22 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} volumes: - - name: data - emptyDir: {} + {{- if .Values.volumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.volumes "context" $ ) | nindent 8 }} + {{- end }} - initContainers: - - name: init-data - image: "{{ .Values.initContainers.initdata.image.repository }}:{{ .Values.initContainers.initdata.image.tag }}" - command: ["sh", "-c", "chown -Rv 92:92 {{ .Values.persistence.storagePath }}"] - # securityContext: - # runAsUser: 0 - # runAsGroup: 0 + {{- if .Values.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} - volumeMounts: - - name: data - mountPath: {{ .Values.persistence.storagePath }} - readOnly: false + initContainers: + {{- if .Values.initContainers }} + {{- include "common.tplvalues.render" ( dict "value" .Values.initContainers "context" $ ) | nindent 8 }} + {{- end }} - - name: pg-ready - image: "{{ .Values.initContainers.pgready.image.repository }}:{{ .Values.initContainers.pgready.image.tag }}" - command: - - pg_isready - env: - - name: PGHOST - value: {{ .Values.global.db.host | default .Values.db.host | quote }} - - name: PGPORT - value: {{ .Values.global.db.port | default .Values.db.port | quote }} - - name: PGDATABASE - value: {{ .Values.global.db.dbname | default .Values.db.dbname | quote }} - - name: PGUSER - value: {{ .Values.global.db.auth.username | default .Values.db.auth.username | quote }} - - name: PGPASSWORD - value: {{ .Values.global.db.auth.password | default .Values.db.auth.password | quote }} + {{- if .Values.extraInitContainers }} + {{- include "common.tplvalues.render" ( dict "value" .Values.extraInitContainers "context" $ ) | nindent 8 }} + {{- end }} containers: - name: {{ .Chart.Name }} @@ -86,9 +71,13 @@ spec: protocol: TCP volumeMounts: - - name: data - mountPath: {{ .Values.persistence.storagePath }} - readOnly: false + {{- if .Values.volumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.volumeMounts "context" $ ) | nindent 10 }} + {{- end }} + + {{- if .Values.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.extraVolumeMounts "context" $ ) | nindent 10 }} + {{- end }} envFrom: - configMapRef: diff --git a/charts/sddi-ckan/charts/ckan/templates/ckan-statefulset.yml b/charts/sddi-ckan/charts/ckan/templates/ckan-statefulset.yml index 15c1f74..e898f70 100755 --- a/charts/sddi-ckan/charts/ckan/templates/ckan-statefulset.yml +++ b/charts/sddi-ckan/charts/ckan/templates/ckan-statefulset.yml @@ -41,35 +41,22 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} volumes: - - name: data - persistentVolumeClaim: - claimName: {{ include "ckan.fullname" . }} + {{- if .Values.volumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.volumes "context" $ ) | nindent 8 }} + {{- end }} - initContainers: - - name: init-data - image: "{{ .Values.initContainers.initdata.image.repository }}:{{ .Values.initContainers.initdata.image.tag }}" - command: ["sh", "-c", "chown -Rv 92:92 {{ .Values.persistence.storagePath }}"] - volumeMounts: - - name: data - mountPath: {{ .Values.persistence.storagePath }} - readOnly: false + {{- if .Values.extraVolumes }} + {{- include "common.tplvalues.render" ( dict "value" .Values.extraVolumes "context" $ ) | nindent 8 }} + {{- end }} - - name: pg-ready - image: "{{ .Values.initContainers.pgready.image.repository }}:{{ .Values.initContainers.pgready.image.tag }}" - command: - - pg_isready - env: - - name: PGHOST - value: {{ .Values.global.db.host | default .Values.db.host | quote }} - - name: PGPORT - value: {{ .Values.global.db.port | default .Values.db.port | quote }} - - name: PGDATABASE - value: {{ .Values.global.db.dbname | default .Values.db.dbname | quote }} - - name: PGUSER - value: {{ .Values.global.db.auth.username | default .Values.db.auth.username | quote }} - - name: PGPASSWORD - value: {{ .Values.global.db.auth.password | default .Values.db.auth.password | quote }} + initContainers: + {{- if .Values.initContainers }} + {{- include "common.tplvalues.render" ( dict "value" .Values.initContainers "context" $ ) | nindent 8 }} + {{- end }} + {{- if .Values.extraInitContainers }} + {{- include "common.tplvalues.render" ( dict "value" .Values.extraInitContainers "context" $ ) | nindent 8 }} + {{- end }} containers: - name: {{ .Chart.Name }} @@ -101,8 +88,13 @@ spec: {{ end }} volumeMounts: - - name: data - mountPath: {{ .Values.persistence.storagePath }} + {{- if .Values.volumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.volumeMounts "context" $ ) | nindent 10 }} + {{- end }} + + {{- if .Values.extraVolumeMounts }} + {{- include "common.tplvalues.render" ( dict "value" .Values.extraVolumeMounts "context" $ ) | nindent 10 }} + {{- end }} startupProbe: httpGet: diff --git a/charts/sddi-ckan/charts/ckan/values.yaml b/charts/sddi-ckan/charts/ckan/values.yaml index ef8179b..251e622 100755 --- a/charts/sddi-ckan/charts/ckan/values.yaml +++ b/charts/sddi-ckan/charts/ckan/values.yaml @@ -1,4 +1,3 @@ - # -- Enable/disable CKAN enabled: true @@ -21,17 +20,39 @@ image: # -- [Image pull secrets](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) imagePullSecrets: [] +# initContainers -------------------------------------------------------------- +# -- Sets [`initContainers`](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/). +# Set to `[]` to disable the default initContainers. +# Set to any list of initContainer definitions to overwrite the default initContainers. +# Use `extraInitContainers` to extend the default initContainers. +# @default -- See `values.yml` for the list of default initContainers. initContainers: - initdata: - # -- Image used to initialize `persistence.storagePath`. - image: - repository: busybox - tag: latest - pgready: - # -- Image used for testing PostgresSQL database readiness. - image: - repository: bwibo/k8s-init-container - tag: latest + - name: pg-ready + image: bwibo/k8s-init-container:latest + command: + - pg_isready + env: + - name: PGHOST + value: "{{ .Values.global.db.host | default .Values.db.host }}" + - name: PGPORT + value: "{{ .Values.global.db.port | default .Values.db.port }}" + - name: PGDATABASE + value: "{{ .Values.global.db.dbname | default .Values.db.dbname }}" + - name: PGUSER + value: "{{ .Values.global.db.auth.username | default .Values.db.auth.usernme }}" + - name: PGPASSWORD + value: "{{ .Values.global.db.auth.password | default .Values.db.auth.password }}" + - name: init-data + image: busybox:latest + command: + ["sh", "-c", "chown -Rv 92:92 {{ .Values.persistence.storagePath }}"] + volumeMounts: + - name: data + mountPath: "{{ .Values.persistence.storagePath }}" + +# -- Sets additional [`initContainers`](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/). +# The initContainers specified here, are appended to the ones specified in `initContainers`. +extraInitContainers: [] # -- Additional pod annotations podAnnotations: {} @@ -46,11 +67,13 @@ serviceAccount: name: "" # -- [k8s: Security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) -podSecurityContext: {} +podSecurityContext: + {} # fsGroup: 2000 # -- [k8s: Security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) -securityContext: {} +securityContext: + {} # capabilities: # drop: # - ALL @@ -65,8 +88,8 @@ service: port: 5000 # -- Number of replicas. Only used if `autoscaling.enabled = false`. - # **Note:** Running multiple replicas requires to enable persistent data storage (`persistence.enabled = true`) and, - # if Pods run on different nodes, a storage that supports RWX. +# **Note:** Running multiple replicas requires to enable persistent data storage (`persistence.enabled = true`) and, +# if Pods run on different nodes, a storage that supports RWX. replicaCount: 1 autoscaling: # -- Enable/disable pod autoscaling, if disabled `replicaCount` is used to set number of pods. @@ -99,6 +122,7 @@ ingress: # -- Additional Ingress annotation for e.g. CORS, timeouts, SSL settings. # See [nginx-ingress annotations docs](https://github.com/kubernetes/ingress-nginx/blob/main/docs/user-guide/nginx-configuration/annotations.md) # for more. + # @default -- See [`values.yml`](values.yml) for the default values. certManager: # -- eMail address for ACME registration with Let's Encrypt. Only used for issuerType = namespace. issuerEmail: me@example.com @@ -170,9 +194,11 @@ favicon: /base/images/ckan.ico maxUploadSizeMB: 250 # -- [CKAN licences group url](https://docs.ckan.org/en/latest/maintaining/configuration.html#licenses-group-url): # A URL pointing to a JSON file containing a list of license objects. +# @default -- See [`values.yml`](values.yml) for the default values. licensesGroupUrl: "https://raw.githubusercontent.com/tum-gis/ckanext-grouphierarchy-sddi/main/ckanext/grouphierarchy/licenses_SDDI.json" # -- [CKAN config dafault_views](https://docs.ckan.org/en/latest/maintaining/configuration.html#ckan-views-default-views): # **Note**: Make sure the required view plugins are loaded! +# @default -- See [`values.yml`](values.yml) for the default values. defaultViews: "image_view recline_view text_view geo_view geojson_view wmts_view shp_view" preview: # -- [CKAN config TextView](https://docs.ckan.org/en/latest/maintaining/configuration.html#text-view-settings): @@ -223,7 +249,7 @@ auth: create_user_via_web: true public_activity_stream_detail: true public_user_details: false - roles_that_cascade_to_sub_groups: admin editor member + roles_that_cascade_to_sub_groups: admin editor member user_create_groups: false user_create_organizations: false user_delete_groups: false @@ -289,6 +315,7 @@ locale: default: de # -- CKAN locale order, see # [CKAN internationalization settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#internationalisation-settings) + # @default -- See [`values.yml`](values.yml) for the default values. order: de en pt_BR ja it cs_CZ ca es fr el sv sr sr@latin no sk fi ru de pl nl bg ko_KR hu sa sl lv # -- CKAN locales offered, see # [CKAN internationalization settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#internationalisation-settings) @@ -307,7 +334,8 @@ webassets: # -- Extra environment variables. Values need to be quoted. This can be used to overwrite or # extend [CKAN settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#ckan-configuration-file). # See [ckanext-envvars](https://github.com/okfn/ckanext-envvars) for variable naming conventions. -extraEnv: {} +extraEnv: + {} # CKAN___SOME_VARIABLE: "someValues" # Persistence ----------------------------------------------------------------- @@ -321,7 +349,7 @@ persistence: # for CKAN__STORAGE_PATH env var too! storagePath: /var/lib/ckan accessModes: - # -- [k8s: Persistent volume access modes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes) + # -- [k8s: Persistent volume access modes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes) - ReadWriteOnce # -- Storage [capacity](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#capacity) capacity: 4Gi @@ -330,6 +358,36 @@ persistence: annotations: # helm.sh/resource-policy: keep +# Volumes --------------------------------------------------------------------- +# -- Sets [`volumes`](https://kubernetes.io/docs/concepts/storage/volumes). +# Set to `[]` to disable the default volumes. +# Set to any list of volume definitions to overwrite the default volumes. +# Use `extraVolumes` to extend the default volumes. +# @default -- See [`values.yml`](values.yml) for the list of default volumes. +volumes: + - name: data + persistentVolumeClaim: + claimName: '{{ include "ckan.fullname" . }}' + +# -- Sets additional [`volumes`](https://kubernetes.io/docs/concepts/storage/volumes). +# The volumes specified here, are appended to the ones specified in `volumes`. +extraVolumes: [] + +# VolumeMounts ---------------------------------------------------------------- +# -- Sets [`volumeMounts`](https://kubernetes.io/docs/concepts/storage/volumes). +# Set to `[]` to disable the default volumeMounts. +# Set to any list of volumeMount definitions to overwrite the default volumeMounts. +# Use `extraVolumeMounts` to extend the default volumeMounts. +# @default -- See [`values.yml`](values.yml) for the list of default volumeMounts. +volumeMounts: + - name: data + mountPath: "{{ .Values.persistence.storagePath }}" + readOnly: false + +# -- Sets additional [`volumeMounts`](https://kubernetes.io/docs/concepts/storage/volumes). +# The volumeMounts specified here, are appended to the ones specified in `volumeMounts`. +extraVolumeMounts: [] + # CKAN database --------------------------------------------------------------- db: # -- CKAN database host, used to build `sqlalchemy.url` see @@ -342,21 +400,23 @@ db: # [CKAN database settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#database-settings) dbname: ckan_default auth: - # -- CKAN database username, used to build `sqlalchemy.url` see - # [CKAN database settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#database-settings) + # -- CKAN database username, used to build `sqlalchemy.url` see + # [CKAN database settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#database-settings) username: ckan - # -- CKAN database password, used to build `sqlalchemy.url` see - # [CKAN database settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#database-settings) + # -- CKAN database password, used to build `sqlalchemy.url` see + # [CKAN database settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#database-settings) password: changeMe # Datastore ------------------------------------------------------------------- datastore: # -- CKAN datastore host, used to build `ckan.datastore.read/write_url` see # [CKAN datastore settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#datastore-settings) - host: postgis + host: + postgis # -- CKAN datastore port, used to build `ckan.datastore.read/write_url` see # [CKAN datastore settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#datastore-settings) - port: 5432 + port: + 5432 # -- CKAN datastore database name, used to build `ckan.datastore.read/write_url` see # [CKAN datastore settings](https://docs.ckan.org/en/latest/maintaining/configuration.html#datastore-settings) dbname: datastore diff --git a/charts/sddi-ckan/charts/datapusher/README.md b/charts/sddi-ckan/charts/datapusher/README.md index 800209f..dacaa0d 100644 --- a/charts/sddi-ckan/charts/datapusher/README.md +++ b/charts/sddi-ckan/charts/datapusher/README.md @@ -65,5 +65,3 @@ A Helm chart for CKAN Datapusher. | 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 | | tolerations | list | `[]` | [k8S: Taints and tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/charts/sddi-ckan/charts/postgis/README.md b/charts/sddi-ckan/charts/postgis/README.md index e3ecfcb..f8e6266 100644 --- a/charts/sddi-ckan/charts/postgis/README.md +++ b/charts/sddi-ckan/charts/postgis/README.md @@ -66,5 +66,3 @@ A Helm chart for sa simple PostGIS database pre-configured for CKAN. | 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 | | tolerations | list | `[]` | [k8S: Taints and tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/charts/sddi-ckan/charts/redis/README.md b/charts/sddi-ckan/charts/redis/README.md index 9002e4c..f0f4c07 100644 --- a/charts/sddi-ckan/charts/redis/README.md +++ b/charts/sddi-ckan/charts/redis/README.md @@ -55,5 +55,3 @@ A Helm chart for basic Redis for use with CKAN. | 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 | | tolerations | list | `[]` | [k8S: Taints and tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/charts/sddi-ckan/charts/solr/README.md b/charts/sddi-ckan/charts/solr/README.md index 88cf639..99aad44 100644 --- a/charts/sddi-ckan/charts/solr/README.md +++ b/charts/sddi-ckan/charts/solr/README.md @@ -48,5 +48,3 @@ A Helm chart for Solr pre-configured for CKAN and ckanext-spatial. | 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 | | tolerations | list | `[]` | [k8S: Taints and tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)