diff --git a/api/datastore/migrator/migrator.go b/api/datastore/migrator/migrator.go index df27cc0cd..fd1f42f43 100644 --- a/api/datastore/migrator/migrator.go +++ b/api/datastore/migrator/migrator.go @@ -256,7 +256,10 @@ func (m *Migrator) initMigrations() { m.addMigrations("2.32.0", m.addEndpointRelationForEdgeAgents_2_32_0) - m.addMigrations("2.33.0", m.migrateEdgeGroupEndpointsToRoars_2_33_0) + m.addMigrations("2.33.0-rc1", m.migrateEdgeGroupEndpointsToRoars_2_33_0) + + //m.addMigrations("2.33.0", m.migrateEdgeGroupEndpointsToRoars_2_33_0) + // when we release 2.33.0 it will also run the rc-1 migration function // Add new migrations above... // One function per migration, each versions migration funcs in the same file. diff --git a/api/datastore/test_data/output_24_to_latest.json b/api/datastore/test_data/output_24_to_latest.json index 5e8b0eefa..2b4e002a4 100644 --- a/api/datastore/test_data/output_24_to_latest.json +++ b/api/datastore/test_data/output_24_to_latest.json @@ -615,7 +615,7 @@ "RequiredPasswordLength": 12 }, "KubeconfigExpiry": "0", - "KubectlShellImage": "portainer/kubectl-shell:2.32.0", + "KubectlShellImage": "portainer/kubectl-shell:2.33.0-rc1", "LDAPSettings": { "AnonymousMode": true, "AutoCreateUsers": true, @@ -944,7 +944,7 @@ } ], "version": { - "VERSION": "{\"SchemaVersion\":\"2.32.0\",\"MigratorCount\":1,\"Edition\":1,\"InstanceID\":\"463d5c47-0ea5-4aca-85b1-405ceefee254\"}" + "VERSION": "{\"SchemaVersion\":\"2.33.0-rc1\",\"MigratorCount\":1,\"Edition\":1,\"InstanceID\":\"463d5c47-0ea5-4aca-85b1-405ceefee254\"}" }, "webhooks": null } \ No newline at end of file diff --git a/api/http/handler/handler.go b/api/http/handler/handler.go index 1704eb316..e46d2b10f 100644 --- a/api/http/handler/handler.go +++ b/api/http/handler/handler.go @@ -81,7 +81,7 @@ type Handler struct { } // @title PortainerCE API -// @version 2.32.0 +// @version 2.33.0-rc1 // @description.markdown api-description.md // @termsOfService diff --git a/api/portainer.go b/api/portainer.go index 3d9b6be4b..3e4bca962 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -1783,9 +1783,9 @@ type ( const ( // APIVersion is the version number of the Portainer API - APIVersion = "2.32.0" + APIVersion = "2.33.0-rc1" // Support annotation for the API version ("STS" for Short-Term Support or "LTS" for Long-Term Support) - APIVersionSupport = "STS" + APIVersionSupport = "LTS" // Edition is what this edition of Portainer is called Edition = PortainerCE // ComposeSyntaxMaxVersion is a maximum supported version of the docker compose syntax diff --git a/package.json b/package.json index 8cab91593..dbd162bb6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Portainer.io", "name": "portainer", "homepage": "http://portainer.io", - "version": "2.32.0", + "version": "2.33.0-rc1", "repository": { "type": "git", "url": "git@github.com:portainer/portainer.git"