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

guard around kube actions for endpoint inspect (#8430)

pull/8454/head
Matt Hook 2023-02-07 23:13:52 +13:00 committed by GitHub
parent 2dddc1c6b9
commit e2168d21c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
api/http/handler/endpoints/endpoint_inspect.go
View File

@ -52,22 +52,24 @@ func (handler *Handler) endpointInspect(w http.ResponseWriter, r *http.Request)
} }
} }
isServerMetricsDetected := endpoint.Kubernetes.Flags.IsServerMetricsDetected if endpointutils.IsKubernetesEndpoint(endpoint) {
if endpointutils.IsKubernetesEndpoint(endpoint) && !isServerMetricsDetected && handler.K8sClientFactory != nil { isServerMetricsDetected := endpoint.Kubernetes.Flags.IsServerMetricsDetected
endpointutils.InitialMetricsDetection( if !isServerMetricsDetected && handler.K8sClientFactory != nil {
endpoint, endpointutils.InitialMetricsDetection(
handler.DataStore.Endpoint(), endpoint,
handler.K8sClientFactory, handler.DataStore.Endpoint(),
) handler.K8sClientFactory,
} )
}
isServerStorageDetected := endpoint.Kubernetes.Flags.IsServerStorageDetected isServerStorageDetected := endpoint.Kubernetes.Flags.IsServerStorageDetected
if !isServerStorageDetected && handler.K8sClientFactory != nil { if !isServerStorageDetected && handler.K8sClientFactory != nil {
endpointutils.InitialStorageDetection( endpointutils.InitialStorageDetection(
endpoint, endpoint,
handler.DataStore.Endpoint(), handler.DataStore.Endpoint(),
handler.K8sClientFactory, handler.K8sClientFactory,
) )
}
} }
return response.JSON(w, endpoint) return response.JSON(w, endpoint)