kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Vendor changes for v1.6.0-beta.2, external provisioner

pull/1314/head
Matt Rickard 2017-03-14 14:57:13 -07:00
parent 30f492d723
commit afd6b32915
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vendor/github.com/r2d4/external-storage/lib/controller/controller.go generated vendored
View File

@ -37,7 +37,7 @@ import (
core_v1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/pkg/apis/storage/v1beta1"
storage_v1 "k8s.io/client-go/pkg/apis/storage/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/record"
"k8s.io/kubernetes/pkg/util/goroutinemap"
@ -156,9 +156,9 @@ func NewProvisionController(
var eventRecorder record.EventRecorder
out, err := exec.Command("hostname").Output()
if err != nil {
eventRecorder = broadcaster.NewRecorder(v1.EventSource{Component: fmt.Sprintf("%s %s", provisionerName, string(identity))})
eventRecorder = broadcaster.NewRecorder(api.Scheme, v1.EventSource{Component: fmt.Sprintf("%s %s", provisionerName, string(identity))})
} else {
eventRecorder = broadcaster.NewRecorder(v1.EventSource{Component: fmt.Sprintf("%s %s %s", provisionerName, strings.TrimSpace(string(out)), string(identity))})
eventRecorder = broadcaster.NewRecorder(api.Scheme, v1.EventSource{Component: fmt.Sprintf("%s %s %s", provisionerName, strings.TrimSpace(string(out)), string(identity))})
}
gitVersion, _ := semver.Parse(serverGitVersion)
@ -236,7 +236,7 @@ func NewProvisionController(
controller.classes = cache.NewStore(cache.DeletionHandlingMetaNamespaceKeyFunc)
controller.classReflector = cache.NewReflector(
controller.classSource,
&v1beta1.StorageClass{},
&storage_v1.StorageClass{},
controller.classes,
resyncPeriod,
)
@ -539,7 +539,7 @@ func (ctrl *ProvisionController) provisionClaimOperation(claim *v1.PersistentVol
// Prepare a claimRef to the claim early (to fail before a volume is
// provisioned)
claimRef, err := v1.GetReference(claim)
claimRef, err := v1.GetReference(api.Scheme, claim)
if err != nil {
glog.Errorf("Unexpected error getting claim reference to claim %q: %v", claimToClaimKey(claim), err)
return nil
@ -841,7 +841,7 @@ func (ctrl *ProvisionController) scheduleOperation(operationName string, operati
}
}
func (ctrl *ProvisionController) getStorageClass(name string) (*v1beta1.StorageClass, error) {
func (ctrl *ProvisionController) getStorageClass(name string) (*storage_v1.StorageClass, error) {
classObj, found, err := ctrl.classes.GetByKey(name)
if err != nil {
return nil, fmt.Errorf("Error getting StorageClass %q: %v", name, err)
@ -853,7 +853,7 @@ func (ctrl *ProvisionController) getStorageClass(name string) (*v1beta1.StorageC
// found, it SHOULD report an error (by sending an event to the claim) and it
// SHOULD retry periodically with step i.
}
storageClass, ok := classObj.(*v1beta1.StorageClass)
storageClass, ok := classObj.(*storage_v1.StorageClass)
if !ok {
return nil, fmt.Errorf("Cannot convert object to StorageClass: %+v", classObj)
}
@ -882,12 +882,14 @@ func setAnnotation(obj *meta_v1.ObjectMeta, ann string, value string) {
// Request for `nil` class is interpreted as request for class "",
// i.e. for a classless PV.
func getClaimClass(claim *v1.PersistentVolumeClaim) string {
// TODO: change to PersistentVolumeClaim.Spec.Class value when this
// attribute is introduced.
if class, found := claim.Annotations[annClass]; found {
return class
}
if claim.Spec.StorageClassName != nil {
return *claim.Spec.StorageClassName
}
return ""
}