Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 05:45:22 +02:00
Code Issues Releases Activity

fix(registry): remove k8s registry secrets when registries are removed [EE-5768] (#10369)

Browse source
This commit is contained in:
Matt Hook 2023-10-24 09:24:09 +13:00 • committed by GitHub
parent 96ead31a8d
commit 860890046d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 206 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/internal/registryutils/ecr_kube_secret.go
View file

@ -35,7 +35,7 @@ func RefreshEcrSecret(cli portainer.KubeClient, endpoint *portainer.Endpoint, da
return
}
err = cli.DeleteRegistrySecret(&registry, namespace)
err = cli.DeleteRegistrySecret(registry.ID, namespace)
if err != nil {
return
}

5
api/internal/snapshot/snapshot.go
View file

@ -312,7 +312,10 @@ func updateEndpointStatus(tx dataservices.DataStoreTx, endpoint *portainer.Endpo
// Run the pending actions
if latestEndpointReference.Status == portainer.EndpointStatusUp {
pendingActionsService.Execute(endpoint.ID)
err = pendingActionsService.Execute(endpoint.ID)
if err != nil {
log.Error().Err(err).Msg("background schedule error (environment snapshot), unable to execute pending actions")
}
}
}