Dev

helm/dbrepo/templates/data-db-secret.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: data-db-secret
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 stringData:
   S3_ACCESS_KEY_ID: "{{ .Values.storageservice.s3.auth.adminAccessKeyId }}"
   S3_SECRET_ACCESS_KEY: "{{ .Values.storageservice.s3.auth.adminSecretAccessKey }}"

helm/dbrepo/templates/data-deployment.yaml

@@ -4,7 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: data-service
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     app: data-service
     service: data-service
@@ -45,7 +45,7 @@ spec:
                 - -ec
                 - "curl -sSL localhost:8080/actuator/health/readiness | grep 'UP' || exit 1"
             initialDelaySeconds: 120
-            periodSeconds: 30
+            periodSeconds: 10
           readinessProbe:
             exec:
               command:
@@ -53,7 +53,7 @@ spec:
                 - -ec
                 - "curl -sSL localhost:8080/actuator/health/liveness | grep 'UP' || exit 1"
             initialDelaySeconds: 30
-            periodSeconds: 30
+            periodSeconds: 10
           {{- if .Values.dataservice.resources }}
           resources: {{- toYaml .Values.dataservice.resources | nindent 12 }}
           {{- end }}

helm/dbrepo/templates/data-secret.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: data-service-secret
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 stringData:
   ADMIN_EMAIL: "{{ .Values.metadataservice.admin.email }}"
   AUTH_SERVICE_ADMIN: "{{ .Values.authservice.auth.adminUser }}"

helm/dbrepo/templates/data-service.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: data-service
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     service: data-service
 spec:

helm/dbrepo/templates/ingress.yaml

