From e13561ec4da30e45a517035144c2ba18912de25a Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 18 Jan 2024 18:55:03 -0500 Subject: [PATCH] refactor: move registry path to const --- plugins/scheduler-k3s/scheduler_k3s.go | 2 ++ plugins/scheduler-k3s/subcommands.go | 4 ++-- plugins/scheduler-k3s/triggers.go | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/scheduler-k3s/scheduler_k3s.go b/plugins/scheduler-k3s/scheduler_k3s.go index 02462ad14..715d37fac 100644 --- a/plugins/scheduler-k3s/scheduler_k3s.go +++ b/plugins/scheduler-k3s/scheduler_k3s.go @@ -32,6 +32,8 @@ var ( const KubeConfigPath = "/etc/rancher/k3s/k3s.yaml" +const RegistryConfigPath = "/etc/rancher/k3s/registries.yaml" + var ( runtimeScheme = runtime.NewScheme() codecs = serializer.NewCodecFactory(runtimeScheme) diff --git a/plugins/scheduler-k3s/subcommands.go b/plugins/scheduler-k3s/subcommands.go index e149d6a87..9d5550e9f 100644 --- a/plugins/scheduler-k3s/subcommands.go +++ b/plugins/scheduler-k3s/subcommands.go @@ -76,7 +76,7 @@ func CommandInitialize() error { return fmt.Errorf("Error installing k3s: %w", installerCmd.ExitError) } - if err := common.TouchFile("/etc/rancher/k3s/registries.yaml"); err != nil { + if err := common.TouchFile(RegistryConfigPath); err != nil { return fmt.Errorf("Error creating initial registries.yaml file") } @@ -84,7 +84,7 @@ func CommandInitialize() error { "setfacl", "-m", "user:dokku:rwx", - "/etc/rancher/k3s/registries.yaml", + RegistryConfigPath, }, " ")) if !registryAclCmd.Execute() { return fmt.Errorf("Error updating acls on k3s registries.yaml file: %w", registryAclCmd.ExitError) diff --git a/plugins/scheduler-k3s/triggers.go b/plugins/scheduler-k3s/triggers.go index 2d4d751cb..81ebff23d 100644 --- a/plugins/scheduler-k3s/triggers.go +++ b/plugins/scheduler-k3s/triggers.go @@ -85,8 +85,7 @@ func TriggerPostRegistryLogin(server string, username string, password string) e } registry := registries.Registry{} - registryFile := "/etc/rancher/k3s/registries.yaml" - yamlFile, err := os.ReadFile(registryFile) + yamlFile, err := os.ReadFile(RegistryConfigPath) if err != nil { return fmt.Errorf("Unable to read existing registries.yaml: %w", err) }