Skip to content

feat: server option for kubernetes client #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/app/kube-client.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import "gopkg.in/alecthomas/kingpin.v2"

var KubeContext = ""
var KubeConfig = ""
var KubeServer = ""
var KubeClientQpsDefault = "5" // DefaultQPS from k8s.io/client-go/rest/config.go
var KubeClientQps float32
var KubeClientBurstDefault = "10" // DefaultBurst from k8s.io/client-go/rest/config.go
Expand All @@ -29,4 +30,9 @@ func DefineKubeClientFlags(cmd *kingpin.CmdClause) {
Envar("KUBE_CLIENT_BURST").
Default(KubeClientBurstDefault).
IntVar(&KubeClientBurst)

cmd.Flag("kube-server", "The address and port of the Kubernetes API server. Can be set with $KUBE_SERVER.").
Envar("KUBE_SERVER").
Default(KubeServer).
StringVar(&KubeServer)
}
67 changes: 42 additions & 25 deletions pkg/kube/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ type KubernetesClient interface {

WithContextName(contextName string)
WithConfigPath(configPath string)
WithServer(server string)
WithRateLimiterSettings(qps float32, burst int)

Init() error
Expand Down Expand Up @@ -75,6 +76,11 @@ type kubernetesClient struct {
dynamicClient dynamic.Interface
qps float32
burst int
server string
}

func (c *kubernetesClient) WithServer(server string) {
c.server = server
}

func (c *kubernetesClient) WithContextName(name string) {
Expand Down Expand Up @@ -106,37 +112,48 @@ func (c *kubernetesClient) Init() error {
var configType = "out-of-cluster"
var defaultNs string

// Try to load from kubeconfig in flags or from ~/.kube/config
config, defaultNs, outOfClusterErr := getOutOfClusterConfig(c.contextName, c.configPath)

if config == nil {
if hasInClusterConfig() {
// Try to configure as inCluster
config, defaultNs, err = getInClusterConfig()
if err != nil {
if c.configPath != "" || c.contextName != "" {
if outOfClusterErr != nil {
err = fmt.Errorf("out-of-cluster config error: %v, in-cluster config error: %v", outOfClusterErr, err)
logEntry.Errorf("configuration problems: %s", err)
return err
if c.server == "" {
// Try to load from kubeconfig in flags or from ~/.kube/config
var outOfClusterErr error
config, defaultNs, outOfClusterErr = getOutOfClusterConfig(c.contextName, c.configPath)

if config == nil {
if hasInClusterConfig() {
// Try to configure as inCluster
config, defaultNs, err = getInClusterConfig()
if err != nil {
if c.configPath != "" || c.contextName != "" {
if outOfClusterErr != nil {
err = fmt.Errorf("out-of-cluster config error: %v, in-cluster config error: %v", outOfClusterErr, err)
logEntry.Errorf("configuration problems: %s", err)
return err
} else {
return fmt.Errorf("in-cluster config is not found")
}
} else {
return fmt.Errorf("in-cluster config is not found")
logEntry.Errorf("in-cluster problem: %s", err)
return err
}
} else {
logEntry.Errorf("in-cluster problem: %s", err)
return err
}
}
} else {
// if not in cluster return outOfCluster error
if outOfClusterErr != nil {
logEntry.Errorf("out-of-cluster problem: %s", outOfClusterErr)
return outOfClusterErr
} else {
return fmt.Errorf("no kubernetes client config found")
// if not in cluster return outOfCluster error
if outOfClusterErr != nil {
logEntry.Errorf("out-of-cluster problem: %s", outOfClusterErr)
return outOfClusterErr
} else {
return fmt.Errorf("no kubernetes client config found")
}
}
configType = "in-cluster"
}
} else {
// use specific server to connect to API
config = &rest.Config{
Host: c.server,
}
configType = "in-cluster"
_ = rest.SetKubernetesDefaults(config)
defaultNs = "default"
configType = "server"
}

c.defaultNamespace = defaultNs
Expand Down