Skip to content
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.

Sign up for GitHub

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

Credentials are not sent in DeleteVolume call (#53) #54

Merged
merged 1 commit into from
Mar 9, 2018
Merged

Credentials are not sent in DeleteVolume call (#53) #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 35 additions & 18 deletions pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package controller
import (
"context"
"fmt"
_ "k8s.io/apimachinery/pkg/util/json"
"net"
"strings"
"time"
Expand Down Expand Up @@ -198,25 +197,11 @@ func (p *csiProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis
capacity := options.PVC.Spec.Resources.Requests[v1.ResourceName(v1.ResourceStorage)]
volSizeBytes := capacity.Value()

controllerCreateSecrets := map[string]string{}
secret := v1.SecretReference{}
// get secrets if StorageClass specifies it
if sn, ok := options.Parameters[secretNameKey]; ok {
ns := "default"
if len(options.Parameters[secretNamespaceKey]) != 0 {
ns = options.Parameters[secretNamespaceKey]
}
controllerCreateSecrets = getCredentialsFromSecret(p.client, sn, ns)
secret.Name = sn
secret.Namespace = ns
}

// Create a CSI CreateVolumeRequest
req := csi.CreateVolumeRequest{

Name: share,
Parameters: options.Parameters,
ControllerCreateSecrets: controllerCreateSecrets,
Name: share,
Parameters: options.Parameters,
VolumeCapabilities: []*csi.VolumeCapability{
{
AccessType: accessType,
Expand All @@ -228,6 +213,11 @@ func (p *csiProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis
LimitBytes: int64(volSizeBytes),
},
}
secret := v1.SecretReference{}
if options.Parameters != nil {
req.ControllerCreateSecrets = getCredentialsFromParameters(p.client, options.Parameters)
secret.Name, secret.Namespace, _ = getSecretAndNamespaceFromParameters(options.Parameters)
}
ctx, cancel := context.WithTimeout(context.Background(), p.timeout)
defer cancel()

Expand Down Expand Up @@ -262,7 +252,6 @@ func (p *csiProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis
},
},
}

if len(secret.Name) != 0 {
pv.Spec.PersistentVolumeSource.CSI.NodePublishSecretRef = &secret
}
Expand All @@ -276,16 +265,44 @@ func (p *csiProvisioner) Delete(volume *v1.PersistentVolume) error {
return fmt.Errorf("invalid CSI PV")
}
volumeId := p.volumeHandleToId(volume.Spec.CSI.VolumeHandle)

req := csi.DeleteVolumeRequest{
VolumeId: volumeId,
}
// get secrets if StorageClass specifies it
storageClassName := volume.Spec.StorageClassName
if len(storageClassName) != 0 {
if storageClass, err := p.client.StorageV1().StorageClasses().Get(storageClassName, metav1.GetOptions{}); err == nil {
req.ControllerDeleteSecrets = getCredentialsFromParameters(p.client, storageClass.Parameters)
}

}
ctx, cancel := context.WithTimeout(context.Background(), p.timeout)
defer cancel()

_, err := p.csiClient.DeleteVolume(ctx, &req)

return err
}

func getSecretAndNamespaceFromParameters(parameters map[string]string) (string, string, bool) {
if secretName, ok := parameters[secretNameKey]; ok {
namespace := "default"
if len(parameters[secretNamespaceKey]) != 0 {
namespace = parameters[secretNamespaceKey]
}
return secretName, namespace, true
}
return "", "", false
}

func getCredentialsFromParameters(k8s kubernetes.Interface, parameters map[string]string) map[string]string {
if secretName, namespace, found := getSecretAndNamespaceFromParameters(parameters); found {
return getCredentialsFromSecret(k8s, secretName, namespace)
}
return map[string]string{}
}

//TODO use a unique volume handle from and to Id
func (p *csiProvisioner) volumeIdToHandle(id string) string {
return id
Expand Down