github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Fail early if driver cant get kubeclient

Browse Source 
Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal 2019-05-14 10:29:59 +05:30
parent 745f12837f
commit e47a7897ea
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/volume/glusterfs/glusterfs.go
View File

@ -809,6 +809,11 @@ func (p *glusterfsVolumeProvisioner) CreateVolume(gid int) (r *v1.GlusterfsPersi
customVolumeName := "" customVolumeName := ""
epServiceName := "" epServiceName := ""
kubeClient := p.plugin.host.GetKubeClient()
if kubeClient == nil {
return nil, 0, "", fmt.Errorf("failed to get kube client to update endpoint")
}
if len(p.provisionerConfig.customEpNamePrefix) == 0 { if len(p.provisionerConfig.customEpNamePrefix) == 0 {
epServiceName = string(p.options.PVC.UID) epServiceName = string(p.options.PVC.UID)
} else { } else {
@ -883,10 +888,6 @@ func (p *glusterfsVolumeProvisioner) CreateVolume(gid int) (r *v1.GlusterfsPersi
endpoint.Subsets[0].Addresses = addrlist endpoint.Subsets[0].Addresses = addrlist
endpoint.Subsets[0].Ports = ports endpoint.Subsets[0].Ports = ports
kubeClient := p.plugin.host.GetKubeClient()
if kubeClient == nil {
return nil, 0, "", fmt.Errorf("failed to get kube client to update endpoint")
}
_, err = kubeClient.CoreV1().Endpoints(epNamespace).Update(endpoint) _, err = kubeClient.CoreV1().Endpoints(epNamespace).Update(endpoint)
if err != nil { if err != nil {
deleteErr := cli.VolumeDelete(volume.Id) deleteErr := cli.VolumeDelete(volume.Id)
@ -897,6 +898,11 @@ func (p *glusterfsVolumeProvisioner) CreateVolume(gid int) (r *v1.GlusterfsPersi
klog.V(3).Infof("failed to update endpoint, deleting %s", endpoint) klog.V(3).Infof("failed to update endpoint, deleting %s", endpoint)
err = kubeClient.CoreV1().Services(epNamespace).Delete(epServiceName, nil) err = kubeClient.CoreV1().Services(epNamespace).Delete(epServiceName, nil)
if err != nil && errors.IsNotFound(err) {
klog.V(1).Infof("service %s does not exist in namespace %s", epServiceName, epNamespace)
err = nil
}
if err != nil { if err != nil {
klog.Errorf("failed to delete service %s/%s: %v", epNamespace, epServiceName, err) klog.Errorf("failed to delete service %s/%s: %v", epNamespace, epServiceName, err)
} }