Skip to content
Snippets Groups Projects
Verified Commit 5f597da2 authored by Martin Weise's avatar Martin Weise
Browse files

Updated chart

parent 6e493742
Branches
Tags
4 merge requests!250Master,!246Dev,!244Dev,!243Dev
Show whitespace changes
Inline Side-by-side
helm-charts/dbrepo/README.md
+ 114
− 1
View file @ 5f597da2
......@@ -18,6 +18,8 @@ helm install my-release "oci://s210.dl.hpc.tuwien.ac.at/dbrepo/helm/dbrepo" --va
* Kubernetes 1.24+
* Kubernetes 3.8.0+
* PV provisioner support in the underlying infrastructure
* Ingress support in the underlying infrastructure
* TLS certificate provisioner support in the underlying infrastructure, e.g. [cert-manager](https://cert-manager.io/)
## Installing the Chart
......@@ -111,7 +113,7 @@ chart. See their documentation for the remaining overridden values.
| Name | Description | Value |
|----------------------------------|----------------------------------------|-------------------|
| `uploadService.enabled` | Enables/disabled the deployment. | `true` |
| `uploadService.image.registry` | Registry to pull the image | `registry` |
| `uploadService.image.registry` | Registry to pull the image | `docker.io` |
| `uploadService.image.repository` | Repository to pull the image | `tusproject/tusd` |
| `uploadService.image.tag` | Tag of the image. | `v1.12` |
| `uploadService.replicaCount` | Number of replicas for the deployment. | `2` |
......@@ -131,3 +133,114 @@ Helm chart. See their documentation for the remaining overridden values.
| `brokerService.exchangeName` | Exchange name on RabbitMQ. Needed for other services. | `dbrepo` |
| `brokerService.routingKey` | Route binding for queue to exchange defined. Needed for other services. | `dbrepo.#` |
| `brokerService.connectionTimeout` | Connection timeout. Needed for other services. | `60000` |
### Analyse Service
| Name | Description | Value |
|-----------------------------------|----------------------------------------|----------------------------|
| `analyseService.enabled` | Enables/disabled the deployment. | `true` |
| `analyseService.image.registry` | Registry to pull the image | `s210.dl.hpc.tuwien.ac.at` |
| `analyseService.image.repository` | Repository to pull the image | `dbrepo/analyse-service` |
| `analyseService.image.tag` | Tag of the image. | `1.4.1` |
| `analyseService.image.pullPolicy` | Image pull policy on deployments | `Always` |
| `analyseService.image.debug` | Enables/disabled the debug logging. | `false` |
| `analyseService.replicaCount` | Number of replicas for the deployment. | `2` |
### Metadata Service
| Name | Description | Value |
|--------------------------------------------|----------------------------------------------------------------------------------|----------------------------|
| `metadataService.enabled` | Enables/disabled the deployment. | `true` |
| `metadataService.image.registry` | Registry to pull the image | `s210.dl.hpc.tuwien.ac.at` |
| `metadataService.image.repository` | Repository to pull the image | `dbrepo/metadata-service` |
| `metadataService.image.tag` | Tag of the image. | `1.4.1` |
| `metadataService.image.pullPolicy` | Image pull policy on deployments | `Always` |
| `metadataService.image.debug` | Enables/disabled the debug logging. | `false` |
| `metadataService.adminEmail` | E-Mail address of the administrator displayed for OAI-PMH. | `noreply@example.com` |
| `metadataService.authService.url` | Url to the Auth Service. | `http://auth-service` |
| `metadataService.website` | Url to redirect PIDs to. | `http://example.com` |
| `metadataService.repositoryName` | Repository name for OAI-PMH. | `Database Repository` |
| `metadataService.datacite.enabled` | Enable/disable DataCite Fabrica DOI minting. | `false` |
| `metadataService.datacite.url` | DataCite Fabrica API endpoint. | `https://api.datacite.org` |
| `metadataService.datacite.prefix` | DataCite Fabrica DOI prefix. | `""` |
| `metadataService.datacite.username` | DataCite Fabrica API username. | `""` |
| `metadataService.datacite.password` | DataCite Fabrica API password. | `""` |
| `metadataService.rates.deleteStaleFiles` | Interval rate to delete stale files in the Storage Service. | `60` |
| `metadataService.rates.mirror` | Interval rate to mirror to the Search Database. | `60` |
| `metadataService.rates.obtainMetadata` | Interval rate to obtain metadata from the Data Database. | `60` |
| `metadataService.rates.deleteStaleQueries` | Interval rate to delete stale queries from the Query Store in the Data Database. | `60` |
| `metadataService.replicaCount` | Number of replicas for the deployment. | `2` |
### Data Service
| Name | Description | Value |
|-----------------------------------------|--------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `metadataService.enabled` | Enables/disabled the deployment. | `true` |
| `metadataService.image.registry` | Registry to pull the image | `s210.dl.hpc.tuwien.ac.at` |
| `metadataService.image.repository` | Repository to pull the image | `dbrepo/data-service` |
| `metadataService.image.tag` | Tag of the image. | `1.4.1` |
| `metadataService.image.pullPolicy` | Image pull policy on deployments | `Always` |
| `metadataService.image.debug` | Enables/disabled the debug logging. | `false` |
| `metadataService.jwt.pubkey` | The JWT pubkey to verify JWT signature. | `MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB` |
| `metadataService.consumerConcurrentMin` | The number of concurrent consumers (minimum). | `1` |
| `metadataService.consumerConcurrentMax` | The number of concurrent consumers (maximum). | `5` |
| `metadataService.requeueRejected` | Requeue rejected tuples into the Broker Service. | `false` |
| `metadataService.replicaCount` | Number of replicas for the deployment. | `2` |
### Search Service
| Name | Description | Value |
|----------------------------------|----------------------------------------|----------------------------|
| `searchService.enabled` | Enables/disabled the deployment. | `true` |
| `searchService.image.registry` | Registry to pull the image | `s210.dl.hpc.tuwien.ac.at` |
| `searchService.image.repository` | Repository to pull the image | `dbrepo/search-service` |
| `searchService.image.tag` | Tag of the image. | `1.4.1` |
| `searchService.image.pullPolicy` | Image pull policy on deployments | `Always` |
| `searchService.image.debug` | Enables/disabled the debug logging. | `false` |
| `searchService.replicaCount` | Number of replicas for the deployment. | `2` |
### Storage Service
The Storage Service uses the [SeaweedFS](https://artifacthub.io/packages/helm/seaweedfs/seaweedfs)
Helm chart. See their documentation for the remaining overridden values.
| Name | Description | Value |
|-----------------|---------------------------------------------|------------------|
| `auth.username` | Username for S3. Needed for other services. | `seaweedfsadmin` |
| `auth.password` | Password for S3. Needed for other services. | `seaweedfsadmin` |
### User Interface
To replace the placeholder values in
the [`dbrepo.config.json`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-v1.4/dbrepo-ui/dbrepo.config.json)
you need to create a ConfigMap `my-config` and mount the `dbrepo.config.json` into `/app/dbrepo.config.json`:
```yaml
ui:
extraVolumes:
- name: config-map
configMap:
name: my-config
extraVolumeMounts:
- name: config-map
mountPath: /dbrepo.config.json
subPath: dbrepo.config.json
readOnly: true
...
```
| Name | Description | Value |
|------------------------|----------------------------------------|----------------------------|
| `ui.enabled` | Enables/disabled the deployment. | `enabled` |
| `ui.image.registry` | Registry to pull the image | `s210.dl.hpc.tuwien.ac.at` |
| `ui.image.repository` | Repository to pull the image | `dbrepo/ui` |
| `ui.image.tag` | Tag of the image. | `1.4.1` |
| `ui.image.pullPolicy` | Image pull policy on deployments | `Always` |
| `ui.replicaCount` | Number of replicas for the deployment. | `2` |
| `ui.extraVolumes` | List of extra volumes. | `[]` |
| `ui.extraVolumeMounts` | List of extra volume mounts. | `[]` |
## Ingress
The deployment depends on ingress, by default ingress is configured
for [NGINX Ingress Controller](https://github.com/kubernetes/ingress-nginx) with annotations.
\ No newline at end of file
helm-charts/dbrepo/templates/metadata-service/deployment.yaml
+ 10
− 0
View file @ 5f597da2
......@@ -129,6 +129,11 @@ spec:
secretKeyRef:
name: metadata-service-secret
key: keycloak-admin-password
- name: KEYCLOAK_CLIENT_SECRET
valueFrom:
secretKeyRef:
name: metadata-service-secret
key: keycloak-client-secret
- name: JWT_ISSUER
valueFrom:
secretKeyRef:
......@@ -239,6 +244,11 @@ spec:
secretKeyRef:
name: metadata-service-secret
key: s3-export-bucket
- name: DELETE_STALE_FILES_RATE
valueFrom:
secretKeyRef:
name: metadata-service-secret
key: delete-stale-files-rate
- name: MIRROR_RATE
valueFrom:
secretKeyRef:
......
helm-charts/dbrepo/templates/metadata-service/secret.yaml
+ 2
− 0
View file @ 5f597da2
......@@ -27,6 +27,7 @@ stringData:
keycloak-host: "{{ .Values.metadataService.authService.url }}"
keycloak-admin: "{{ .Values.authService.auth.adminUser }}"
keycloak-admin-password: "{{ .Values.authService.auth.adminPassword }}"
keycloak-client-secret: "{{ .Values.authService.client.secret }}"
datacite-url: "{{ .Values.metadataService.datacite.url }}"
datacite-prefix: "{{ .Values.metadataService.datacite.prefix | toString }}"
datacite-username: "{{ .Values.metadataService.datacite.username }}"
......@@ -47,6 +48,7 @@ stringData:
s3-secret-access-key: "{{ .Values.storageService.s3.auth.password }}"
s3-import-bucket: "dbrepo-upload"
s3-export-bucket: "dbrepo-download"
delete-stale-files-rate: {{ .Values.metadataService.rates.deleteStaleFiles | quote }}
mirror-rate: {{ .Values.metadataService.rates.mirror | quote }}
obtain-metadata-rate: {{ .Values.metadataService.rates.obtainMetadata | quote }}
delete-stale-queries-rate: {{ .Values.metadataService.rates.deleteStaleQueries | quote }}
helm-charts/dbrepo/templates/ui/configmap.yaml
+ 24
− 33
View file @ 5f597da2
......@@ -8,28 +8,30 @@ metadata:
data:
dbrepo.config.json: |
{
"title": "{{ .Values.ui.title }}",
"version": "{{ .Values.ui.version }}",
"title": "Database Repository",
"version": "1.4.1",
"ssl": {
"force": "{{ .Values.ui.forceSsl }}"
"force": false
},
"logo": {
"path": "{{ .Values.ui.logo }}"
"path": "/logo.svg"
},
"icon": {
"path": "{{ .Values.ui.icon }}"
"path": "/favicon.ico"
},
"appleTouchIcon": {
"path": "{{ .Values.ui.appleTouchIcon }}"
"path": "/apple-touch-icon.png"
},
"api": {
"useSsl": "{{ .Values.ui.forceSsl }}"
"useSsl": false
},
"broker": {
"connection": {
"host": "{{ .Values.ui.broker.host }}",
"ports": {{ .Values.ui.broker.ports | toJson }},
"extraInfo": "{{ .Values.ui.broker.extraInfo}}"
"host": "localhost",
"ports": [
5672
],
"extraInfo": null
}
},
"storage": {
......@@ -41,9 +43,14 @@ data:
"secret": "seaweedfsadmin"
}
},
"upload": {
"endpoint": "localhost",
"port": 1080,
"useSsl": false
},
"database": {
"connection": {
"extraInfo": "128.130.0.0/15"
"extraInfo": null
}
},
"keycloak": {
......@@ -58,38 +65,22 @@ data:
},
"pid": {
"default": {
"publisher": "TU Wien"
"publisher": "Example University"
}
},
"doi": {
"url": "{{ .Values.ui.datacite.url }}"
"url": "https://doi.org"
},
"pages": {
"login": {
"links": [
{
"text": "OpenSearch Admin",
"blank": true,
"href": "{{ printf "https://%s/admin/dashboard" .Values.hostname }}"
},
{
"text": "RabbitMQ Admin",
"blank": true,
"href": "{{ printf "https://%s/admin/broker/" .Values.hostname }}"
},
{
"text": "Keycloak Admin",
"blank": true,
"href": "{{ printf "https://%s/api/auth/" .Values.hostname }}"
}
]
"links": []
},
"information": {
"links": [
{
"text": "Online Documentation",
"blank": true,
"href": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/latest/"
"href": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/"
},
{
"text": "Sourcecode Documentation",
......@@ -107,9 +98,9 @@ data:
"href": "https://test.dbrepo.tuwien.ac.at/"
},
{
"text": "Demo Instance (Docker Compose)",
"text": "Pilot Instance (Docker Compose)",
"blank": true,
"href": "https://dbrepo2.ec.tuwien.ac.at/"
"href": "https://dbrepo1.ec.tuwien.ac.at/"
},
{
"text": "Paper",
......
helm-charts/dbrepo/values.yaml
+ 6
− 21
View file @ 5f597da2
......@@ -344,7 +344,7 @@ analyseService:
image:
registry: s210.dl.hpc.tuwien.ac.at
repository: dbrepo/analyse-service
tag: "latest"
tag: "1.4.1"
pullPolicy: Always
debug: false
replicaCount: 2
......@@ -354,7 +354,7 @@ metadataService:
image:
registry: s210.dl.hpc.tuwien.ac.at
repository: dbrepo/metadata-service
tag: "latest"
tag: "1.4.1"
pullPolicy: Always
debug: false
adminEmail: noreply@example.com
......@@ -369,6 +369,7 @@ metadataService:
username: ""
password: ""
rates:
deleteStaleFiles: 60
mirror: 60
obtainMetadata: 60
deleteStaleQueries: 60
......@@ -379,7 +380,7 @@ dataService:
image:
registry: s210.dl.hpc.tuwien.ac.at
repository: dbrepo/data-service
tag: "latest"
tag: "1.4.1"
pullPolicy: Always
debug: false
jwt:
......@@ -394,7 +395,7 @@ searchService:
image:
registry: s210.dl.hpc.tuwien.ac.at
repository: dbrepo/search-service
tag: "latest"
tag: "1.4.1"
pullPolicy: Always
debug: false
replicaCount: 2
......@@ -468,24 +469,8 @@ ui:
image:
registry: s210.dl.hpc.tuwien.ac.at
repository: dbrepo/ui
tag: "latest"
tag: "1.4.1"
pullPolicy: Always
logo: /logo.svg
icon: /favicon.ico
appleTouchIcon: /apple-touch-logo.png
version: 1.4.0
title: Database Repository
datacite:
url: https://doi.org
keycloak:
url: /api/auth/admin/
broker:
url: /admin/broker/
host: broker-service
extraInfo: ""
ports:
- 5672
forceSsl: false
replicaCount: 2
extraVolumes: [ ]
# - name: images-map
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment