Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 15:59:41 +02:00
Code Issues Releases Activity

feat(kubeshell) allow overriding default kubeshell image EE-1756 (#5755)

Browse source 
* feat(kubeshell) allow overriding default kubeshell

* Add missing error check and struct tag

* Add migrator for kube shell image and add it as a default in the db

* Fix file name to match migrator pattern

* remove default as it's now coming from the db

* remove blank line

* - conflict resolution code update
- logging migration error on migration failures

* - migrateDBVersionTo34 -> migrateDBVersionToDB34 (naming consistency)

Co-authored-by: zees-dev <dev.786zshan@gmail.com>
This commit is contained in:
Matt Hook 2021-09-29 11:39:45 +13:00 • committed by GitHub
parent 7611cc415a
commit 7b72130433
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 53 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
api/bolt/migrator/migrate_ce.go
View file

@ -301,9 +301,18 @@ func (m *Migrator) Migrate() error {
}
}
// Portainer 2.9.1
if m.currentDBVersion < 33 {
if err := m.migrateDBVersionTo33(); err != nil {
return migrationError(err, "migrateDBVersionTo33")
err := m.migrateDBVersionToDB33()
if err != nil {
return migrationError(err, "migrateDBVersionToDB33")
}
}
// Portainer 2.10
if m.currentDBVersion < 34 {
if err := m.migrateDBVersionToDB34(); err != nil {
return migrationError(err, "migrateDBVersionToDB34")
}
}