From f8a444406111269d3abf577402af72cc33495f19 Mon Sep 17 00:00:00 2001 From: hftsin Date: Thu, 24 Nov 2022 05:54:27 +0800 Subject: [PATCH 1/3] app: persist the kubernetes config --- app/app.go | 15 +++++++++++++++ environment/container/kubernetes/kubernetes.go | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/app.go b/app/app.go index 2bdb1063a..fea925877 100644 --- a/app/app.go +++ b/app/app.go @@ -4,6 +4,7 @@ import ( "bufio" "bytes" "context" + "encoding/json" "fmt" "os" "path/filepath" @@ -116,6 +117,11 @@ func (c colimaApp) Start(conf config.Config) error { log.Error(fmt.Errorf("error persisting runtime settings: %w", err)) } + // persist the kubernetes config + if err := c.setKubernetes(conf.Kubernetes); err != nil { + log.Error(fmt.Errorf("error persisting kubernetes settings: %w", err)) + } + log.Println("done") if err := generateSSHConfig(conf.SSHConfig); err != nil { @@ -390,6 +396,15 @@ func (c colimaApp) setRuntime(runtime string) error { return c.guest.Set(environment.ContainerRuntimeKey, runtime) } +func (c colimaApp) setKubernetes(conf config.Kubernetes) error { + b, err := json.Marshal(conf) + if err != nil { + return err + } + + return c.guest.Set(kubernetes.ConfigKey, string(b)) +} + func (c colimaApp) currentContainerEnvironments(ctx context.Context) ([]environment.Container, error) { var containers []environment.Container diff --git a/environment/container/kubernetes/kubernetes.go b/environment/container/kubernetes/kubernetes.go index 3f3d21c7e..7f4cf2e7f 100644 --- a/environment/container/kubernetes/kubernetes.go +++ b/environment/container/kubernetes/kubernetes.go @@ -20,7 +20,7 @@ const ( Name = "kubernetes" DefaultVersion = "v1.25.4+k3s1" - configKey = "kubernetes_config" + ConfigKey = "kubernetes_config" ) func newRuntime(host environment.HostActions, guest environment.GuestActions) environment.Container { @@ -71,7 +71,7 @@ func (c kubernetesRuntime) runtime() string { func (c kubernetesRuntime) config() config.Kubernetes { conf := config.Kubernetes{Version: DefaultVersion} - if b := c.guest.Get(configKey); b != "" { + if b := c.guest.Get(ConfigKey); b != "" { _ = json.Unmarshal([]byte(b), &conf) } return conf @@ -83,7 +83,7 @@ func (c kubernetesRuntime) setConfig(conf config.Kubernetes) error { return fmt.Errorf("error encoding kubernetes config to json: %w", err) } - return c.guest.Set(configKey, string(b)) + return c.guest.Set(ConfigKey, string(b)) } func (c *kubernetesRuntime) Provision(ctx context.Context) error { From 9c20e4a66eb5fc35ecb9e35ceed09889f7dc14d3 Mon Sep 17 00:00:00 2001 From: hftsin Date: Thu, 24 Nov 2022 09:52:12 +0800 Subject: [PATCH 2/3] k3s: disable trafefik by defaults --- environment/container/kubernetes/k3s.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/environment/container/kubernetes/k3s.go b/environment/container/kubernetes/k3s.go index 5d322c108..e4855d5f8 100644 --- a/environment/container/kubernetes/k3s.go +++ b/environment/container/kubernetes/k3s.go @@ -122,6 +122,9 @@ func installK3sCluster( "--resolv-conf", "/etc/resolv.conf", } + // disable traefik defaults + args = append(args, "--disable", "traefik") + for _, d := range disable { args = append(args, "--disable", d) } From 384da14d8a5f22fa3d8f9df490cdbc9e27a2a9b4 Mon Sep 17 00:00:00 2001 From: hftsin Date: Tue, 13 Dec 2022 21:48:26 +0800 Subject: [PATCH 3/3] Revert "k3s: disable trafefik by defaults" This reverts commit 9c20e4a66eb5fc35ecb9e35ceed09889f7dc14d3. --- environment/container/kubernetes/k3s.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/environment/container/kubernetes/k3s.go b/environment/container/kubernetes/k3s.go index e4855d5f8..5d322c108 100644 --- a/environment/container/kubernetes/k3s.go +++ b/environment/container/kubernetes/k3s.go @@ -122,9 +122,6 @@ func installK3sCluster( "--resolv-conf", "/etc/resolv.conf", } - // disable traefik defaults - args = append(args, "--disable", "traefik") - for _, d := range disable { args = append(args, "--disable", d) }