allanger/shoebill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

A big progress

Browse Source 
A big progress
This commit is contained in:
Nikolai Rodionov
2023-12-20 22:19:08 +01:00
parent 398ffeb963
commit 8e7a8998d3
10 changed files with 243 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
internal/utils/helmhelper/helm.go
View File

@ -83,8 +83,11 @@ func (h *Helm) PullChart(workdirPath string, release *ChartData) (path string, e
if err != nil {
return "", err
}
return path, nil
logrus.Info(path)
logrus.Info(chartDir)
chartPath := fmt.Sprintf("%s/%s", chartDir, path)
logrus.Info(chartPath)
return chartPath, nil
}
func (h *Helm) FindLatestVersion(workdirPath string, release *ChartData) (version string, err error) {
@ -103,7 +106,7 @@ func (h *Helm) FindLatestVersion(workdirPath string, release *ChartData) (versio
showAction := action.NewShowWithConfig(action.ShowChart, config)
res, err := showAction.LocateChart(fmt.Sprintf("%s/%s", chartDir, chartPath), cl)
res, err := showAction.LocateChart(chartPath, cl)
if err != nil {
return "", err
}
@ -125,14 +128,12 @@ func (h *Helm) FindLatestVersion(workdirPath string, release *ChartData) (versio
return chartData.Version, err
}
func (h *Helm) PushChart(workdirPath string, server, prefix, username, password string, chartdata *ChartData) (err error) {
downloadDirPath := getDownloadDirPath(workdirPath)
chartDir := getChartDirPath(downloadDirPath, chartdata)
_, err = os.Stat(chartDir)
func (h *Helm) PushChart(chartPath string, server, prefix, username, password string, chartdata *ChartData) (err error) {
_, err = os.Stat(chartPath)
if err != nil && !os.IsNotExist(err) {
return err
} else if os.IsNotExist(err) {
if err := os.Mkdir(chartDir, 0777); err != nil {
if err := os.Mkdir(chartPath, 0777); err != nil {
return err
}
}
@ -147,13 +148,9 @@ func (h *Helm) PushChart(workdirPath string, server, prefix, username, password
if err != nil {
return err
}
versionedChartDir := fmt.Sprintf("%s/%s", getChartDirPath(downloadDirPath, chartdata), chartdata.Name)
tar := action.NewPackage()
tar.Destination = downloadDirPath
logrus.Info(versionedChartDir)
logrus.Info(chartDir)
tarname, err := tar.Run(versionedChartDir, nil)
tar.Destination = chartPath
tarname, err := tar.Run(chartPath, nil)
// tarpath := fmt.Sprintf("%s/%s", versionedChartDir, tarname)
if err != nil {
return err