core/oc-deploy
6
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 1 Wiki Activity

Opts pour helm repo

Browse Source
This commit is contained in:
admju
2024-09-13 10:53:28 +00:00
parent dfa9fe3f1e
commit 9f0218a4da
4 changed files with 108 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
offline/latest.yml
View File

@@ -1,3 +1,3 @@
--- ---
version: 1.0 version: 0.1.0

5
src/chart/conf.go
View File

@@ -22,6 +22,7 @@ type repoData struct {
Name string `yaml:"name"` Name string `yaml:"name"`
Url string `yaml:"url"` Url string `yaml:"url"`
ForceUpdate bool `yaml:"forceupdate"` ForceUpdate bool `yaml:"forceupdate"`
Opts string `yaml:"opts"`
} }
type ChartRepoData struct { type ChartRepoData struct {
@@ -29,14 +30,14 @@ type ChartRepoData struct {
Charts []ChartData `yaml:"charts"` Charts []ChartData `yaml:"charts"`
} }
type chartsRepoData struct { type chartsRepoParse struct {
Charts []ChartRepoData `yaml:"opencloud"` Charts []ChartRepoData `yaml:"opencloud"`
} }
func FromConfigFile(filename string) ([]ChartRepoData, error) { func FromConfigFile(filename string) ([]ChartRepoData, error) {
yamlFile, _ := os.ReadFile(filename) yamlFile, _ := os.ReadFile(filename)
var data chartsRepoData var data chartsRepoParse
err := yaml.Unmarshal(yamlFile, &data) err := yaml.Unmarshal(yamlFile, &data)
if err != nil { if err != nil {
return data.Charts, err return data.Charts, err

10
src/helm/repo.go
View File

@@ -31,18 +31,22 @@ func (this HelmCommand) AddRepository(repo HelmRepo) (string, error) {
} }
msg := fmt.Sprintf("%s repo add %s %s %s %s", helm_bin, repo.Name, repo.Repository, force_update, repo.Opts) msg := fmt.Sprintf("%s repo add %s %s %s %s", helm_bin, repo.Name, repo.Repository, force_update, repo.Opts)
log.Log().Debug().Msg(msg)
msg = strings.TrimSuffix(msg, " ") msg = strings.TrimSuffix(msg, " ")
log.Log().Debug().Msg(msg)
cmd_args := strings.Split(msg, " ") cmd_args := strings.Split(msg, " ")
cmd := this.Exec(cmd_args[0], cmd_args[1:]...) cmd := this.Exec(cmd_args[0], cmd_args[1:]...)
stdout, err := cmd.CombinedOutput() stdout, err := cmd.CombinedOutput()
if err != nil {
return "", fmt.Errorf(string(stdout))
}
res := string(stdout) res := string(stdout)
res = strings.TrimSuffix(res, "\n") res = strings.TrimSuffix(res, "\n")
log.Log().Debug().Msg(res)
return res, err return res, nil
} }
type parseList struct { type parseList struct {
@@ -59,7 +63,7 @@ func (this HelmCommand) ListRepository() ([]string, error) {
cmd_args := strings.Split(msg, " ") cmd_args := strings.Split(msg, " ")
cmd := this.Exec(cmd_args[0], cmd_args[1:]...) cmd := this.Exec(cmd_args[0], cmd_args[1:]...)
stdout, err := cmd.CombinedOutput() stdout, err := cmd.CombinedOutput()
if err != nil { if err != nil {
return res, err return res, err

3
src/install/install.go
View File

@@ -41,7 +41,8 @@ func (this *InstallClass) ChartRepo() (error) {
log.Log().Info().Msg(fmt.Sprintf(" >> Helm Repo : %s", v.Repository.Name)) log.Log().Info().Msg(fmt.Sprintf(" >> Helm Repo : %s", v.Repository.Name))
repo := helm.HelmRepo{Name: v.Repository.Name, repo := helm.HelmRepo{Name: v.Repository.Name,
Repository: v.Repository.Url, Repository: v.Repository.Url,
ForceUpdate: v.Repository.ForceUpdate} ForceUpdate: v.Repository.ForceUpdate,
Opts: v.Repository.Opts}
res, err := this.commandHelm.AddRepository(repo) res, err := this.commandHelm.AddRepository(repo)
if err != nil { if err != nil {
log.Log().Info().Msg(fmt.Sprintf(" << %s ", err)) log.Log().Info().Msg(fmt.Sprintf(" << %s ", err))