nfs: nfs provisioner controlled by operator

Signed-off-by: Ahmad Nurus S <prksu.sh@gmail.com>
This commit is contained in:
Ahmad Nurus S committed 2020-07-27 12:24:32 +07:00
1 parent 907c8bf85f
commit 45f0debd00
10 files changed
+424 -249

No files matched your search

+54
View File
@@ -9,6 +9,60 @@ metadata:
name: rook-nfs-server
namespace: rook-nfs
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: rook-nfs-provisioner
namespace: rook-nfs
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: rook-nfs-provisioner-runner
rules:
- apiGroups: [""]
resources: ["persistentvolumes"]
verbs: ["get", "list", "watch", "create", "delete"]
- apiGroups: [""]
resources: ["persistentvolumeclaims"]
verbs: ["get", "list", "watch", "update"]
- apiGroups: ["storage.k8s.io"]
resources: ["storageclasses"]
verbs: ["get", "list", "watch"]
- apiGroups: [""]
resources: ["events"]
verbs: ["create", "update", "patch"]
- apiGroups: [""]
resources: ["services", "endpoints"]
verbs: ["get"]
- apiGroups: ["extensions"]
resources: ["podsecuritypolicies"]
resourceNames: ["nfs-provisioner"]
verbs: ["use"]
- apiGroups: [""]
resources: ["endpoints"]
verbs: ["get", "list", "watch", "create", "update", "patch"]
- apiGroups:
- nfs.rook.io
resources:
- "*"
verbs:
- "*"
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: run-nfs-provisioner
subjects:
- kind: ServiceAccount
name: rook-nfs-provisioner
# replace with namespace where provisioner is deployed
namespace: rook-nfs
roleRef:
kind: ClusterRole
name: rook-nfs-provisioner-runner
apiGroup: rbac.authorization.k8s.io
---
# A default storageclass must be present
apiVersion: v1
kind: PersistentVolumeClaim
@@ -67,6 +67,7 @@ rules:
- apiGroups:
- apps
resources:
- deployments
- statefulsets
verbs:
- create
@@ -1,86 +0,0 @@
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: rook-nfs-provisioner-runner
rules:
- apiGroups: [""]
resources: ["persistentvolumes"]
verbs: ["get", "list", "watch", "create", "delete"]
- apiGroups: [""]
resources: ["persistentvolumeclaims"]
verbs: ["get", "list", "watch", "update"]
- apiGroups: ["storage.k8s.io"]
resources: ["storageclasses"]
verbs: ["get", "list", "watch"]
- apiGroups: [""]
resources: ["events"]
verbs: ["create", "update", "patch"]
- apiGroups: [""]
resources: ["services", "endpoints"]
verbs: ["get"]
- apiGroups: ["extensions"]
resources: ["podsecuritypolicies"]
resourceNames: ["nfs-provisioner"]
verbs: ["use"]
- apiGroups: [""]
resources: ["endpoints"]
verbs: ["get", "list", "watch", "create", "update", "patch"]
- apiGroups:
- nfs.rook.io
resources:
- "*"
verbs:
- "*"
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: run-nfs-provisioner
subjects:
- kind: ServiceAccount
name: rook-nfs-provisioner
# replace with namespace where provisioner is deployed
namespace: rook-nfs-system
roleRef:
kind: ClusterRole
name: rook-nfs-provisioner-runner
apiGroup: rbac.authorization.k8s.io
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: rook-nfs-provisioner
namespace: rook-nfs-system
---
kind: Deployment
apiVersion: apps/v1
metadata:
name: rook-nfs-provisioner
namespace: rook-nfs-system
spec:
selector:
matchLabels:
app: rook-nfs-provisioner
replicas: 1
strategy:
type: Recreate
template:
metadata:
labels:
app: rook-nfs-provisioner
spec:
serviceAccount: rook-nfs-provisioner
containers:
- name: rook-nfs-provisioner
image: rook/nfs:master
imagePullPolicy: IfNotPresent
args: ["nfs", "provisioner","--provisioner=rook.io/nfs-provisioner"]
env:
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: POD_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
+1 -1
View File
@@ -8,6 +8,6 @@ parameters:
exportName: share1
nfsServerName: rook-nfs
nfsServerNamespace: rook-nfs
provisioner: rook.io/nfs-provisioner
provisioner: nfs.rook.io/rook-nfs-provisioner
reclaimPolicy: Delete
volumeBindingMode: Immediate
+74 -3
View File
@@ -19,6 +19,7 @@ package nfs
import (
"context"
"fmt"
"path/filepath"
"strings"
"time"
@@ -32,6 +33,7 @@ import (
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/record"
"k8s.io/utils/pointer"
ctrl "sigs.k8s.io/controller-runtime"
@@ -122,6 +124,12 @@ func (r *NFSServerReconciler) Reconcile(req ctrl.Request) (_ ctrl.Result, reterr
return reconcile.Result{}, err
}
if err := r.reconcileNFSProvisioner(ctx, instance); err != nil {
r.Recorder.Eventf(instance, corev1.EventTypeWarning, nfsv1alpha1.EventFailed, "Failed reconciling nfsprovisioner: %+v", err)
r.Log.Errorf("Error reconciling nfsprovisioner: %+v", err)
return reconcile.Result{}, err
}
// Reconcile status state based on statefulset ready replicas.
sts := &appsv1.StatefulSet{}
if err := r.Client.Get(ctx, req.NamespacedName, sts); err != nil {
@@ -158,8 +166,8 @@ func (r *NFSServerReconciler) reconcileNFSServerConfig(ctx context.Context, cr *
nfsGaneshaConfig := `
EXPORT {
Export_Id = ` + fmt.Sprintf("%v", id) + `;
Path = /` + claimName + `;
Pseudo = /` + claimName + `;
Path = ` + filepath.Join(mountPath, claimName) + `;
Pseudo = ` + filepath.Join(mountPath, claimName) + `;
Protocols = 4;
Transports = TCP;
Sectype = sys;
@@ -287,7 +295,7 @@ func (r *NFSServerReconciler) reconcileNFSServer(ctx context.Context, cr *nfsv1a
volumeMounts = append(volumeMounts, corev1.VolumeMount{
Name: shareName,
MountPath: "/" + claimName,
MountPath: filepath.Join(mountPath, claimName),
})
}
@@ -313,3 +321,66 @@ func (r *NFSServerReconciler) reconcileNFSServer(ctx context.Context, cr *nfsv1a
return nil
}
}
func (r *NFSServerReconciler) reconcileNFSProvisioner(ctx context.Context, cr *nfsv1alpha1.NFSServer) error {
nfsserversvc := &corev1.Service{}
if err := r.Client.Get(ctx, types.NamespacedName{Namespace: cr.Namespace, Name: cr.Name}, nfsserversvc); err != nil {
return err
}
dep := newDeploymentForNFSProvisioner(cr)
depop, err := controllerutil.CreateOrUpdate(ctx, r.Client, dep, func() error {
if dep.ObjectMeta.CreationTimestamp.IsZero() {
dep.Spec.Selector = &metav1.LabelSelector{
MatchLabels: newLabels(cr),
}
}
if err := controllerutil.SetControllerReference(cr, dep, r.Scheme); err != nil {
return err
}
var volumes []corev1.Volume
var volumeMounts []corev1.VolumeMount
for _, export := range cr.Spec.Exports {
shareName := export.Name
claimName := export.PersistentVolumeClaim.ClaimName
volumes = append(volumes, corev1.Volume{
Name: shareName,
VolumeSource: corev1.VolumeSource{
NFS: &corev1.NFSVolumeSource{
Server: nfsserversvc.Spec.ClusterIP,
Path: filepath.Join(mountPath, claimName),
},
},
})
volumeMounts = append(volumeMounts, corev1.VolumeMount{
Name: shareName,
MountPath: filepath.Join(mountPath, claimName),
})
}
dep.Spec.Template.Spec.Containers[0].VolumeMounts = volumeMounts
dep.Spec.Template.Spec.Volumes = volumes
return nil
})
if err != nil {
return err
}
r.Log.Info("Reconciling NFSProvisioner Deployment", "Operation.Result ", depop)
switch depop {
case controllerutil.OperationResultCreated:
r.Recorder.Eventf(cr, corev1.EventTypeNormal, nfsv1alpha1.EventCreated, "%s nfs-provisioner deployment: %s", strings.Title(string(depop)), dep.Name)
return nil
case controllerutil.OperationResultUpdated:
r.Recorder.Eventf(cr, corev1.EventTypeNormal, nfsv1alpha1.EventUpdated, "%s nfs-provisioner deployment: %s", strings.Title(string(depop)), dep.Name)
return nil
default:
return nil
}
}
+91 -3
View File
@@ -17,12 +17,15 @@ limitations under the License.
package nfs
import (
"context"
"path/filepath"
"reflect"
"testing"
nfsv1alpha1 "github.com/rook/rook/pkg/apis/nfs.rook.io/v1alpha1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
@@ -30,6 +33,7 @@ import (
"k8s.io/client-go/tools/record"
"k8s.io/utils/pointer"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -92,7 +96,7 @@ func (r *resource) Generate() *nfsv1alpha1.NFSServer {
}
func TestNFSServerReconciler_Reconcile(t *testing.T) {
expectedStatefulSet := func(scheme *runtime.Scheme, cr *nfsv1alpha1.NFSServer) *appsv1.StatefulSet {
expectedServerFunc := func(scheme *runtime.Scheme, cr *nfsv1alpha1.NFSServer) *appsv1.StatefulSet {
sts := newStatefulSetForNFSServer(cr)
sts.Spec.Selector = &metav1.LabelSelector{
MatchLabels: newLabels(cr),
@@ -137,7 +141,7 @@ func TestNFSServerReconciler_Reconcile(t *testing.T) {
volumeMounts = append(volumeMounts, corev1.VolumeMount{
Name: shareName,
MountPath: "/" + claimName,
MountPath: filepath.Join(mountPath, claimName),
})
}
sts.Status.ReadyReplicas = int32(cr.Spec.Replicas)
@@ -147,6 +151,48 @@ func TestNFSServerReconciler_Reconcile(t *testing.T) {
return sts
}
expectedServerServiceFunc := func(scheme *runtime.Scheme, cr *nfsv1alpha1.NFSServer) *corev1.Service {
svc := newServiceForNFSServer(cr)
_ = controllerutil.SetControllerReference(cr, svc, scheme)
return svc
}
expectedProvisionerFunc := func(scheme *runtime.Scheme, cr *nfsv1alpha1.NFSServer) *appsv1.Deployment {
dep := newDeploymentForNFSProvisioner(cr)
dep.Spec.Selector = &metav1.LabelSelector{
MatchLabels: newLabels(cr),
}
_ = controllerutil.SetControllerReference(cr, dep, scheme)
var volumes []corev1.Volume
var volumeMounts []corev1.VolumeMount
for _, export := range cr.Spec.Exports {
shareName := export.Name
claimName := export.PersistentVolumeClaim.ClaimName
volumes = append(volumes, v1.Volume{
Name: shareName,
VolumeSource: v1.VolumeSource{
NFS: &v1.NFSVolumeSource{
Server: expectedServerServiceFunc(scheme, cr).Spec.ClusterIP,
Path: filepath.Join(mountPath, claimName),
},
},
})
volumeMounts = append(volumeMounts, v1.VolumeMount{
Name: shareName,
MountPath: filepath.Join(mountPath, claimName),
})
}
dep.Status.ReadyReplicas = int32(cr.Spec.Replicas)
dep.Spec.Template.Spec.Volumes = volumes
dep.Spec.Template.Spec.Containers[0].VolumeMounts = volumeMounts
return dep
}
rr := reconcile.Request{
NamespacedName: types.NamespacedName{
Name: "nfs-server",
@@ -208,11 +254,21 @@ func TestNFSServerReconciler_Reconcile(t *testing.T) {
scheme := clientgoscheme.Scheme
scheme.AddKnownTypes(nfsv1alpha1.SchemeGroupVersion, tt.cr)
expectedServer := expectedServerFunc(scheme, tt.cr)
expectedServerService := expectedServerServiceFunc(scheme, tt.cr)
expectedProvisioner := expectedProvisionerFunc(scheme, tt.cr)
objs := []runtime.Object{
tt.cr,
expectedStatefulSet(scheme, tt.cr),
expectedServer,
expectedServerService,
expectedProvisioner,
}
expectedServer.GetObjectKind().SetGroupVersionKind(appsv1.SchemeGroupVersion.WithKind("StatefulSet"))
expectedServerService.GetObjectKind().SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("Service"))
expectedProvisioner.GetObjectKind().SetGroupVersionKind(appsv1.SchemeGroupVersion.WithKind("Deployment"))
fc := fake.NewFakeClient(objs...)
fr := record.NewFakeRecorder(2)
@@ -230,6 +286,38 @@ func TestNFSServerReconciler_Reconcile(t *testing.T) {
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("NFSServerReconciler.Reconcile() = %v, want %v", got, tt.want)
}
gotServer := &appsv1.StatefulSet{}
if err := fc.Get(context.Background(), tt.args.req.NamespacedName, gotServer); err != nil {
t.Errorf("NFSServerReconciler.Reconcile() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(gotServer, expectedServer) {
t.Errorf("NFSServerReconciler.Reconcile() = %v, want %v", gotServer, expectedServer)
}
gotServerService := &corev1.Service{}
if err := fc.Get(context.Background(), tt.args.req.NamespacedName, gotServerService); err != nil {
t.Errorf("NFSServerReconciler.Reconcile() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(gotServerService, expectedServerService) {
t.Errorf("NFSServerReconciler.Reconcile() = %v, want %v", gotServerService, expectedServerService)
}
gotProvisioner := &appsv1.Deployment{}
provisionerObjKey := client.ObjectKey{
Name: tt.args.req.Name + "-provisioner",
Namespace: tt.args.req.Namespace,
}
if err := fc.Get(context.Background(), provisionerObjKey, gotProvisioner); err != nil {
t.Errorf("NFSServerReconciler.Reconcile() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(gotProvisioner, expectedProvisioner) {
t.Errorf("NFSServerReconciler.Reconcile() = %v, want %v", gotProvisioner, expectedProvisioner)
}
})
}
}
+104 -66
View File
@@ -18,11 +18,14 @@ package nfs
import (
"fmt"
"os"
"path/filepath"
"strings"
"github.com/pkg/errors"
rookclient "github.com/rook/rook/pkg/client/clientset/versioned"
v1 "k8s.io/api/core/v1"
storage "k8s.io/api/storage/v1"
storagev1 "k8s.io/api/storage/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/pkg/apis/core/v1/helper"
"sigs.k8s.io/sig-storage-lib-external-provisioner/controller"
@@ -30,50 +33,74 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
type nfsProvisioner struct {
const (
mountPath = "/export"
)
type Provisioner struct {
client kubernetes.Interface
rookClient rookclient.Interface
}
var _ controller.Provisioner = &nfsProvisioner{}
var _ controller.Provisioner = &Provisioner{}
// NewNFSProvisioner returns an instance of nfsProvisioner
func NewNFSProvisioner(clientset kubernetes.Interface, rookClientset rookclient.Interface) *nfsProvisioner {
return &nfsProvisioner{clientset, rookClientset}
func NewNFSProvisioner(clientset kubernetes.Interface, rookClientset rookclient.Interface) *Provisioner {
return &Provisioner{clientset, rookClientset}
}
func (p *nfsProvisioner) Provision(options controller.ProvisionOptions) (*v1.PersistentVolume, error) {
func (p *Provisioner) Provision(options controller.ProvisionOptions) (*v1.PersistentVolume, error) {
logger.Infof("nfs provisioner: ProvisionOptions %v", options)
// Get the storage class for this volume.
storageClass, err := p.getClassForPVC(options.PVC)
if err != nil {
return nil, err
}
if options.PVC.Spec.Selector != nil {
return nil, fmt.Errorf("claim Selector is not supported")
}
nfsServerName, present := storageClass.Parameters["nfsServerName"]
if !present {
return nil, errors.Errorf("NFS share Path not found in the storageclass: %v", storageClass.GetName())
}
nfsNamespace, present := storageClass.Parameters["nfsServerNamespace"]
if !present {
return nil, errors.Errorf("NFS share Path not found in the storageclass: %v", storageClass.GetName())
}
exportName, present := storageClass.Parameters["exportName"]
if !present {
return nil, errors.Errorf("NFS share Path not found in the storageclass: %v", storageClass.GetName())
}
nfsVolumeSource, err := p.getNFSVolumeSource(nfsServerName, nfsNamespace, exportName)
sc, err := p.storageClassForPVC(options.PVC)
if err != nil {
return nil, err
}
serverName, present := sc.Parameters["nfsServerName"]
if !present {
return nil, errors.Errorf("NFS share Path not found in the storageclass: %v", sc.GetName())
}
serverNamespace, present := sc.Parameters["nfsServerNamespace"]
if !present {
return nil, errors.Errorf("NFS share Path not found in the storageclass: %v", sc.GetName())
}
exportName, present := sc.Parameters["exportName"]
if !present {
return nil, errors.Errorf("NFS share Path not found in the storageclass: %v", sc.GetName())
}
nfsserver, err := p.rookClient.NfsV1alpha1().NFSServers(serverNamespace).Get(serverName, metav1.GetOptions{})
if err != nil {
return nil, err
}
nfsserversvc, err := p.client.CoreV1().Services(serverNamespace).Get(serverName, metav1.GetOptions{})
if err != nil {
return nil, err
}
var exportPath string
for _, export := range nfsserver.Spec.Exports {
if export.Name == exportName {
exportPath = filepath.Join(mountPath, export.PersistentVolumeClaim.ClaimName)
}
}
pvName := strings.Join([]string{options.PVC.Namespace, options.PVC.Name, options.PVName}, "-")
fullPath := filepath.Join(exportPath, pvName)
if err := os.MkdirAll(fullPath, 0777); err != nil {
return nil, errors.New("unable to create directory to provision new pv: " + err.Error())
}
_ = os.Chmod(fullPath, 0777)
pv := &v1.PersistentVolume{
ObjectMeta: metav1.ObjectMeta{
Name: options.PVName,
@@ -86,19 +113,59 @@ func (p *nfsProvisioner) Provision(options controller.ProvisionOptions) (*v1.Per
v1.ResourceName(v1.ResourceStorage): options.PVC.Spec.Resources.Requests[v1.ResourceName(v1.ResourceStorage)],
},
PersistentVolumeSource: v1.PersistentVolumeSource{
NFS: nfsVolumeSource,
NFS: &v1.NFSVolumeSource{
Server: nfsserversvc.Spec.ClusterIP,
Path: "/" + fullPath,
ReadOnly: false,
},
},
},
}
return pv, nil
}
func (p *nfsProvisioner) Delete(volume *v1.PersistentVolume) error {
return nil
func (p *Provisioner) Delete(volume *v1.PersistentVolume) error {
path := volume.Spec.PersistentVolumeSource.NFS.Path
pvName := filepath.Base(path)
sc, err := p.storageClassForPV(volume)
if err != nil {
return err
}
serverName, present := sc.Parameters["nfsServerName"]
if !present {
return errors.Errorf("NFS share Path not found in the storageclass: %v", sc.GetName())
}
serverNamespace, present := sc.Parameters["nfsServerNamespace"]
if !present {
return errors.Errorf("NFS share Path not found in the storageclass: %v", sc.GetName())
}
exportName, present := sc.Parameters["exportName"]
if !present {
return errors.Errorf("NFS share Path not found in the storageclass: %v", sc.GetName())
}
nfsserver, err := p.rookClient.NfsV1alpha1().NFSServers(serverNamespace).Get(serverName, metav1.GetOptions{})
if err != nil {
return err
}
var exportPath string
for _, export := range nfsserver.Spec.Exports {
if export.Name == exportName {
exportPath = filepath.Join(mountPath, export.PersistentVolumeClaim.ClaimName)
}
}
fullPath := filepath.Join(exportPath, pvName)
return os.RemoveAll(fullPath)
}
// getClassForPV returns StorageClass
func (p *nfsProvisioner) getClassForPV(pv *v1.PersistentVolume) (*storage.StorageClass, error) {
func (p *Provisioner) storageClassForPV(pv *v1.PersistentVolume) (*storagev1.StorageClass, error) {
if p.client == nil {
return nil, fmt.Errorf("Cannot get kube client")
}
@@ -106,15 +173,11 @@ func (p *nfsProvisioner) getClassForPV(pv *v1.PersistentVolume) (*storage.Storag
if className == "" {
return nil, fmt.Errorf("Volume has no storage class")
}
class, err := p.client.StorageV1().StorageClasses().Get(className, metav1.GetOptions{})
if err != nil {
return nil, err
}
return class, nil
return p.client.StorageV1().StorageClasses().Get(className, metav1.GetOptions{})
}
// getClassForPVC returns StorageClass
func (p *nfsProvisioner) getClassForPVC(pvc *v1.PersistentVolumeClaim) (*storage.StorageClass, error) {
func (p *Provisioner) storageClassForPVC(pvc *v1.PersistentVolumeClaim) (*storagev1.StorageClass, error) {
if p.client == nil {
return nil, fmt.Errorf("Cannot get kube client")
}
@@ -122,31 +185,6 @@ func (p *nfsProvisioner) getClassForPVC(pvc *v1.PersistentVolumeClaim) (*storage
if className == "" {
return nil, fmt.Errorf("Volume has no storage class")
}
class, err := p.client.StorageV1().StorageClasses().Get(className, metav1.GetOptions{})
if err != nil {
return nil, err
}
return class, nil
}
// getNFSVolumeSource returns the nfs source configuration for the pv
func (p *nfsProvisioner) getNFSVolumeSource(nfsServerName, namespace, exportName string) (*v1.NFSVolumeSource, error) {
nfsServer, err := p.rookClient.NfsV1alpha1().NFSServers(namespace).Get(nfsServerName, metav1.GetOptions{})
if err != nil {
return nil, err
}
nfsService, err := p.client.CoreV1().Services(namespace).Get(nfsServerName, metav1.GetOptions{})
if err != nil {
return nil, err
}
for _, export := range nfsServer.Spec.Exports {
if export.Name == exportName {
return &v1.NFSVolumeSource{
ReadOnly: false,
Server: nfsService.Spec.ClusterIP,
Path: "/" + export.PersistentVolumeClaim.ClaimName,
}, nil
}
}
return nil, errors.Errorf("exportName not Found")
return p.client.StorageV1().StorageClasses().Get(className, metav1.GetOptions{})
}
+42
View File
@@ -116,3 +116,45 @@ func newStatefulSetForNFSServer(cr *nfsv1alpha1.NFSServer) *appsv1.StatefulSet {
},
}
}
func newDeploymentForNFSProvisioner(cr *nfsv1alpha1.NFSServer) *appsv1.Deployment {
name := cr.Name + "-provisioner"
provisionerName := "nfs.rook.io/" + name
replicas := int32(1)
defaultTerminationGracePeriodSeconds := int64(30)
return &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: cr.Namespace,
Labels: newLabels(cr),
},
Spec: appsv1.DeploymentSpec{
Replicas: &replicas,
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Name: cr.Name,
Namespace: cr.Namespace,
Labels: newLabels(cr),
},
Spec: corev1.PodSpec{
ServiceAccountName: "rook-nfs-provisioner",
Containers: []corev1.Container{
{
Name: name,
Image: "rook/nfs:master",
ImagePullPolicy: corev1.PullIfNotPresent,
Args: []string{"nfs", "provisioner", "--provisioner=" + provisionerName},
TerminationMessagePath: "/dev/termination-log",
TerminationMessagePolicy: corev1.TerminationMessageReadFile,
},
},
RestartPolicy: corev1.RestartPolicyAlways,
TerminationGracePeriodSeconds: &defaultTerminationGracePeriodSeconds,
DNSPolicy: corev1.DNSClusterFirst,
SecurityContext: &corev1.PodSecurityContext{},
SchedulerName: corev1.DefaultSchedulerName,
},
},
},
}
}
+56 -89
View File
@@ -240,6 +240,7 @@ rules:
- apiGroups:
- apps
resources:
- deployments
- statefulsets
verbs:
- create
@@ -320,93 +321,6 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: rook-nfs-provisioner-runner
rules:
- apiGroups: [""]
resources: ["persistentvolumes"]
verbs: ["get", "list", "watch", "create", "delete"]
- apiGroups: [""]
resources: ["persistentvolumeclaims"]
verbs: ["get", "list", "watch", "update"]
- apiGroups: ["storage.k8s.io"]
resources: ["storageclasses"]
verbs: ["get", "list", "watch"]
- apiGroups: [""]
resources: ["events"]
verbs: ["create", "update", "patch"]
- apiGroups: [""]
resources: ["services", "endpoints"]
verbs: ["get"]
- apiGroups: ["extensions"]
resources: ["podsecuritypolicies"]
resourceNames: ["nfs-provisioner"]
verbs: ["use"]
- apiGroups: [""]
resources: ["endpoints"]
verbs: ["get", "list", "watch", "create", "update", "patch"]
- apiGroups:
- nfs.rook.io
resources:
- "*"
verbs:
- "*"
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: run-nfs-provisioner
subjects:
- kind: ServiceAccount
name: rook-nfs-provisioner
# replace with namespace where provisioner is deployed
namespace: ` + namespace + `
roleRef:
kind: ClusterRole
name: rook-nfs-provisioner-runner
apiGroup: rbac.authorization.k8s.io
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: rook-nfs-provisioner
namespace: ` + namespace + `
---
kind: Deployment
apiVersion: apps/v1
metadata:
name: rook-nfs-provisioner
namespace: ` + namespace + `
spec:
selector:
matchLabels:
app: rook-nfs-provisioner
replicas: 1
strategy:
type: Recreate
template:
metadata:
labels:
app: rook-nfs-provisioner
spec:
serviceAccount: rook-nfs-provisioner
containers:
- name: rook-nfs-provisioner
image: rook/nfs:master
imagePullPolicy: IfNotPresent
args: ["nfs", "provisioner","--provisioner=rook.io/nfs-provisioner"]
env:
- name: POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: POD_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
`
}
@@ -462,7 +376,7 @@ parameters:
exportName: nfs-share
nfsServerName: ` + namespace + `
nfsServerNamespace: ` + namespace + `
provisioner: rook.io/nfs-provisioner
provisioner: nfs.rook.io/` + namespace + `-provisioner
reclaimPolicy: Delete
volumeBindingMode: Immediate
---
@@ -476,7 +390,7 @@ parameters:
exportName: nfs-share1
nfsServerName: ` + namespace + `
nfsServerNamespace: ` + namespace + `
provisioner: rook.io/nfs-provisioner
provisioner: nfs.rook.io/` + namespace + `-provisioner
reclaimPolicy: Delete
volumeBindingMode: Immediate
---
@@ -516,6 +430,59 @@ metadata:
namespace: ` + namespace + `
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: rook-nfs-provisioner
namespace: ` + namespace + `
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: rook-nfs-provisioner-runner
rules:
- apiGroups: [""]
resources: ["persistentvolumes"]
verbs: ["get", "list", "watch", "create", "delete"]
- apiGroups: [""]
resources: ["persistentvolumeclaims"]
verbs: ["get", "list", "watch", "update"]
- apiGroups: ["storage.k8s.io"]
resources: ["storageclasses"]
verbs: ["get", "list", "watch"]
- apiGroups: [""]
resources: ["events"]
verbs: ["create", "update", "patch"]
- apiGroups: [""]
resources: ["services", "endpoints"]
verbs: ["get"]
- apiGroups: ["extensions"]
resources: ["podsecuritypolicies"]
resourceNames: ["nfs-provisioner"]
verbs: ["use"]
- apiGroups: [""]
resources: ["endpoints"]
verbs: ["get", "list", "watch", "create", "update", "patch"]
- apiGroups:
- nfs.rook.io
resources:
- "*"
verbs:
- "*"
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: run-nfs-provisioner
subjects:
- kind: ServiceAccount
name: rook-nfs-provisioner
namespace: ` + namespace + `
roleRef:
kind: ClusterRole
name: rook-nfs-provisioner-runner
apiGroup: rbac.authorization.k8s.io
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: test-claim
+1 -1
View File
@@ -68,7 +68,7 @@ func (suite *NfsSuite) TearDownSuite() {
}
func (suite *NfsSuite) Setup() {
suite.namespace = "nfs-ns"
suite.namespace = "rook-nfs"
suite.systemNamespace = installer.SystemNamespace(suite.namespace)
suite.instanceCount = 1