Add proxy configuration at the context level

cmd/root.go

@@ -6,11 +6,14 @@ package cmd
 import (
  "errors"
  "fmt"
+ "net/http"
+ "net/url"
  "os"
  "runtime/debug"
  "strings"
 
  "github.com/derailed/k9s/internal/config/data"
+ "k8s.io/client-go/rest"
  "k8s.io/client-go/tools/clientcmd/api"
 
  "github.com/derailed/k9s/internal/client"
@@ -128,11 +131,6 @@ func loadConfiguration() (*config.Config, error) {
  k8sCfg := client.NewConfig(k8sFlags)
  k9sCfg := config.NewConfig(k8sCfg)
  var errs error
- conn, err := client.InitConnection(k8sCfg)
- k9sCfg.SetConnection(conn)
- if err != nil {
- errs = errors.Join(errs, err)
- }
 
  if err := k9sCfg.Load(config.AppConfigFile, false); err != nil {
  errs = errors.Join(errs, err)
@@ -142,14 +140,41 @@ func loadConfiguration() (*config.Config, error) {
  log.Error().Err(err).Msgf("config refine failed")
  errs = errors.Join(errs, err)
  }
+
+ ctx, err := k9sCfg.CurrentContext()
+
+ if err != nil {
+ errs = errors.Join(errs, err)
+ }
+
+ if ctx.Proxy != nil {
+ k8sFlags.WrapConfigFn = func(cfg *rest.Config) *rest.Config {
+ cfg.Proxy = func(*http.Request) (*url.URL, error) {
+ log.Debug().Msgf("[Proxy]: %s", *&ctx.Proxy.Address)
+ return url.Parse(ctx.Proxy.Address)
+ }
+
+ return cfg
+ }
+ }
+
+ conn, err := client.InitConnection(k8sCfg)
+
+ if err != nil {
+ errs = errors.Join(errs, err)
+ }
+
  // Try to access server version if that fail. Connectivity issue?
  if !conn.CheckConnectivity() {
  errs = errors.Join(errs, fmt.Errorf("cannot connect to context: %s", k9sCfg.K9s.ActiveContextName()))
  }
+
  if !conn.ConnectionOK() {
  errs = errors.Join(errs, fmt.Errorf("k8s connection failed for context: %s", k9sCfg.K9s.ActiveContextName()))
  }
 
+ k9sCfg.SetConnection(conn)
+
  log.Info().Msg("✅ Kubernetes connectivity")
  if err := k9sCfg.Save(false); err != nil {
  log.Error().Err(err).Msg("Config save")

internal/client/config.go

@@ -50,7 +50,7 @@ func (c *Config) CallTimeout() time.Duration {
 }
 
 func (c *Config) RESTConfig() (*restclient.Config, error) {
- return c.clientConfig().ClientConfig()
+ return c.flags.ToRESTConfig()
 }
 
 // Flags returns configuration flags.

internal/config/data/context.go

@@ -20,6 +20,7 @@ type Context struct {
  View *View `yaml:"view"`
  FeatureGates FeatureGates `yaml:"featureGates"`
  PortForwardAddress string `yaml:"portForwardAddress"`
+ Proxy *Proxy `yaml:"proxy"`
  mx sync.RWMutex
 }
 

internal/config/data/proxy.go

@@ -0,0 +1,6 @@
+package data
+
+// Proxy tracks a context's proxy configuration.
+type Proxy struct {
+ Address string `yaml:"address"`
+}

internal/config/data/testdata/data/k9s/cl-1/ct-1-1/config.yaml

@@ -14,3 +14,4 @@ k9s:
  featureGates:
  nodeShell: true
  portForwardAddress: localhost
+ proxy: null

internal/config/json/schemas/context.json

@@ -11,6 +11,13 @@
  "readOnly": {"type": "boolean"},
  "skin": { "type": "string" },
  "portForwardAddress": { "type": "string" },
+ "proxy": {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "address": {"type": "string"}
+ }
+ },
  "namespace": {
  "type": "object",
  "additionalProperties": false,
@@ -41,4 +48,4 @@
  }
  },
  "required": ["k9s"]
-}
+}