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

Using images from pipeline

parent a1e6ef45
No related branches found
No related tags found
6 merge requests!345Updated docs and endpoints:,!341Fixed mapping problem where UK and FK share columns they are inserted,!339Fixed mapping problem where UK and FK share columns they are inserted,!338Fixed mapping problem where UK and FK share columns they are inserted,!334Fixed mapping problem where UK and FK share columns they are inserted,!333Fixed mapping problem where UK and FK share columns they are inserted
Show whitespace changes
Inline Side-by-side
.docs/index.md
+ 2
− 2
View file @ e5c31a93
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
author: Martin Weise author: Martin Weise
--- ---
[![CI/CD Pipeline](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/badges/master/pipeline.svg)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 } [![CI/CD Pipeline](../images/pipeline.svg)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
[![Code Coverage](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/badges/master/coverage.svg)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 } [![Code Coverage](../images/coverage.svg)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
[![GitLab Release](https://img.shields.io/gitlab/v/release/fair-data-austria-db-repository%2Ffda-services?gitlab_url=https%3A%2F%2Fgitlab.phaidra.org&display_name=release&style=flat&cacheSeconds=3600)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 } [![GitLab Release](https://img.shields.io/gitlab/v/release/fair-data-austria-db-repository%2Ffda-services?gitlab_url=https%3A%2F%2Fgitlab.phaidra.org&display_name=release&style=flat&cacheSeconds=3600)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
[![Image Pulls](https://img.shields.io/docker/pulls/dbrepo/data-service?style=flat&cacheSeconds=3600)](https://hub.docker.com/u/dbrepo){ tabindex=-1 } [![Image Pulls](https://img.shields.io/docker/pulls/dbrepo/data-service?style=flat&cacheSeconds=3600)](https://hub.docker.com/u/dbrepo){ tabindex=-1 }
[![GitLab License](https://img.shields.io/gitlab/license/fair-data-austria-db-repository%2Ffda-services?gitlab_url=https%3A%2F%2Fgitlab.phaidra.org%2F&style=flat&cacheSeconds=3600)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 } [![GitLab License](https://img.shields.io/gitlab/license/fair-data-austria-db-repository%2Ffda-services?gitlab_url=https%3A%2F%2Fgitlab.phaidra.org%2F&style=flat&cacheSeconds=3600)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
......
.gitlab-ci.yml
+ 2
− 0
View file @ e5c31a93
...@@ -441,6 +441,8 @@ release-docs: ...@@ -441,6 +441,8 @@ release-docs:
- "cp .docs/.swagger/custom.css ./final/${APP_VERSION}/rest/custom.css" # swagger - "cp .docs/.swagger/custom.css ./final/${APP_VERSION}/rest/custom.css" # swagger
- "cp -r ./site/* ./final/${APP_VERSION}" # mkdocs - "cp -r ./site/* ./final/${APP_VERSION}" # mkdocs
- "cp .docker/dist.tar.gz ./final/${APP_VERSION}/dist.tar.gz" # dist - "cp .docker/dist.tar.gz ./final/${APP_VERSION}/dist.tar.gz" # dist
- "wget -O ./final/${APP_VERSION}/images/pipeline.svg https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/badges/${CI_COMMIT_BRANCH}/pipeline.svg"
- "wget -O ./final/${APP_VERSION}/images/coverage.svg https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/badges/${CI_COMMIT_BRANCH}/coverage.svg"
- eval $(ssh-agent -s) - eval $(ssh-agent -s)
- "mkdir -p /root/.ssh" - "mkdir -p /root/.ssh"
- echo "$CI_KEY_PRIVATE" > /root/.ssh/id_rsa && chmod 0600 /root/.ssh/id_rsa - echo "$CI_KEY_PRIVATE" > /root/.ssh/id_rsa && chmod 0600 /root/.ssh/id_rsa
......
helm/dbrepo/Chart.lock
+ 2
− 2
View file @ e5c31a93
...@@ -29,5 +29,5 @@ dependencies: ...@@ -29,5 +29,5 @@ dependencies:
- name: prometheus - name: prometheus
repository: https://charts.bitnami.com/bitnami repository: https://charts.bitnami.com/bitnami
version: 1.3.22 version: 1.3.22
digest: sha256:8f67589f08da255fba018e5a8eec1c0ae736a5ee775d958eee9b45a5bda57f0a digest: sha256:5d2c18d8f42cdade4d83cc8906d8b3f31104fb7bb46a6b682348fceaa09258b5
generated: "2024-09-27T09:21:08.969905261+02:00" generated: "2024-09-28T10:34:39.251599835+02:00"
helm/dbrepo/README.md
+ 20
− 9
View file @ e5c31a93
...@@ -55,8 +55,7 @@ The command removes all the Kubernetes components associated with the chart and ...@@ -55,8 +55,7 @@ The command removes all the Kubernetes components associated with the chart and
### Common parameters ### Common parameters
| Name | Description | Value | | Name | Description | Value |
| --------------- | ---------------------------------- | --------------------- | | --------------- | --------------------- | --------------------- |
| `namespace` | The namespace to install the chart | `dbrepo` |
| `hostname` | The hostname. | `example.com` | | `hostname` | The hostname. | `example.com` |
| `gateway` | The gateway endpoint. | `https://example.com` | | `gateway` | The gateway endpoint. | `https://example.com` |
| `strategyType` | The image pull | `RollingUpdate` | | `strategyType` | The image pull | `RollingUpdate` |
...@@ -88,7 +87,6 @@ The command removes all the Kubernetes components associated with the chart and ...@@ -88,7 +87,6 @@ The command removes all the Kubernetes components associated with the chart and
| `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.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.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.tls.existingSecret` | The secret containing the `tls.crt`, `tls.key` and `ca.crt`. | `ingress-cert` |
| `authservice.metrics.enabled` | Enable the Prometheus metrics export sidecar container. | `false` |
| `authservice.client.id` | The client id for the microservices. | `dbrepo-client` | | `authservice.client.id` | The client id for the microservices. | `dbrepo-client` |
| `authservice.client.secret` | The client secret for the microservices. | `MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG` | | `authservice.client.secret` | The client secret for the microservices. | `MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG` |
...@@ -97,7 +95,7 @@ The command removes all the Kubernetes components associated with the chart and ...@@ -97,7 +95,7 @@ The command removes all the Kubernetes components associated with the chart and
| Name | Description | Value | | Name | Description | Value |
| --------------------------------- | ----------------------------------------------------------- | ------------- | | --------------------------------- | ----------------------------------------------------------- | ------------- |
| `datadb.enabled` | Enable the Data Database. | `true` | | `datadb.enabled` | Enable the Data Database. | `true` |
| `datadb.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` | | `datadb.database.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
| `datadb.auth.rootPassword` | The root user password. | `dbrepo` | | `datadb.auth.rootPassword` | The root user password. | `dbrepo` |
| `datadb.auth.replicationUser` | The database replication user password | `replication` | | `datadb.auth.replicationUser` | The database replication user password | `replication` |
| `datadb.auth.replicationPassword` | The database replication user password | `replication` | | `datadb.auth.replicationPassword` | The database replication user password | `replication` |
...@@ -329,6 +327,19 @@ The command removes all the Kubernetes components associated with the chart and ...@@ -329,6 +327,19 @@ The command removes all the Kubernetes components associated with the chart and
| `ui.public.doi.endpoint` | The DOI proxy. | `https://doi.org` | | `ui.public.doi.endpoint` | The DOI proxy. | `https://doi.org` |
| `ui.replicaCount` | The number of replicas. | `2` | | `ui.replicaCount` | The number of replicas. | `2` |
### Dashboard Service
| Name | Description | Value |
| --------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ------ |
| `dashboardservice.enabled` | Enable the Dashboard Service. | `true` |
| `dashboardservice.dashboardsProvider.enabled` | Enable the default dashboard provisioning provider to routinely import dashboards from /opt/bitnami/grafana/dashboards | `true` |
### Metric Service
| Name | Description | Value |
| ------------------ | -------------------------- | ------ |
| `metricdb.enabled` | Enable the Metric Service. | `true` |
### Ingress ### Ingress
| Name | Description | Value | | Name | Description | Value |
......
helm/dbrepo/charts/dbrepo-mariadb-galera-1.4.6.tgz
+ 0
− 0
View file @ e5c31a93
No preview for this file type
helm/dbrepo/values.schema.json
+ 187
− 27
View file @ e5c31a93
...@@ -356,6 +356,14 @@ ...@@ -356,6 +356,14 @@
}, },
"type": "object" "type": "object"
}, },
"metrics": {
"properties": {
"enabled": {
"type": "boolean"
}
},
"type": "object"
},
"persistence": { "persistence": {
"properties": { "properties": {
"enabled": { "enabled": {
...@@ -397,22 +405,88 @@ ...@@ -397,22 +405,88 @@
"type": "string" "type": "string"
}, },
"dashboardservice": { "dashboardservice": {
"properties": {
"dashboardsProvider": {
"properties": { "properties": {
"enabled": { "enabled": {
"type": "boolean" "type": "boolean"
}
},
"type": "object"
},
"datasources": {
"properties": {
"secretDefinition": {
"properties": {
"apiVersion": {
"type": "integer"
},
"datasources": {
"items": {
"properties": {
"name": {
"type": "string"
},
"type": {
"type": "string"
},
"uid": {
"type": "string"
}, },
"envFromSecret": { "url": {
"type": "string" "type": "string"
}
},
"type": "object"
},
"type": "array"
}
},
"type": "object"
}
},
"type": "object"
},
"enabled": {
"type": "boolean"
}, },
"fullnameOverride": { "fullnameOverride": {
"type": "string" "type": "string"
}, },
"grafana": {
"properties": {
"extraConfigmaps": {
"items": {
"properties": {
"mountPath": {
"type": "string"
},
"name": {
"type": "string"
},
"readOnly": {
"type": "boolean"
}
},
"type": "object"
},
"type": "array"
},
"extraEnvVarsSecret": {
"type": "string"
}
},
"type": "object"
},
"ldap": { "ldap": {
"properties": { "properties": {
"allowSignUp": {
"type": "boolean"
},
"enabled": { "enabled": {
"type": "boolean" "type": "boolean"
}, },
"existingSecret": { "secretName": {
"type": "string" "type": "string"
} }
}, },
...@@ -437,12 +511,8 @@ ...@@ -437,12 +511,8 @@
}, },
"type": "object" "type": "object"
}, },
"enabled": { "database": {
"type": "boolean" "properties": {
},
"fullnameOverride": {
"type": "string"
},
"image": { "image": {
"properties": { "properties": {
"debug": { "debug": {
...@@ -470,6 +540,15 @@ ...@@ -470,6 +540,15 @@
}, },
"type": "object" "type": "object"
}, },
"enabled": {
"type": "boolean"
},
"fullnameOverride": {
"type": "string"
}
},
"type": "object"
},
"dataservice": { "dataservice": {
"properties": { "properties": {
"containerSecurityContext": { "containerSecurityContext": {
...@@ -1114,6 +1193,79 @@ ...@@ -1114,6 +1193,79 @@
}, },
"type": "object" "type": "object"
}, },
"metricdb": {
"properties": {
"alertmanager": {
"properties": {
"service": {
"properties": {
"type": {
"type": "string"
}
},
"type": "object"
}
},
"type": "object"
},
"enabled": {
"type": "boolean"
},
"fullnameOverride": {
"type": "string"
},
"server": {
"properties": {
"extraScrapeConfigs": {
"items": {
"properties": {
"job_name": {
"type": "string"
},
"metrics_path": {
"type": "string"
},
"static_configs": {
"items": {
"properties": {
"targets": {
"items": {
"type": "string"
},
"type": "array"
}
},
"type": "object"
},
"type": "array"
}
},
"type": "object"
},
"type": "array"
},
"persistence": {
"properties": {
"enabled": {
"type": "boolean"
}
},
"type": "object"
},
"service": {
"properties": {
"type": {
"type": "string"
}
},
"type": "object"
}
},
"type": "object"
}
},
"type": "object"
},
"searchdb": { "searchdb": {
"properties": { "properties": {
"clusterName": { "clusterName": {
...@@ -1332,6 +1484,14 @@ ...@@ -1332,6 +1484,14 @@
"properties": { "properties": {
"enabled": { "enabled": {
"type": "boolean" "type": "boolean"
},
"metrics": {
"properties": {
"enabled": {
"type": "boolean"
}
},
"type": "object"
} }
}, },
"type": "object" "type": "object"
......
helm/dbrepo/values.yaml
+ 3
− 0
View file @ e5c31a93
...@@ -812,11 +812,13 @@ dashboardservice: ...@@ -812,11 +812,13 @@ dashboardservice:
grafana: grafana:
## @skip dashboardservice.grafana.extraEnvVarsSecret ## @skip dashboardservice.grafana.extraEnvVarsSecret
extraEnvVarsSecret: dashboard-service-secret extraEnvVarsSecret: dashboard-service-secret
## @skip dashboardservice.grafana.extraConfigmaps
extraConfigmaps: extraConfigmaps:
- name: dashboard-service-config - name: dashboard-service-config
mountPath: /opt/bitnami/grafana/dashboards mountPath: /opt/bitnami/grafana/dashboards
readOnly: true readOnly: true
datasources: datasources:
## @skip dashboardservice.datasources.secretDefinition
secretDefinition: secretDefinition:
apiVersion: 1 apiVersion: 1
datasources: datasources:
...@@ -825,6 +827,7 @@ dashboardservice: ...@@ -825,6 +827,7 @@ dashboardservice:
type: "prometheus" type: "prometheus"
url: "http://metric-db-server" url: "http://metric-db-server"
dashboardsProvider: dashboardsProvider:
## @param dashboardservice.dashboardsProvider.enabled Enable the default dashboard provisioning provider to routinely import dashboards from /opt/bitnami/grafana/dashboards
enabled: true enabled: true
## @section Metric Service ## @section Metric Service
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment