public_git
/
kubernetes-sigs_nfs-subdir-external-provisioner
mirror of https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into Update-path-creation-and-save-data-after-removing-PV

This commit is contained in:
Hanna Bledai 2020-10-20 10:18:50 +03:00 committed by GitHub
parent 1d8c18e11c a8ea0c5cae
commit 9c630ed0e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/nfs-subdir-external-provisioner/provisioner.go
View File

@ -28,12 +28,14 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
storage "k8s.io/api/storage/v1" storage "k8s.io/api/storage/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/apis/core/v1/helper"
"k8s.io/client-go/tools/clientcmd"
"sigs.k8s.io/sig-storage-lib-external-provisioner/controller" "sigs.k8s.io/sig-storage-lib-external-provisioner/controller"
) )
@ -214,13 +216,25 @@ func main() {
if provisionerName == "" { if provisionerName == "" {
glog.Fatalf("environment variable %s is not set! Please set it.", provisionerNameKey) glog.Fatalf("environment variable %s is not set! Please set it.", provisionerNameKey)
} }
kubeconfig := os.Getenv("KUBECONFIG")
var config *rest.Config
if kubeconfig != "" {
// Create an OutOfClusterConfig and use it to create a client for the controller
// to use to communicate with Kubernetes
var err error
config, err = clientcmd.BuildConfigFromFlags("", kubeconfig)
if err != nil {
glog.Fatalf("Failed to create kubeconfig: %v", err)
}
} else {
// Create an InClusterConfig and use it to create a client for the controller // Create an InClusterConfig and use it to create a client for the controller
// to use to communicate with Kubernetes // to use to communicate with Kubernetes
config, err := rest.InClusterConfig() var err error
config, err = rest.InClusterConfig()
if err != nil { if err != nil {
glog.Fatalf("Failed to create config: %v", err) glog.Fatalf("Failed to create config: %v", err)
} }
}
clientset, err := kubernetes.NewForConfig(config) clientset, err := kubernetes.NewForConfig(config)
if err != nil { if err != nil {
glog.Fatalf("Failed to create client: %v", err) glog.Fatalf("Failed to create client: %v", err)