Updated the pipeline placeholders and release the chart

1055f9fb · Martin Weise · 8cabffd3 · 1055f9fb · 1055f9fb · 1055f9fb
Verified Commit 1055f9fb authored Jan 25, 2024 by Martin Weise
--- a/.docs/.swagger/api-analyse.yaml
+++ b/.docs/.swagger/api-analyse.yaml
@@ -12,7 +12,7 @@ info:
    name: Apache 2.0
    url: https://www.apache.org/licenses/LICENSE-2.0
  title: Database Repository Analyse Service API
-  version: $TAG
+  version: __TAG__
 openapi: 3.0.0
 paths:
  /api/analyse/determinedt:

--- a/.docs/.swagger/api-data.yaml
+++ b/.docs/.swagger/api-data.yaml
@@ -8,7 +8,7 @@ info:
  license:
    name: Apache 2.0
    url: https://www.apache.org/licenses/LICENSE-2.0
-  version: $TAG
+  version: __TAG__
 externalDocs:
  description: Sourcecode Documentation
  url: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services

--- a/.docs/.swagger/api-metadata.yaml
+++ b/.docs/.swagger/api-metadata.yaml
@@ -8,7 +8,7 @@ info:
  license:
    name: Apache 2.0
    url: https://www.apache.org/licenses/LICENSE-2.0
-  version: $TAG
+  version: __TAG__
 externalDocs:
  description: Sourcecode Documentation
  url: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services

--- a/.docs/.swagger/api-search.yaml
+++ b/.docs/.swagger/api-search.yaml
@@ -12,7 +12,7 @@ info:
    name: Apache 2.0
    url: https://www.apache.org/licenses/LICENSE-2.0
  title: Database Repository Search Service API
-  version: $TAG
+  version: __TAG__
 openapi: 3.0.0
 paths:
  /api/search:

--- a/.docs/.swagger/api-sidecar.yaml
+++ b/.docs/.swagger/api-sidecar.yaml
@@ -21,7 +21,7 @@ info:
    name: Apache 2.0
    url: https://www.apache.org/licenses/LICENSE-2.0
  title: Database Repository Data Database sidecar API
-  version: $TAG
+  version: __TAG__
 openapi: 3.0.0
 paths:
  /health:

--- a/.docs/.swagger/api-upload.yaml
+++ b/.docs/.swagger/api-upload.yaml
@@ -8,7 +8,7 @@ info:
  license:
    name: Apache 2.0
    url: https://www.apache.org/licenses/LICENSE-2.0
-  version: $TAG
+  version: __TAG__
 externalDocs:
  description: Sourcecode Documentation
  url: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services

--- a/.docs/deployment-helm.md
+++ b/.docs/deployment-helm.md
@@ -10,27 +10,21 @@ for your deployment and update the variables, especially `hostname`.
 ```shell
 helm upgrade --install dbrepo \
  -n dbrepo \
-  "oci://s210.dl.hpc.tuwien.ac.at/dbrepo/helm/dbrepo-core" \
+  "oci://s210.dl.hpc.tuwien.ac.at/dbrepo/helm/dbrepo" \
  --values ./values.yaml \
-  --version "1.4.0" \
+  --version "__CHARTVERSION__" \
  --create-namespace \
  --cleanup-on-fail
 ```

