Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-04 21:35:23 +02:00
Code Issues Releases Activity

fix(kubernetes): run group permission when endpoint is up [EE-5427] (#10121)

Browse source 
* update group access when env is down

* fix tests
This commit is contained in:
Prabhat Khera 2023-09-05 11:03:43 +12:00 • committed by GitHub
parent d75a8027a5
commit a02f9f1f07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 90 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/internal/authorization/authorizations.go
View file

@ -9,12 +9,12 @@ import (
// Service represents a service used to
// update authorizations associated to a user or team.
type Service struct {
dataStore dataservices.DataStore
dataStore dataservices.DataStoreTx
K8sClientFactory *cli.ClientFactory
}
// NewService returns a point to a new Service instance.
func NewService(dataStore dataservices.DataStore) *Service {
func NewService(dataStore dataservices.DataStoreTx) *Service {
return &Service{
dataStore: dataStore,
}

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

@ -10,6 +10,8 @@ import (
"github.com/portainer/portainer/api/agent"
"github.com/portainer/portainer/api/crypto"
"github.com/portainer/portainer/api/dataservices"
"github.com/portainer/portainer/api/http/utils"
"github.com/portainer/portainer/api/internal/authorization"
"github.com/portainer/portainer/api/internal/endpointutils"
"github.com/portainer/portainer/pkg/featureflags"
@ -304,6 +306,11 @@ func updateEndpointStatus(tx dataservices.DataStoreTx, endpoint *portainer.Endpo
Str("URL", endpoint.URL).Err(err).
Msg("background schedule error (environment snapshot), unable to update environment")
}
// Run the pending actions
if latestEndpointReference.Status == portainer.EndpointStatusUp {
utils.RunPendingActions(latestEndpointReference, tx, authorization.NewService(tx))
}
}
// FetchDockerID fetches info.Swarm.Cluster.ID if environment(endpoint) is swarm and info.ID otherwise