github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-04-28 20:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ Add KUBESHARK_HELM_CHART_PATH environment variable to set a local path for the Helm chart

Browse Source
This commit is contained in:
M. Mert Yildiran 2023-07-03 17:15:47 +03:00
parent 4fb179f623
commit 4c2884c40f
No known key found for this signature in database
GPG Key ID: DA5D6DCBB758A461
2 changed files with 67 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kubernetes/helm/helm.go
View File

@ -2,11 +2,14 @@ package helm
import ( import (
"encoding/json" "encoding/json"
"fmt"
"os" "os"
"path/filepath" "path/filepath"
"regexp" "regexp"
"strings"
"github.com/kubeshark/kubeshark/config" "github.com/kubeshark/kubeshark/config"
"github.com/kubeshark/kubeshark/misc"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/action"
@ -64,6 +67,8 @@ func (h *Helm) Install() (rel *release.Release, err error) {
client.Namespace = h.releaseNamespace client.Namespace = h.releaseNamespace
client.ReleaseName = h.releaseName client.ReleaseName = h.releaseName
chartPath := os.Getenv(fmt.Sprintf("%s_HELM_CHART_PATH", strings.ToUpper(misc.Program)))
if chartPath == "" {
var chartURL string var chartURL string
chartURL, err = repo.FindChartInRepoURL(h.repo, h.releaseName, "", "", "", "", getter.All(&cli.EnvSettings{})) chartURL, err = repo.FindChartInRepoURL(h.repo, h.releaseName, "", "", "", "", getter.All(&cli.EnvSettings{}))
if err != nil { if err != nil {
@ -126,8 +131,10 @@ func (h *Helm) Install() (rel *release.Release, err error) {
return return
} }
chartPath = m.ChartPath
}
var chart *chart.Chart var chart *chart.Chart
chart, err = loader.Load(m.ChartPath) chart, err = loader.Load(chartPath)
if err != nil { if err != nil {
return return
} }

2
misc/version/versionCheck.go
View File

@ -16,7 +16,7 @@ import (
) )
func CheckNewerVersion() { func CheckNewerVersion() {
if os.Getenv("KUBESHARK_DISABLE_VERSION_CHECK") != "" { if os.Getenv(fmt.Sprintf("%s_DISABLE_VERSION_CHECK", strings.ToUpper(misc.Program))) != "" {
return return
} }