-This chart is also on [Artifact Hub](https://artifacthub.io/packages/helm/dbrepo/dbrepo-core).
+This chart is also on [Artifact Hub](https://artifacthub.io/packages/helm/dbrepo/dbrepo) with a full documentation
+about values, etc.

-## Dependencies
+## Prerequisites

-Our chart depends on seven other charts which will be automatically resolved when installing our `dbrepo-core` chart:
-
-* Keycloak (Bitnami, v17.3.3) for [Authentication Service](../system-services-authentication)
-* MariaDB Galera (Bitnami, v11.0.1) for [Data Database](../system-databases-data) &amp; [Metadata Database](../system-databases-metadata)
-* SeaweedFS (SeaweedFS, v3.59.4) for [Storage Service](../system-services-storage)
-* OpenSearch (OpenSearch Project, v2.16.0) for [Search Database](../system-databases-search)
-* OpenSearch Dashboards (OpenSearch Project, v2.14.0) for [Search Dashboard](../system-other-search-dashboard)
-* PostgreSQL HA (Bitnami, v12.1.7) for [Auth Database](../system-databases-auth)
-* RabbitMQ (Bitnami, v12.5.1) for [Broker Service](../system-services-broker)
-* FluentBit (FluentBit, v0.40.0) for logging in the cluster.
+* Kubernetes 1.24+
+* Kubernetes 3.8.0+
+* PV provisioner support in the underlying infrastructure

 ## Limitations


--- a/.docs/overrides/main.html
+++ b/.docs/overrides/main.html
@@ -14,7 +14,7 @@
        if (segments.length >= 4) {
            return segments[3]
        } else {
-            return '$VERSION'
+            return '__APPVERSION__'
        }
    }
    function switchVersion(value) {

--- a/.docs/redirect.html
+++ b/.docs/redirect.html
@@ -5,16 +5,16 @@
 <head>
    <meta charset="UTF-8">
    <title>Redirect Notice</title>
-    <meta http-equiv="Refresh" content="0; url='https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/$VERSION/'" />
+    <meta http-equiv="Refresh" content="0; url='https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/__APPVERSION__/'" />
 </head>
 <body>
 <h1>Redirect Notice</h1>
 <p>
-    This page should automatically open the documentation for version <code>$VERSION</code>. In case this page does not load the site is
+    This page should automatically open the documentation for version <code>__APPVERSION__</code>. In case this page does not load the site is
    available at:
 </p>
 <p>
-    <a href="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/$VERSION/">https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/$VERSION/</a>
+    <a href="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/__APPVERSION__/">https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/__APPVERSION__/</a>
 </p>
 </body>
 </html>
\ No newline at end of file
--- a/.docs/system-databases-data.md
+++ b/.docs/system-databases-data.md
@@ -15,7 +15,7 @@ author: Martin Weise

 !!! debug "Debug Information"

-    Image: [`dbrepo/data-db-sidecar:$TAG`](https://hub.docker.com/r/dbrepo/data-db-sidecar)
+    Image: [`dbrepo/data-db-sidecar:__TAG__`](https://hub.docker.com/r/dbrepo/data-db-sidecar)

    * Ports: 3305/tcp
    * Swagger UI: `http://<hostname>:1080/swagger-ui/` <a href="../swagger/sidecar" target="_blank">:fontawesome-solid-square-up-right: view online</a>

--- a/.docs/system-databases-metadata.md
+++ b/.docs/system-databases-metadata.md
@@ -8,7 +8,7 @@ author: Martin Weise

 !!! debug "Debug Information"

-    Image: [`dbrepo/metadata-db:$TAG`](https://hub.docker.com/r/dbrepo/metadata-db)
+    Image: [`dbrepo/metadata-db:__TAG__`](https://hub.docker.com/r/dbrepo/metadata-db)

    * Ports: 3306/tcp
    * JDBC: `jdbc://mariadb:<hostname>:3306`

--- a/.docs/system-databases-search.md
+++ b/.docs/system-databases-search.md
@@ -8,7 +8,7 @@ author: Martin Weise

 !!! debug "Debug Information"

-    Image: [`dbrepo/search-db:$TAG`](https://hub.docker.com/r/dbrepo/search-db)
+    Image: [`dbrepo/search-db:__TAG__`](https://hub.docker.com/r/dbrepo/search-db)

    * Ports: 9200/tcp


--- a/.docs/system-other-ui.md
+++ b/.docs/system-other-ui.md
@@ -8,7 +8,7 @@ author: Martin Weise

 !!! debug "Debug Information"

-    Image: [`dbrepo/ui:$TAG`](https://hub.docker.com/r/dbrepo/ui)
+    Image: [`dbrepo/ui:__TAG__`](https://hub.docker.com/r/dbrepo/ui)

    * Ports: 3000/tcp, 9100/tcp
    * Prometheus: `http://<hostname>:9100/metrics`
@@ -46,7 +46,7 @@ configured as well via the `dbrepo.config.json` values file. The important links
 ```json title="dbrepo.config.json"
 {
  "title": "Database Repository",
-  "version": "$TAG_DOCKER-COMPOSE",
+  "version": "__TAG___DOCKER-COMPOSE",
  "logo": {
    "path": "/my_logo.png"
  },
@@ -65,7 +65,7 @@ if you use a Kubernetes deployment via ConfigMap and Volumes).
 ```yaml title="docker-compose.yml"
 services:
  dbrepo-ui:
-    image: docker.io/dbrepo/ui:$TAG
+    image: docker.io/dbrepo/ui:__TAG__
    volumes:
      - ./my_logo.png:/app/static/my_logo.png
      - ./dbrepo.conf.json:/app/dbrepo.conf.json

--- a/.docs/system-services-analyse.md
+++ b/.docs/system-services-analyse.md
@@ -8,7 +8,7 @@ author: Martin Weise

 !!! debug "Debug Information"

-    Image: [`dbrepo/analyse-service:$TAG`](https://hub.docker.com/r/dbrepo/analyse-service)
+    Image: [`dbrepo/analyse-service:__TAG__`](https://hub.docker.com/r/dbrepo/analyse-service)

    * Ports: 5000/tcp
    * Prometheus: `http://<hostname>:5000/metrics`

--- a/.docs/system-services-authentication.md
+++ b/.docs/system-services-authentication.md
@@ -8,7 +8,7 @@ author: Martin Weise

 !!! debug "Debug Information"

-    Image: [`dbrepo/authentication-service:$TAG`](https://hub.docker.com/r/dbrepo/authentication-service)
+    Image: [`dbrepo/authentication-service:__TAG__`](https://hub.docker.com/r/dbrepo/authentication-service)

    * Ports: 8080/tcp
    * Health: `http://<hostname>:8080/api/auth/health`

--- a/.docs/system-services-data.md
+++ b/.docs/system-services-data.md
@@ -8,7 +8,7 @@ author: Martin Weise

 !!! debug "Debug Information"

-    Image: [`dbrepo/data-service:$TAG`](https://hub.docker.com/r/dbrepo/data-service)
+    Image: [`dbrepo/data-service:__TAG__`](https://hub.docker.com/r/dbrepo/data-service)

    * Ports: 9093/tcp
    * Info: `http://<hostname>:9093/actuator/info`

--- a/.docs/system-services-metadata.md
+++ b/.docs/system-services-metadata.md
@@ -8,7 +8,7 @@ author: Martin Weise

 !!! debug "Debug Information"

-    Image: [`dbrepo/metadata-service:$TAG`](https://hub.docker.com/r/dbrepo/metadata-service)
+    Image: [`dbrepo/metadata-service:__TAG__`](https://hub.docker.com/r/dbrepo/metadata-service)

    * Ports: 9099/tcp
    * Info: `http://<hostname>:9099/actuator/info`

--- a/.docs/system-services-search.md
+++ b/.docs/system-services-search.md
@@ -8,7 +8,7 @@ author: Martin Weise

 !!! debug "Debug Information"

-    Image: [`dbrepo/search-service:$TAG`](https://hub.docker.com/r/dbrepo/search-service)
+    Image: [`dbrepo/search-service:__TAG__`](https://hub.docker.com/r/dbrepo/search-service)

    * Ports: 4000/tcp
    * Health: `http://<hostname>:4000/api/search/health`

--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -516,6 +516,7 @@ release-helm-latest:
    - apk add sed helm
    - 'sed -i -e "s/^version:.*/version: \"${CHART_VERSION}-0.git.${CI_PIPELINE_ID}.${CI_COMMIT_SHORT_SHA}\"/g" ./helm-charts/dbrepo/Chart.yaml'
    - 'sed -i -e "s/^appVersion:.*/appVersion: \"${CHART_VERSION}-0.git.${CI_PIPELINE_ID}.${CI_COMMIT_SHORT_SHA}\"/g" ./helm-charts/dbrepo/Chart.yaml'
+    - find ./site -type f -exec sed -i -e "s/__CHARTVERSION__/${CHART_VERSION}/g" {} \;
    - helm package ./helm-charts/dbrepo --destination ./build
    - helm push "./build/dbrepo-${CHART_VERSION}-0.git.${CI_PIPELINE_ID}.${CI_COMMIT_SHORT_SHA}.tgz" "oci://${CI_REGISTRY2_URL}/helm"

@@ -531,9 +532,10 @@ release-helm-1.4:
    - apk add sed helm curl
    - 'sed -i -e "s/^version:.*/version: \"${CHART_VERSION}\"/g" ./helm-charts/dbrepo/Chart.yaml'
    - 'sed -i -e "s/^appVersion:.*/appVersion: \"${APP_VERSION}\"/g" ./helm-charts/dbrepo/Chart.yaml'
+    - find ./site -type f -exec sed -i -e "s/__CHARTVERSION__/${CHART_VERSION}/g" {} \;
    - helm package ./helm-charts/dbrepo --destination ./build
    - helm push "./build/dbrepo-${CHART_VERSION}.tgz" "oci://${CI_REGISTRY2_URL}/helm"
-    - curl -sSL -X POST --form 'chart=@dbrepo-${CHART_VERSION}.tgz' --user mweise:${GITLAB_ACCESS_TOKEN} https://gitlab.example.com/api/v4/projects/450/packages/helm/api/stable/charts
+    - curl -sSL -X POST --form 'chart=@build/dbrepo-${CHART_VERSION}.tgz' --user mweise:${GITLAB_ACCESS_TOKEN} https://gitlab.example.com/api/v4/projects/450/packages/helm/api/stable/charts

 build-api-latest:
  stage: build
@@ -547,7 +549,7 @@ build-api-latest:
    - apk add bash git
    - git fetch && git checkout master
    - bash .docs/.swagger/swagger-site.sh
-    - find ./site -type f -exec sed -i -e "s/\$TAG/latest/g" {} \;
+    - find ./site -type f -exec sed -i -e "s/__TAG__/latest/g" {} \;
    - mkdir -p ./swagger/latest
    - cp -r ./site/* ./swagger/latest/
  cache:
@@ -594,7 +596,7 @@ build-api-1.4:
    - apk add bash git maven
    - git fetch && git checkout release-v1.4
    - bash .docs/.swagger/swagger-site.sh
-    - find ./site -type f -exec sed -i -e "s/\$TAG/${APP_VERSION}/g" {} \;
+    - find ./site -type f -exec sed -i -e "s/__TAG__/${APP_VERSION}/g" {} \;
    - mkdir -p ./swagger/${APP_VERSION}
    - cp -r ./site/* ./swagger/${APP_VERSION}/
  cache:
@@ -643,8 +645,8 @@ docs-latest:
    - git fetch && git checkout master
    - pip install -r ./requirements.txt
    - mkdir -p ./final/{latest,1.3}
-    - find ./.docs -type f -exec sed -i -e "s/\$TAG/latest/g" {} \;
-    - find ./.docs -type f -exec sed -i -e "s/\$VERSION/${APP_VERSION}/g" {} \;
+    - find ./.docs -type f -exec sed -i -e "s/__TAG__/latest/g" {} \;
+    - find ./.docs -type f -exec sed -i -e "s/__APPVERSION__/${APP_VERSION}/g" {} \;
    - mkdocs build && cp -r ./site ./final/latest
    - cp ./.docs/redirect.html ./final/index.html
    - cp ./.docs/redirect.html ./final/1.3/index.html
@@ -704,8 +706,8 @@ docs-1.4:
    - pip install -r ./.docs/requirements.txt
    - wget https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/.docs/overrides/main.html -O .docs/overrides/main.html -q
    - mkdir -p ./final
-    - find .docs -type f -exec sed -i -e "s/\$TAG/${APP_VERSION}/g" {} \;
-    - find .docs -type f -exec sed -i -e "s/\$VERSION/${APP_VERSION}/g" {} \;
+    - find .docs -type f -exec sed -i -e "s/__TAG__/${APP_VERSION}/g" {} \;
+    - find .docs -type f -exec sed -i -e "s/__APPVERSION__/${APP_VERSION}/g" {} \;
    - mkdocs build && cp -r ./site ./final/${APP_VERSION}
    - cp -r ./swagger/${APP_VERSION} ./final/${APP_VERSION}/swagger
  cache:

--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,9 @@ build-frontend:
 build-swagger:
 	bash ./.docs/generate.sh

+build-helm:
+	helm package ./helm-charts/dbrepo --destination ./build
+
 tag: tag-analyse-service tag-authentication-service tag-metadata-db tag-ui tag-metadata-service tag-data-service tag-search-db tag-search-db-init tag-search-service tag-data-db-sidecar

 tag-analyse-service: