github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-06-24 07:14:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

⚡ Ignore the Kubernetes version check in certain commands while creating the Kubernetes provider

Browse Source
This commit is contained in:
M. Mert Yildiran 2023-04-20 20:09:19 +03:00
parent bbe3338c3c
commit 466b9099bd
No known key found for this signature in database
GPG Key ID: DA5D6DCBB758A461
6 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cleanRunner.go
View File

@ -5,7 +5,7 @@ import (
) )
func performCleanCommand() { func performCleanCommand() {
kubernetesProvider, err := getKubernetesProviderForCli(false) kubernetesProvider, err := getKubernetesProviderForCli(false, false)
if err != nil { if err != nil {
return return
} }

4
cmd/common.go
View File

@ -58,7 +58,7 @@ func startProxyReportErrorIfAny(kubernetesProvider *kubernetes.Provider, ctx con
} }
} }
func getKubernetesProviderForCli(silent bool) (*kubernetes.Provider, error) { func getKubernetesProviderForCli(silent bool, dontCheckVersion bool) (*kubernetes.Provider, error) {
kubeConfigPath := config.Config.KubeConfigPath() kubeConfigPath := config.Config.KubeConfigPath()
kubernetesProvider, err := kubernetes.NewProvider(kubeConfigPath, config.Config.Kube.Context) kubernetesProvider, err := kubernetes.NewProvider(kubeConfigPath, config.Config.Kube.Context)
if err != nil { if err != nil {
@ -75,6 +75,7 @@ func getKubernetesProviderForCli(silent bool) (*kubernetes.Provider, error) {
return nil, err return nil, err
} }
if !dontCheckVersion {
kubernetesVersion, err := kubernetesProvider.GetKubernetesVersion() kubernetesVersion, err := kubernetesProvider.GetKubernetesVersion()
if err != nil { if err != nil {
handleKubernetesProviderError(err) handleKubernetesProviderError(err)
@ -85,6 +86,7 @@ func getKubernetesProviderForCli(silent bool) (*kubernetes.Provider, error) {
handleKubernetesProviderError(err) handleKubernetesProviderError(err)
return nil, err return nil, err
} }
}
return kubernetesProvider, nil return kubernetesProvider, nil
} }

2
cmd/logs.go
View File

@ -18,7 +18,7 @@ var logsCmd = &cobra.Command{
Use: "logs", Use: "logs",
Short: "Create a ZIP file with logs for GitHub issues or troubleshooting", Short: "Create a ZIP file with logs for GitHub issues or troubleshooting",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
kubernetesProvider, err := getKubernetesProviderForCli(false) kubernetesProvider, err := getKubernetesProviderForCli(false, false)
if err != nil { if err != nil {
return nil return nil
} }

2
cmd/manifests.go
View File

@ -104,7 +104,7 @@ func generateManifests() (
err error, err error,
) { ) {
var kubernetesProvider *kubernetes.Provider var kubernetesProvider *kubernetes.Provider
kubernetesProvider, err = getKubernetesProviderForCli(true) kubernetesProvider, err = getKubernetesProviderForCli(true, true)
if err != nil { if err != nil {
return return
} }

2
cmd/proxyRunner.go
View File

@ -15,7 +15,7 @@ import (
) )
func runProxy(block bool, noBrowser bool) { func runProxy(block bool, noBrowser bool) {
kubernetesProvider, err := getKubernetesProviderForCli(false) kubernetesProvider, err := getKubernetesProviderForCli(false, false)
if err != nil { if err != nil {
return return
} }

2
cmd/tapRunner.go
View File

@ -62,7 +62,7 @@ func tap() {
connector = connect.NewConnector(kubernetes.GetLocalhostOnPort(config.Config.Tap.Proxy.Hub.SrcPort), connect.DefaultRetries, connect.DefaultTimeout) connector = connect.NewConnector(kubernetes.GetLocalhostOnPort(config.Config.Tap.Proxy.Hub.SrcPort), connect.DefaultRetries, connect.DefaultTimeout)
kubernetesProvider, err := getKubernetesProviderForCli(false) kubernetesProvider, err := getKubernetesProviderForCli(false, false)
if err != nil { if err != nil {
return return
} }