From 8f0b14b958d84c91589bddbe5130d235e4238963 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Tue, 7 Jan 2025 19:53:11 +0100
Subject: [PATCH] Fixed image versions
---
dbrepo-metadata-db/1_setup-schema.sql | 2 -
.../migration/schema_1.5.0-to-1.6.0.sql | 47 +++++++++++++++++++
helm/dbrepo/values.yaml | 8 ++--
3 files changed, 51 insertions(+), 6 deletions(-)
create mode 100644 dbrepo-metadata-db/migration/schema_1.5.0-to-1.6.0.sql
diff --git a/dbrepo-metadata-db/1_setup-schema.sql b/dbrepo-metadata-db/1_setup-schema.sql
index 0a43ef6044..92f2b1721e 100644
--- a/dbrepo-metadata-db/1_setup-schema.sql
+++ b/dbrepo-metadata-db/1_setup-schema.sql
@@ -95,7 +95,6 @@ CREATE TABLE IF NOT EXISTS `mdb_databases`
PRIMARY KEY (id),
FOREIGN KEY (cid) REFERENCES mdb_containers (id),
FOREIGN KEY (owned_by) REFERENCES mdb_users (id),
- FOREIGN KEY (owned_by) REFERENCES mdb_users (id),
FOREIGN KEY (contact_person) REFERENCES mdb_users (id)
) WITH SYSTEM VERSIONING;
@@ -135,7 +134,6 @@ CREATE TABLE IF NOT EXISTS `mdb_tables`
PRIMARY KEY (ID),
UNIQUE (tDBID, internal_name),
FOREIGN KEY (tDBID) REFERENCES mdb_databases (id),
- FOREIGN KEY (owned_by) REFERENCES mdb_users (id),
FOREIGN KEY (owned_by) REFERENCES mdb_users (id)
) WITH SYSTEM VERSIONING;
diff --git a/dbrepo-metadata-db/migration/schema_1.5.0-to-1.6.0.sql b/dbrepo-metadata-db/migration/schema_1.5.0-to-1.6.0.sql
new file mode 100644
index 0000000000..c04efaa1bb
--- /dev/null
+++ b/dbrepo-metadata-db/migration/schema_1.5.0-to-1.6.0.sql
@@ -0,0 +1,47 @@
+ALTER TABLE `mdb_databases`
+ DROP SYSTEM VERSIONING;
+ALTER TABLE `mdb_databases`
+ ADD COLUMN `is_schema_public` BOOLEAN NOT NULL DEFAULT TRUE;
+ALTER TABLE `mdb_databases`
+ DROP FOREIGN KEY `mdb_databases_ibfk_2`;
+ALTER TABLE `mdb_databases`
+ DROP COLUMN `created_by`;
+UPDATE `mdb_databases`
+SET `is_schema_public` = `is_public`;
+ALTER TABLE `mdb_databases`
+ ADD SYSTEM VERSIONING;
+
+ALTER TABLE `mdb_tables`
+ DROP SYSTEM VERSIONING;
+ALTER TABLE `mdb_tables`
+ ADD COLUMN `is_schema_public` BOOLEAN NOT NULL DEFAULT TRUE;
+ALTER TABLE `mdb_tables`
+ DROP FOREIGN KEY `mdb_tables_ibfk_2`;
+ALTER TABLE `mdb_tables`
+ DROP COLUMN `created_by`;
+UPDATE `mdb_tables`
+SET `is_schema_public` = `is_public`;
+ALTER TABLE `mdb_tables`
+ ADD SYSTEM VERSIONING;
+
+ALTER TABLE `mdb_view`
+ DROP SYSTEM VERSIONING;
+ALTER TABLE `mdb_view`
+ ADD COLUMN `is_schema_public` BOOLEAN NOT NULL DEFAULT TRUE;
+ALTER TABLE `mdb_view`
+ DROP FOREIGN KEY `mdb_view_ibfk_2`;
+ALTER TABLE `mdb_view`
+ RENAME COLUMN `created_by` TO `owned_by`;
+ALTER TABLE `mdb_view`
+ MODIFY `Public` BOOLEAN NOT NULL DEFAULT TRUE;
+UPDATE `mdb_view`
+SET `is_schema_public` = `Public`;
+ALTER TABLE `mdb_view`
+ ADD SYSTEM VERSIONING;
+
+ALTER TABLE `mdb_identifiers`
+ DROP SYSTEM VERSIONING;
+ALTER TABLE `mdb_identifiers`
+ RENAME COLUMN `created_by` TO `owned_by`;
+ALTER TABLE `mdb_identifiers`
+ ADD SYSTEM VERSIONING;
\ No newline at end of file
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index 6955830aaf..e1a6e87cdc 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -112,7 +112,7 @@ authservice:
init:
image:
## @skip authservice.init.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.6.0rc1
+ name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.6.0
## @param authservice.init.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)
@@ -444,7 +444,7 @@ metadataservice:
enabled: true
image:
## @skip metadataservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.0rc6
+ name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.0
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param metadataservice.podSecurityContext.enabled Enable pods' Security Context
@@ -541,7 +541,7 @@ dataservice:
endpoint: http://data-service
image:
## @skip dataservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.0rc3
+ name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.0
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param dataservice.podSecurityContext.enabled Enable pods' Security Context
@@ -735,7 +735,7 @@ storageservice:
init:
image:
## @skip storageservice.init.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.0rc6
+ name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.0
s3:
## @param storageservice.init.s3.endpoint The S3-capable endpoint the microservice connects to.
endpoint: http://storage-service-s3:8333
--
GitLab