[Backport release-1.31] Microcluster Migration History Restoration (#700

) * Correct microcluster schema migration order (#676) * Restoring the Microcluster Schema Migration History (#689)
canonical · Sep 26, 2024 · 36501b3 · 36501b3
1 parent 1c7813e
commit 36501b3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/k8s/pkg/k8sd/database/schema.go b/src/k8s/pkg/k8sd/database/schema.go
@@ -18,11 +18,11 @@ var (
 	SchemaExtensions = []schema.Update{
 		schemaApplyMigration("kubernetes-auth-tokens", "000-create.sql"),
 		schemaApplyMigration("cluster-configs", "000-create.sql"),
-
+		schemaApplyMigration("worker-nodes", "000-create.sql"),
 		schemaApplyMigration("worker-tokens", "000-create.sql"),
-		schemaApplyMigration("worker-tokens", "001-add-expiry.sql"),
-
 		schemaApplyMigration("feature-status", "000-feature-status.sql"),
+		schemaApplyMigration("worker-tokens", "001-add-expiry.sql"),
+		schemaApplyMigration("worker-nodes", "001-delete.sql"),
 	}
 
 	//go:embed sql/migrations

diff --git a/src/k8s/pkg/k8sd/database/sql/migrations/worker-nodes/000-create.sql b/src/k8s/pkg/k8sd/database/sql/migrations/worker-nodes/000-create.sql
@@ -2,4 +2,4 @@ CREATE TABLE worker_nodes (
   id                   INTEGER   PRIMARY  KEY    AUTOINCREMENT  NOT  NULL,
   name                 TEXT      NOT      NULL,
   UNIQUE(name)
-);
+)
diff --git a/src/k8s/pkg/k8sd/database/sql/migrations/worker-nodes/001-delete.sql b/src/k8s/pkg/k8sd/database/sql/migrations/worker-nodes/001-delete.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS worker_nodes