Skip to content

K
k3s
Commit bac22911 authored by Mike Fedosin's avatar Mike Fedosin
Browse files
Options

Allow to define kubeconfig file for OpenStack cloud provider

Now, to build a kubernetes client, provider uses only in-cluster config, but if kubelet is not running as a pod, then it doesn't work. This commit adds an ability to specify a path to the kubeconfig file if necessary. If no value was provided, then the provider falls back to in-cluster config.
parent 7a8e11c1
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
pkg/cloudprovider/providers/openstack/openstack.go
View file @ bac22911
......@@ -161,6 +161,7 @@ type Config struct {
CAFile string `gcfg:"ca-file"`
SecretName string `gcfg:"secret-name"`
SecretNamespace string `gcfg:"secret-namespace"`
KubeconfigPath string `gcfg:"kubeconfig-path"`
}
LoadBalancer LoadBalancerOpts
BlockStorage BlockStorageOpts
......@@ -238,6 +239,7 @@ func configFromEnv() (cfg Config, ok bool) {
cfg.Global.SecretName = os.Getenv("SECRET_NAME")
cfg.Global.SecretNamespace = os.Getenv("SECRET_NAMESPACE")
cfg.Global.KubeconfigPath = os.Getenv("KUBECONFIG_PATH")
ok = cfg.Global.AuthURL != "" &&
cfg.Global.Username != "" &&
......@@ -253,11 +255,10 @@ func configFromEnv() (cfg Config, ok bool) {
return
}
func createKubernetesClient() (*kubernetes.Clientset, error) {
func createKubernetesClient(kubeconfigPath string) (*kubernetes.Clientset, error) {
klog.Info("Creating kubernetes API client.")
// create in-cluster config
cfg, err := clientcmd.BuildConfigFromFlags("", "")
cfg, err := clientcmd.BuildConfigFromFlags("", kubeconfigPath)
if err != nil {
return nil, err
}
......@@ -280,8 +281,9 @@ func createKubernetesClient() (*kubernetes.Clientset, error) {
func setConfigFromSecret(cfg *Config) error {
secretName := cfg.Global.SecretName
secretNamespace := cfg.Global.SecretNamespace
kubeconfigPath := cfg.Global.KubeconfigPath
k8sClient, err := createKubernetesClient()
k8sClient, err := createKubernetesClient(kubeconfigPath)
if err != nil {
return fmt.Errorf("failed to get kubernetes client: %v", err)
}
......
pkg/volume/cinder/cinder_test.go
View file @ bac22911
......@@ -317,6 +317,7 @@ func getOpenstackConfig() openstack.Config {
CAFile string `gcfg:"ca-file"`
SecretName string `gcfg:"secret-name"`
SecretNamespace string `gcfg:"secret-namespace"`
KubeconfigPath string `gcfg:"kubeconfig-path"`
}{
Username: "user",
Password: "pass",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment