diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d690321f314ed7a8d114c37af9f8f605bac7358..61e417ddec51f413f47dd4ce3949f0175b62d768 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,7 +101,7 @@ lint-helm-readme:
- npm install -g pkg
- pkg . -o readme-generator
script:
- - ./readme-generator --readme ./CI_README.md --values ./helm/dbrepo/values.yaml
+ - ./readme-generator --readme ./helm/dbrepo/README.md --values ./helm/dbrepo/values.yaml
- diff ./CI_README.md ./helm/dbrepo/README.md
lint-metadata-schema:
diff --git a/helm/dbrepo/README.md b/helm/dbrepo/README.md
index 8c03ed1801a819673a1af37dcf6de45a3265d55d..7c613aaebc7a68b53f7df511ec85d66e00b489ca 100644
--- a/helm/dbrepo/README.md
+++ b/helm/dbrepo/README.md
@@ -65,7 +65,7 @@ The command removes all the Kubernetes components associated with the chart and
### Metadata Database
| Name | Description | Value |
-| ---------------------------------------- |----------------------------------------------------------------------------------------------------------------------------------------| ---------------------------------------------------------------------- |
+| ---------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- |
| `metadatadb.enabled` | Enable the Metadata datadb. | `true` |
| `metadatadb.host` | The hostname for the microservices. | `metadata-db` |
| `metadatadb.extraFlags` | Extra flags to ensure the query store works as intended, ref https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/api/data-db/#data | `--character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci` |
@@ -81,24 +81,24 @@ The command removes all the Kubernetes components associated with the chart and
### Auth Service
-| Name | Description | Value |
-| ---------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `authservice.enabled` | Enable the Auth Service. | `true` |
-| `authservice.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
-| `authservice.endpoint` | The hostname for the microservices. | `http://auth-service` |
-| `authservice.resourcesPreset` | The container resource presets | `small` |
-| `authservice.jwt.pubkey` | The JWT public key from the `dbrepo-client`. | `MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB` |
-| `authservice.tls.enabled` | Enable TLS/SSL communication. Required for HTTPS. | `true` |
-| `authservice.tls.existingSecret` | The secret containing the `tls.crt`, `tls.key` and `ca.crt`. | `ingress-cert` |
-| `authservice.client.id` | The client id for the microservices. | `dbrepo-client` |
-| `authservice.client.secret` | The client secret for the microservices. | `MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG` |
-| `authservice.init.resourcesPreset` | The container resource preset | `nano` |
-| `authservice.init.resources` | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}` |
+| Name | Description | Value |
+| -------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `authservice.enabled` | Enable the Auth Service. | `true` |
+| `authservice.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
+| `authservice.endpoint` | The hostname for the microservices. | `http://auth-service` |
+| `authservice.resourcesPreset` | The container resource presets | `small` |
+| `authservice.jwt.pubkey` | The JWT public key from the `dbrepo-client`. | `MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB` |
+| `authservice.tls.enabled` | Enable TLS/SSL communication. Required for HTTPS. | `true` |
+| `authservice.tls.existingSecret` | The secret containing the `tls.crt`, `tls.key` and `ca.crt`. | `ingress-cert` |
+| `authservice.client.id` | The client id for the microservices. | `dbrepo-client` |
+| `authservice.client.secret` | The client secret for the microservices. | `MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG` |
+| `authservice.setupJob.resourcesPreset` | The container resource preset | `nano` |
+| `authservice.setupJob.resources` | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}` |
### Data Database
| Name | Description | Value |
-| ------------------------------------ |----------------------------------------------------------------------------------------------------------------------------------------| ---------------------------------------------------------------------- |
+| ------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- |
| `datadb.host` | The hostname for the microservices. | `data-db` |
| `datadb.extraFlags` | Extra flags to ensure the query store works as intended, ref https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/api/data-db/#data | `--character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci` |
| `datadb.rootUser.user` | The root username. | `root` |
@@ -224,7 +224,7 @@ mqtt.prefetch = 10
| `metadataservice.containerSecurityContext.readOnlyRootFilesystem` | Set container's Security Context readOnlyRootFilesystem | `false` |
| `metadataservice.containerSecurityContext.capabilities.drop` | Set container's Security Context runAsNonRoot | `["ALL"]` |
| `metadataservice.containerSecurityContext.seccompProfile.type` | Set container's Security Context seccomp profile | `RuntimeDefault` |
-| `metadataservice.resourcesPreset` | The container resource preset | `micro` |
+| `metadataservice.resourcesPreset` | The container resource preset | `small` |
| `metadataservice.resources` | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}` |
| `metadataservice.endpoint` | The Metadata Service endpoint. | `http://metadata-service` |
| `metadataservice.crossref.endpoint` | The CrossRef endpoint. | `http://data.crossref.org` |
diff --git a/helm/dbrepo/charts/seaweedfs-4.2.1.tgz b/helm/dbrepo/charts/seaweedfs-4.2.1.tgz
index 768b5d085bbfc1d987250a546ffb3e032959c241..6fd5807b55c4d6ad8041d96ca5d4a39ed3795138 100644
Binary files a/helm/dbrepo/charts/seaweedfs-4.2.1.tgz and b/helm/dbrepo/charts/seaweedfs-4.2.1.tgz differ
diff --git a/helm/dbrepo/values.schema.json b/helm/dbrepo/values.schema.json
index 09268112eba7823bb0f91eb2691649bd23b66c3e..7da5eff2a65100c1156670029d49d0ddfa1fbded 100644
--- a/helm/dbrepo/values.schema.json
+++ b/helm/dbrepo/values.schema.json
@@ -129,9 +129,6 @@
"extraEnvVarsCM": {
"type": "string"
},
- "extraStartupArgs": {
- "type": "string"
- },
"extraVolumeMounts": {
"items": {
"properties": {
@@ -176,21 +173,9 @@
},
"type": "object"
},
- "init": {
+ "initdbScripts": {
"properties": {
- "image": {
- "properties": {
- "name": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "resources": {
- "properties": {},
- "type": "object"
- },
- "resourcesPreset": {
+ "import-realms.sh": {
"type": "string"
}
},
@@ -237,6 +222,26 @@
"resourcesPreset": {
"type": "string"
},
+ "setupJob": {
+ "properties": {
+ "image": {
+ "properties": {
+ "name": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "resources": {
+ "properties": {},
+ "type": "object"
+ },
+ "resourcesPreset": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
"tls": {
"properties": {
"enabled": {
@@ -507,6 +512,14 @@
},
"extraEnvVarsSecret": {
"type": "string"
+ },
+ "updateStrategy": {
+ "properties": {
+ "type": {
+ "type": "string"
+ }
+ },
+ "type": "object"
}
},
"type": "object"
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index 1c1b1cb5ad78b49bb6e47896c61589a2b1273ed6..34db1f569f07dd9198c5247505b3ba45a52a19f8 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -107,6 +107,7 @@ authservice:
id: dbrepo-client
## @param authservice.client.secret The client secret for the microservices.
secret: MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG
+ ## @skip authservice.initdbScripts
initdbScripts:
import-realms.sh: |
#!/bin/bash
@@ -114,11 +115,11 @@ authservice:
kc.sh import --file /opt/keycloak/data/import/dbrepo-realm.json
setupJob:
image:
- ## @skip authservice.init.image.name
+ ## @skip authservice.setupJob.image.name
name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.6.1
- ## @param authservice.init.resourcesPreset The container resource preset
+ ## @param authservice.setupJob.resourcesPreset The container resource preset
resourcesPreset: "nano"
- ## @param authservice.init.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
+ ## @param authservice.setupJob.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
resources: { }
## requests:
## cpu: 250m