From 4650585dedff84d73b1282acfd1fa40bb9565b0e Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 18 Jan 2024 22:27:07 -0500 Subject: [PATCH] fix: pull pass from env var --- plugins/scheduler-k3s/src/triggers/triggers.go | 3 +-- plugins/scheduler-k3s/triggers.go | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/scheduler-k3s/src/triggers/triggers.go b/plugins/scheduler-k3s/src/triggers/triggers.go index ed701b317..4e99e14d8 100644 --- a/plugins/scheduler-k3s/src/triggers/triggers.go +++ b/plugins/scheduler-k3s/src/triggers/triggers.go @@ -38,8 +38,7 @@ func main() { case "post-registry-login": server := flag.Arg(0) username := flag.Arg(1) - password := flag.Arg(2) - err = scheduler_k3s.TriggerPostRegistryLogin(server, username, password) + err = scheduler_k3s.TriggerPostRegistryLogin(server, username) case "report": appName := flag.Arg(0) err = scheduler_k3s.ReportSingleApp(appName, "", "") diff --git a/plugins/scheduler-k3s/triggers.go b/plugins/scheduler-k3s/triggers.go index aec94eec7..6f902f0e2 100644 --- a/plugins/scheduler-k3s/triggers.go +++ b/plugins/scheduler-k3s/triggers.go @@ -79,11 +79,13 @@ func TriggerPostDelete(appName string) error { // TriggerPostRegistryLogin updates the `/etc/rancher/k3s/registries.yaml` to include // auth information for the registry. Note that if the file does not exist, it won't be updated. -func TriggerPostRegistryLogin(server string, username string, password string) error { +func TriggerPostRegistryLogin(server string, username string) error { if !common.FileExists("/usr/local/bin/k3s") { return nil } + password := os.Getenv("DOCKER_REGISTRY_PASS") + registry := registries.Registry{} yamlFile, err := os.ReadFile(RegistryConfigPath) if err != nil {