refactor(nfs,provisioning): move claimPath info from annotation to parameters

Signed-off-by: Ashish Ranjan <ashishranjan738@gmail.com>

This commit moves claimPath information from annotation to parameters and adds option to enable/disable storageclass creation.
This commit is contained in:
Ashish Ranjan committed 2019-04-26 04:25:49 +05:30
1 parent 23efbf658b
commit 9f3debc53f
9 files changed
+69 -33

No files matched your search

Generated
+26
View File
@@ -438,6 +438,30 @@
revision = "adf5a7427709b9deb95d29d3fa8a2bf9cfd388f1"
version = "v1.2"
[[projects]]
branch = "master"
digest = "1:3bf17a6e6eaa6ad24152148a631d18662f7212e21637c2699bff3369b7f00fa2"
name = "github.com/petar/GoLLRB"
packages = ["llrb"]
pruneopts = "UT"
revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"
[[projects]]
digest = "1:0e7775ebbcf00d8dd28ac663614af924411c868dca3d5aa762af0fae3808d852"
name = "github.com/peterbourgon/diskv"
packages = ["."]
pruneopts = "UT"
revision = "5f041e8faa004a95c88a202771f4cc3e991971e6"
version = "v2.0.1"
[[projects]]
digest = "1:cf31692c14422fa27c83a05292eb5cbe0fb2775972e8f1f8446a71549bd8980b"
name = "github.com/pkg/errors"
packages = ["."]
pruneopts = "UT"
revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4"
version = "v0.8.1"
[[projects]]
digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe"
name = "github.com/pmezard/go-difflib"
@@ -1367,6 +1391,8 @@
"github.com/google/uuid",
"github.com/icrowley/fake",
"github.com/jbw976/go-ps",
"github.com/kubernetes-sigs/sig-storage-lib-external-provisioner/controller",
"github.com/pkg/errors",
"github.com/rook/operator-kit",
"github.com/spf13/cobra",
"github.com/spf13/pflag",
+2 -1
View File
@@ -87,7 +87,8 @@ spec:
serviceAccountName: rook-nfs
replicas: 1
exports:
- name: nfs-share
- name: share1
createStorageClass: true
server:
accessMode: ReadWrite
squash: "none"
@@ -95,6 +95,7 @@ spec:
containers:
- name: rook-nfs-operator
image: rook/nfs:master
imagePullPolicy: IfNotPresent
args: ["nfs", "operator"]
env:
- name: POD_NAME
+1 -2
View File
@@ -2,9 +2,8 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: rook-nfs-pv-claim
annotations:
volume.beta.kubernetes.io/storage-class: "nfs-share"
spec:
storageClassName: "rook-nfs-share1"
accessModes:
- ReadWriteMany
resources:
+3
View File
@@ -70,6 +70,9 @@ type ExportsSpec struct {
// The NFS server configuration
Server ServerSpec `json:"server,omitempty"`
// Configuration to create storageclass for nfs share
CreateStorageClass bool `json:"createStorageClass,omitempty"`
// PVC from which the NFS daemon gets storage for sharing
PersistentVolumeClaim v1.PersistentVolumeClaimVolumeSource `json:"persistentVolumeClaim,omitempty"`
}
+17 -15
View File
@@ -156,24 +156,26 @@ func createServicePorts() []v1.ServicePort {
func (c *Controller) createStorageClass(nfsServer *nfsServer) error {
for _, export := range nfsServer.spec.Exports {
nfsStorageClass := &storage.StorageClass{
ObjectMeta: metav1.ObjectMeta{
Name: export.Name,
Annotations: map[string]string{
"rook.io/nfs-path": "/" + export.PersistentVolumeClaim.ClaimName,
if export.CreateStorageClass {
nfsStorageClass := &storage.StorageClass{
ObjectMeta: metav1.ObjectMeta{
Name: nfsServer.name + "-" + export.Name,
OwnerReferences: []metav1.OwnerReference{nfsServer.ownerRef},
Labels: createAppLabels(nfsServer),
},
OwnerReferences: []metav1.OwnerReference{nfsServer.ownerRef},
Labels: createAppLabels(nfsServer),
},
Provisioner: "rook.io/" + nfsServer.name,
}
if _, err := c.context.Clientset.StorageV1().StorageClasses().Create(nfsStorageClass); err != nil {
if !errors.IsAlreadyExists(err) {
return err
Provisioner: "rook.io/" + nfsServer.name,
Parameters: map[string]string{"claimPath": "/" + export.PersistentVolumeClaim.ClaimName},
}
if _, err := c.context.Clientset.StorageV1().StorageClasses().Create(nfsStorageClass); err != nil {
if !errors.IsAlreadyExists(err) {
return err
}
logger.Infof("storage class %s already exists", nfsStorageClass.GetName())
} else {
logger.Infof("storage class %s created", nfsStorageClass.GetName())
}
logger.Infof("storage class %s already exists", nfsStorageClass.GetName())
} else {
logger.Infof("storage class %s created", nfsStorageClass.GetName())
logger.Infof("default storage class creation disabled for share: %v", export.Name)
}
}
return nil
+1 -1
View File
@@ -92,7 +92,7 @@ func TestOnAdd(t *testing.T) {
namespace := "rook-nfs-test"
nfsserver := &nfsv1alpha1.NFSServer{
ObjectMeta: metav1.ObjectMeta{
Name: "nfs-server-X",
Name: appName,
Namespace: namespace,
},
Spec: nfsv1alpha1.NFSServerSpec{
+14 -12
View File
@@ -18,8 +18,10 @@ package nfs
import (
"fmt"
"strings"
"github.com/kubernetes-sigs/sig-storage-lib-external-provisioner/controller"
"github.com/pkg/errors"
v1 "k8s.io/api/core/v1"
storage "k8s.io/api/storage/v1"
"k8s.io/client-go/kubernetes"
@@ -33,18 +35,14 @@ type nfsProvisioner struct {
server string
}
const (
claimPath = "rook.io/nfs-path"
)
var _ controller.Provisioner = &nfsProvisioner{}
// NewNFSProvisioner returns an instance of nfsProvisioner
func NewNFSProvisioner(clientset kubernetes.Interface, server string) nfsProvisioner {
return nfsProvisioner{clientset, server}
func NewNFSProvisioner(clientset kubernetes.Interface, server string) *nfsProvisioner {
return &nfsProvisioner{clientset, server}
}
func (p nfsProvisioner) Provision(options controller.VolumeOptions) (*v1.PersistentVolume, error) {
func (p *nfsProvisioner) Provision(options controller.VolumeOptions) (*v1.PersistentVolume, error) {
logger.Infof("nfs provisioner: VolumeOptions %v", options)
// Get the storage class for this volume.
@@ -57,6 +55,11 @@ func (p nfsProvisioner) Provision(options controller.VolumeOptions) (*v1.Persist
return nil, fmt.Errorf("claim Selector is not supported")
}
claimPath, present := storageClass.Parameters["claimPath"]
if !present {
return nil, errors.Errorf("NFS share Path not found in the storageclass: %v", storageClass.GetName())
}
pv := &v1.PersistentVolume{
ObjectMeta: metav1.ObjectMeta{
Name: options.PVName,
@@ -71,22 +74,21 @@ func (p nfsProvisioner) Provision(options controller.VolumeOptions) (*v1.Persist
PersistentVolumeSource: v1.PersistentVolumeSource{
NFS: &v1.NFSVolumeSource{
Server: p.server,
Path: storageClass.GetAnnotations()[claimPath],
Path: strings.TrimSpace(claimPath),
ReadOnly: false,
},
},
},
}
return pv, nil
}
func (p nfsProvisioner) Delete(volume *v1.PersistentVolume) error {
func (p *nfsProvisioner) Delete(volume *v1.PersistentVolume) error {
return nil
}
// getClassForPV returns StorageClass
func (p nfsProvisioner) getClassForPV(pv *v1.PersistentVolume) (*storage.StorageClass, error) {
func (p *nfsProvisioner) getClassForPV(pv *v1.PersistentVolume) (*storage.StorageClass, error) {
if p.client == nil {
return nil, fmt.Errorf("Cannot get kube client")
}
@@ -102,7 +104,7 @@ func (p nfsProvisioner) getClassForPV(pv *v1.PersistentVolume) (*storage.Storage
}
// getClassForPVC returns StorageClass
func (p nfsProvisioner) getClassForPVC(pvc *v1.PersistentVolumeClaim) (*storage.StorageClass, error) {
func (p *nfsProvisioner) getClassForPVC(pvc *v1.PersistentVolumeClaim) (*storage.StorageClass, error) {
if p.client == nil {
return nil, fmt.Errorf("Cannot get kube client")
}
+4 -2
View File
@@ -185,7 +185,7 @@ kind: PersistentVolumeClaim
metadata:
name: nfs-pv-claim
spec:
storageClassName: nfs-share
storageClassName: nfs-ns-nfs-share
accessModes:
- ReadWriteMany
resources:
@@ -197,7 +197,7 @@ kind: PersistentVolumeClaim
metadata:
name: nfs-pv-claim-bigger
spec:
storageClassName: nfs-share1
storageClassName: nfs-ns-nfs-share1
accessModes:
- ReadWriteMany
resources:
@@ -306,12 +306,14 @@ spec:
replicas: ` + strconv.Itoa(count) + `
exports:
- name: nfs-share
createStorageClass: true
server:
accessMode: ReadWrite
squash: "none"
persistentVolumeClaim:
claimName: test-claim
- name: nfs-share1
createStorageClass: true
server:
accessMode: ReadWrite
squash: "none"