@@ -4,7 +4,7 @@ kind: Ingress
 metadata:
   name: dbrepo-ingress-basic
   annotations: {{ toYaml .Values.ingress.annotations.basic | nindent 4 }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 spec:
   ingressClassName: {{ .Values.ingress.className }}
   {{- if .Values.ingress.tls.enabled }}
@@ -157,6 +157,13 @@ spec:
                 name: upload-service
                 port:
                   number: 80
+          - path: /dashboard
+            pathType: Prefix
+            backend:
+              service:
+                name: dashboard-service
+                port:
+                  number: 3000
           - path: /
             pathType: Prefix
             backend:
@@ -170,7 +177,7 @@ kind: Ingress
 metadata:
   name: dbrepo-ingress-admin
   annotations: {{ toYaml .Values.ingress.annotations.rewriteApi | nindent 4 }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 spec:
   ingressClassName: {{ .Values.ingress.className }}
   {{- if .Values.ingress.tls.enabled }}
@@ -196,7 +203,7 @@ kind: Ingress
 metadata:
   name: dbrepo-ingress-rewrite-root
   annotations: {{ toYaml .Values.ingress.annotations.rewriteRoot | nindent 4 }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 spec:
   ingressClassName: {{ .Values.ingress.className }}
   {{- if .Values.ingress.tls.enabled }}
@@ -222,7 +229,7 @@ kind: Ingress
 metadata:
   name: dbrepo-ingress-rewrite-root-secure
   annotations: {{ toYaml .Values.ingress.annotations.rewriteRootSecure | nindent 4 }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 spec:
   ingressClassName: {{ .Values.ingress.className }}
   {{- if .Values.ingress.tls.enabled }}
@@ -248,7 +255,7 @@ kind: Ingress
 metadata:
   name: dbrepo-ingress-pid
   annotations: {{ toYaml .Values.ingress.annotations.rewritePid | nindent 4 }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 spec:
   ingressClassName: {{ .Values.ingress.className }}
   {{- if .Values.ingress.tls.enabled }}

helm/dbrepo/templates/metadata-configmap.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: metadata-db-setup
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 data:
   {{- with .Values.metadatadb.extraInitDbScripts }}
   {{ toYaml . | nindent 2 }}
@@ -44,10 +44,12 @@ data:
         dialect       character varying(255) NOT NULL,
         driver_class  character varying(255) NOT NULL,
         jdbc_method   character varying(255) NOT NULL,
+        is_default    BOOLEAN                NOT NULL DEFAULT FALSE,
         created       timestamp              NOT NULL DEFAULT NOW(),
         last_modified timestamp,
         PRIMARY KEY (id),
-        UNIQUE (name, version)
+        UNIQUE (name, version),
+        UNIQUE (is_default)
     ) WITH SYSTEM VERSIONING;
 
     CREATE TABLE IF NOT EXISTS `mdb_images_date`
@@ -81,6 +83,7 @@ data:
         last_modified       timestamp,
         privileged_username character varying(255) NOT NULL,
         privileged_password character varying(255) NOT NULL,
+        quota               integer                NOT NULL DEFAULT 50,
         PRIMARY KEY (id),
         FOREIGN KEY (image_id) REFERENCES mdb_images (id)
     ) WITH SYSTEM VERSIONING;
@@ -266,6 +269,7 @@ data:
         cid  BIGINT NOT NULL,
         rcid BIGINT NOT NULL,
         PRIMARY KEY (id),
+        UNIQUE (fkid, cid, rcid),
         FOREIGN KEY (fkid) REFERENCES mdb_constraints_foreign_key (fkid) ON UPDATE CASCADE,
         FOREIGN KEY (cid) REFERENCES mdb_columns (id),
         FOREIGN KEY (rcid) REFERENCES mdb_columns (id)
@@ -555,7 +559,8 @@ data:
     VALUES (1, '%Y-%c-%d %H:%i:%S.%f', 'yyyy-MM-dd HH:mm:ss.SSSSSS', '2022-01-30 13:44:25.499', true),
            (1, '%Y-%c-%d %H:%i:%S', 'yyyy-MM-dd HH:mm:ss', '2022-01-30 13:44:25', true),
            (1, '%Y-%c-%d', 'yyyy-MM-dd', '2022-01-30', false),
-           (1, '%H:%i:%S', 'HH:mm:ss', '13:44:25', true);
+           (1, '%H:%i:%S', 'HH:mm:ss', '13:44:25', true),
+           (1, '%d.%c.%Y', 'dd.MM.yyyy', '30.01.2022', false);
 
     INSERT INTO `mdb_ontologies` (prefix, uri, uri_pattern, sparql_endpoint, rdf_path)
     VALUES ('om', 'http://www.ontology-of-units-of-measure.org/resource/om-2/',

helm/dbrepo/templates/metadata-deployment.yaml

@@ -4,7 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: metadata-service
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     app: metadata-service
     service: metadata-service
@@ -45,7 +45,7 @@ spec:
                 - -ec
                 - "curl -sSL localhost:8080/actuator/health/readiness | grep 'UP' || exit 1"
             initialDelaySeconds: 120
-            periodSeconds: 30
+            periodSeconds: 10
           readinessProbe:
             exec:
               command:
@@ -53,7 +53,7 @@ spec:
                 - -ec
                 - "curl -sSL localhost:8080/actuator/health/liveness | grep 'UP' || exit 1"
             initialDelaySeconds: 30
-            periodSeconds: 30
+            periodSeconds: 10
           {{- if .Values.metadataservice.resources }}
           resources: {{- toYaml .Values.metadataservice.resources | nindent 12 }}
           {{- end }}

helm/dbrepo/templates/metadata-secret.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: metadata-service-secret
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 stringData:
   ADMIN_EMAIL: "{{ .Values.metadataservice.admin.email }}"
   ANALYSE_SERVICE_ENDPOINT: "{{ .Values.analyseservice.endpoint }}"

helm/dbrepo/templates/metadata-service.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: metadata-service
-  namespace: {{ $.Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     service: metadata-service
 spec:

helm/dbrepo/templates/search-secret.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: search-service-secret
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 stringData:
   ADMIN_USERNAME: "{{ .Values.identityservice.users }}"
   ADMIN_PASSWORD: "{{ .Values.identityservice.userPasswords }}"

helm/dbrepo/templates/search-service.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: search-service
-  namespace: {{ $.Values.namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     service: search-service
 spec: