github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

correctly detect unreachable

pull/11810/head
hookenz 2024-05-09 15:09:44 +12:00
parent 24e0318280
commit 7813ac87cf
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/kubernetes/cli/server_version.go Normal file
View File

@ -0,0 +1,7 @@
package cli
import "k8s.io/apimachinery/pkg/version"
func (kcl *KubeClient) ServerVersion() (*version.Info, error) {
return kcl.cli.Discovery().ServerVersion()
}

9
api/pendingactions/pendingactions.go
View File

@ -76,10 +76,11 @@ func (service *PendingActionsService) Execute(id portainer.EndpointID) error {
// For Kubernetes endpoints, we need to check if the endpoint is up by creating a kube client // For Kubernetes endpoints, we need to check if the endpoint is up by creating a kube client
if isKubernetesEndpoint { if isKubernetesEndpoint {
_, err := service.kubeFactory.GetKubeClient(endpoint) if client, _ := service.kubeFactory.GetKubeClient(endpoint); client != nil {
if err != nil { if _, err = client.ServerVersion(); err != nil {
log.Debug().Err(err).Msgf("Environment %q (id: %d) is not up", endpoint.Name, id) log.Debug().Err(err).Msgf("Environment %q (id: %d) is not up", endpoint.Name, id)
return fmt.Errorf("environment %q (id: %d) is not up", endpoint.Name, id) return fmt.Errorf("environment %q (id: %d) is not up", endpoint.Name, id)
}
} }
} }

3
api/portainer.go
View File

@ -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 (
@ -1496,6 +1497,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)