mirror of https://github.com/portainer/portainer
fix(pending-actions): correctly detect unreachable/down cluster [EE-7049] (#11809)
parent
42d9dfba36
commit
00ab9e949a
|
@ -0,0 +1,7 @@
|
||||||
|
package cli
|
||||||
|
|
||||||
|
import "k8s.io/apimachinery/pkg/version"
|
||||||
|
|
||||||
|
func (kcl *KubeClient) ServerVersion() (*version.Info, error) {
|
||||||
|
return kcl.cli.Discovery().ServerVersion()
|
||||||
|
}
|
|
@ -73,8 +73,16 @@ func (service *PendingActionsService) Execute(id portainer.EndpointID) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// For Kubernetes endpoints, we need to check if the client can be created
|
// For Kubernetes endpoints, we need to check if the endpoint is up by
|
||||||
if _, err := service.kubeFactory.GetKubeClient(endpoint); err != nil {
|
// creating a kube client and performing a simple operation
|
||||||
|
client, err := service.kubeFactory.GetKubeClient(endpoint)
|
||||||
|
if err != nil {
|
||||||
|
log.Debug().Msgf("failed to create Kubernetes client for environment %d: %v", id, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err = client.ServerVersion(); err != nil {
|
||||||
|
log.Debug().Err(err).Msgf("Environment %q (id: %d) is not up", endpoint.Name, id)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,6 +14,7 @@ import (
|
||||||
"github.com/portainer/portainer/pkg/featureflags"
|
"github.com/portainer/portainer/pkg/featureflags"
|
||||||
"golang.org/x/oauth2"
|
"golang.org/x/oauth2"
|
||||||
v1 "k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
|
"k8s.io/apimachinery/pkg/version"
|
||||||
)
|
)
|
||||||
|
|
||||||
type (
|
type (
|
||||||
|
@ -1487,6 +1488,8 @@ type (
|
||||||
|
|
||||||
// KubeClient represents a service used to query a Kubernetes environment(endpoint)
|
// KubeClient represents a service used to query a Kubernetes environment(endpoint)
|
||||||
KubeClient interface {
|
KubeClient interface {
|
||||||
|
ServerVersion() (*version.Info, error)
|
||||||
|
|
||||||
SetupUserServiceAccount(userID int, teamIDs []int, restrictDefaultNamespace bool) error
|
SetupUserServiceAccount(userID int, teamIDs []int, restrictDefaultNamespace bool) error
|
||||||
IsRBACEnabled() (bool, error)
|
IsRBACEnabled() (bool, error)
|
||||||
GetServiceAccount(tokendata *TokenData) (*v1.ServiceAccount, error)
|
GetServiceAccount(tokendata *TokenData) (*v1.ServiceAccount, error)
|
||||||
|
|
Loading…
Reference in New Issue