rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 23:04:41 +00:00
Code Issues Releases Wiki Activity

Support service cache update

Browse Source
This commit is contained in:
Jason-ZW
2019-02-25 17:48:31 +08:00
committed by niusmallnan
parent 364c9c115d
commit 66cffc0a91
6 changed files with 108 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/control/console.go
View File

@@ -43,8 +43,14 @@ func consoleSubcommands() []cli.Command {
Action: consoleEnable,
},
{
Name: "list",
Usage: "list available consoles",
Name: "list",
Usage: "list available consoles",
Flags: []cli.Flag{
cli.BoolFlag{
Name: "update, u",
Usage: "update console cache",
},
},
Action: consoleList,
},
}
@@ -127,7 +133,7 @@ func consoleEnable(c *cli.Context) error {
func consoleList(c *cli.Context) error {
cfg := config.LoadConfig()
consoles := availableConsoles(cfg)
consoles := availableConsoles(cfg, c.Bool("update"))
CurrentConsole := CurrentConsole()
for _, console := range consoles {
@@ -144,13 +150,20 @@ func consoleList(c *cli.Context) error {
}
func validateConsole(console string, cfg *config.CloudConfig) {
consoles := availableConsoles(cfg)
consoles := availableConsoles(cfg, false)
if !service.IsLocalOrURL(console) && !util.Contains(consoles, console) {
log.Fatalf("%s is not a valid console", console)
}
}
func availableConsoles(cfg *config.CloudConfig) []string {
func availableConsoles(cfg *config.CloudConfig, update bool) []string {
if update {
err := network.UpdateCaches(cfg.Rancher.Repositories.ToArray(), "consoles")
if err != nil {
log.Debugf("Failed to update console caches: %v", err)
}
}
consoles, err := network.GetConsoles(cfg.Rancher.Repositories.ToArray())
if err != nil {
log.Fatal(err)