mirror of
https://github.com/portainer/portainer.git
synced 2025-07-23 15:29:42 +02:00
* feat(app): rework private registries and support private registries in kubernetes [EE-30] feat(api): backport private registries backend changes (#5072) * feat(api/bolt): backport bolt changes * feat(api/exec): backport exec changes * feat(api/http): backport http/handler/dockerhub changes * feat(api/http): backport http/handler/endpoints changes * feat(api/http): backport http/handler/registries changes * feat(api/http): backport http/handler/stacks changes * feat(api/http): backport http/handler changes * feat(api/http): backport http/proxy/factory/azure changes * feat(api/http): backport http/proxy/factory/docker changes * feat(api/http): backport http/proxy/factory/utils changes * feat(api/http): backport http/proxy/factory/kubernetes changes * feat(api/http): backport http/proxy/factory changes * feat(api/http): backport http/security changes * feat(api/http): backport http changes * feat(api/internal): backport internal changes * feat(api): backport api changes * feat(api/kubernetes): backport kubernetes changes * fix(api/http): changes on backend following backport feat(app): backport private registries frontend changes (#5056) * feat(app/docker): backport docker/components changes * feat(app/docker): backport docker/helpers changes * feat(app/docker): backport docker/views/container changes * feat(app/docker): backport docker/views/images changes * feat(app/docker): backport docker/views/registries changes * feat(app/docker): backport docker/views/services changes * feat(app/docker): backport docker changes * feat(app/kubernetes): backport kubernetes/components changes * feat(app/kubernetes): backport kubernetes/converters changes * feat(app/kubernetes): backport kubernetes/models changes * feat(app/kubernetes): backport kubernetes/registries changes * feat(app/kubernetes): backport kubernetes/services changes * feat(app/kubernetes): backport kubernetes/views/applications changes * feat(app/kubernetes): backport kubernetes/views/configurations changes * feat(app/kubernetes): backport kubernetes/views/configure changes * feat(app/kubernetes): backport kubernetes/views/resource-pools changes * feat(app/kubernetes): backport kubernetes/views changes * feat(app/portainer): backport portainer/components/accessManagement changes * feat(app/portainer): backport portainer/components/datatables changes * feat(app/portainer): backport portainer/components/forms changes * feat(app/portainer): backport portainer/components/registry-details changes * feat(app/portainer): backport portainer/models changes * feat(app/portainer): backport portainer/rest changes * feat(app/portainer): backport portainer/services changes * feat(app/portainer): backport portainer/views changes * feat(app/portainer): backport portainer changes * feat(app): backport app changes * config(project): gitignore + jsconfig changes gitignore all files under api/cmd/portainer but main.go and enable Code Editor autocomplete on import ... from '@/...' fix(app): fix pull rate limit checker fix(app/registries): sidebar menus and registry accesses users filtering fix(api): add missing kube client factory fix(kube): fetch dockerhub pull limits (#5133) fix(app): pre review fixes (#5142) * fix(app/registries): remove checkbox for endpointRegistries view * fix(endpoints): allow access to default namespace * fix(docker): fetch pull limits * fix(kube/ns): show selected registries for non admin Co-authored-by: Chaim Lev-Ari <chiptus@gmail.com> chore(webpack): ignore missing sourcemaps fix(registries): fetch registry config from url feat(kube/registries): ignore not found when deleting secret feat(db): move migration to db 31 fix(registries): fix bugs in PR EE-869 (#5169) * fix(registries): hide role * fix(endpoints): set empty access policy to edge endpoint * fix(registry): remove double arguments * fix(admin): ignore warning * feat(kube/configurations): tag registry secrets (#5157) * feat(kube/configurations): tag registry secrets * feat(kube/secrets): show registry secrets for admins * fix(registries): move dockerhub to beginning * refactor(registries): use endpoint scoped registries feat(registries): filter by namespace if supplied feat(access-managment): filter users for registry (#5191) * refactor(access-manage): move users selector to component * feat(access-managment): filter users for registry refactor(registries): sync code with CE (#5200) * refactor(registry): add inspect handler under endpoints * refactor(endpoint): sync endpoint_registries_list * refactor(endpoints): sync registry_access * fix(db): rename migration functions * fix(registries): show accesses for admin * fix(kube): set token on transport * refactor(kube): move secret help to bottom * fix(kuberentes): remove shouldLog parameter * style(auth): add description of security.IsAdmin * feat(security): allow admin access to registry * feat(edge): connect to edge endpoint when creating client * style(portainer): change deprecation version * refactor(sidebar): hide manage * refactor(containers): revert changes * style(container): remove whitespace * fix(endpoint): add handler to registy on endpointService * refactor(image): use endpointService.registries * fix(kueb/namespaces): rename resource pool to namespace * fix(kube/namespace): move selected registries * fix(api/registries): hide accesses on registry creation Co-authored-by: LP B <xAt0mZ@users.noreply.github.com> refactor(api): remove code duplication after rebase fix(app/registries): replace last registry api usage by endpoint registry api fix(api/endpoints): update registry access policies on endpoint deletion (#5226) [EE-1027] fix(db): update db version * fix(dockerhub): fetch rate limits * fix(registry/tests): supply restricred context * fix(registries): show proget registry only when selected * fix(registry): create dockerhub registry * feat(db): move migrations to db 32 Co-authored-by: Chaim Lev-Ari <chiptus@gmail.com>
124 lines
3.1 KiB
Go
124 lines
3.1 KiB
Go
package migrator
|
|
|
|
import (
|
|
portainer "github.com/portainer/portainer/api"
|
|
"github.com/portainer/portainer/api/bolt/errors"
|
|
)
|
|
|
|
func (m *Migrator) migrateDBVersionTo32() error {
|
|
err := m.updateRegistriesToDB32()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = m.updateDockerhubToDB32()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (m *Migrator) updateRegistriesToDB32() error {
|
|
registries, err := m.registryService.Registries()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
endpoints, err := m.endpointService.Endpoints()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
for _, registry := range registries {
|
|
|
|
registry.RegistryAccesses = portainer.RegistryAccesses{}
|
|
|
|
for _, endpoint := range endpoints {
|
|
|
|
filteredUserAccessPolicies := portainer.UserAccessPolicies{}
|
|
for userId, registryPolicy := range registry.UserAccessPolicies {
|
|
if _, found := endpoint.UserAccessPolicies[userId]; found {
|
|
filteredUserAccessPolicies[userId] = registryPolicy
|
|
}
|
|
}
|
|
|
|
filteredTeamAccessPolicies := portainer.TeamAccessPolicies{}
|
|
for teamId, registryPolicy := range registry.TeamAccessPolicies {
|
|
if _, found := endpoint.TeamAccessPolicies[teamId]; found {
|
|
filteredTeamAccessPolicies[teamId] = registryPolicy
|
|
}
|
|
}
|
|
|
|
registry.RegistryAccesses[endpoint.ID] = portainer.RegistryAccessPolicies{
|
|
UserAccessPolicies: filteredUserAccessPolicies,
|
|
TeamAccessPolicies: filteredTeamAccessPolicies,
|
|
Namespaces: []string{},
|
|
}
|
|
}
|
|
m.registryService.UpdateRegistry(registry.ID, ®istry)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (m *Migrator) updateDockerhubToDB32() error {
|
|
dockerhub, err := m.dockerhubService.DockerHub()
|
|
if err == errors.ErrObjectNotFound {
|
|
return nil
|
|
} else if err != nil {
|
|
return err
|
|
}
|
|
|
|
if !dockerhub.Authentication {
|
|
return nil
|
|
}
|
|
|
|
registry := &portainer.Registry{
|
|
Type: portainer.DockerHubRegistry,
|
|
Name: "Dockerhub (authenticated - migrated)",
|
|
URL: "docker.io",
|
|
Authentication: true,
|
|
Username: dockerhub.Username,
|
|
Password: dockerhub.Password,
|
|
RegistryAccesses: portainer.RegistryAccesses{},
|
|
}
|
|
|
|
endpoints, err := m.endpointService.Endpoints()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
for _, endpoint := range endpoints {
|
|
|
|
if endpoint.Type != portainer.KubernetesLocalEnvironment &&
|
|
endpoint.Type != portainer.AgentOnKubernetesEnvironment &&
|
|
endpoint.Type != portainer.EdgeAgentOnKubernetesEnvironment {
|
|
|
|
userAccessPolicies := portainer.UserAccessPolicies{}
|
|
for userId := range endpoint.UserAccessPolicies {
|
|
if _, found := endpoint.UserAccessPolicies[userId]; found {
|
|
userAccessPolicies[userId] = portainer.AccessPolicy{
|
|
RoleID: 0,
|
|
}
|
|
}
|
|
}
|
|
|
|
teamAccessPolicies := portainer.TeamAccessPolicies{}
|
|
for teamId := range endpoint.TeamAccessPolicies {
|
|
if _, found := endpoint.TeamAccessPolicies[teamId]; found {
|
|
teamAccessPolicies[teamId] = portainer.AccessPolicy{
|
|
RoleID: 0,
|
|
}
|
|
}
|
|
}
|
|
|
|
registry.RegistryAccesses[endpoint.ID] = portainer.RegistryAccessPolicies{
|
|
UserAccessPolicies: userAccessPolicies,
|
|
TeamAccessPolicies: teamAccessPolicies,
|
|
Namespaces: []string{},
|
|
}
|
|
}
|
|
}
|
|
|
|
return m.registryService.CreateRegistry(registry)
|
|
}
|