Merge branch 'csi1.0' into 'master'

Update driver to CSI 1.0

See merge request cloud-infrastructure/cvmfs-csi!12

Author: rochaporto

.gitignore

@@ -21,4 +21,4 @@ Session.vim
 # git merge files
 *.orig
 *.patch
-*.rej
+*.rej

.gitlab-ci.yml

@@ -45,8 +45,8 @@ build image:
     - cp _output/csi-cvmfsplugin deploy/docker
     - yum install -y make
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN gitlab-registry.cern.ch
-    - docker build -t gitlab-registry.cern.ch/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_SHA deploy/docker
-    - docker push gitlab-registry.cern.ch/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_SHA
+    - docker build -t gitlab-registry.cern.ch/cloud-infrastructure/cvmfs-csi/cvmfsplugin:$CI_COMMIT_SHA deploy/docker
+    - docker push gitlab-registry.cern.ch/cloud-infrastructure/cvmfs-csi/cvmfsplugin:$CI_COMMIT_SHA
   dependencies:
     - build
   except:
@@ -59,15 +59,15 @@ test k8s:
   stage: test
   image: gitlab-registry.cern.ch/cloud/ciadm
   script:
-    - openstack coe cluster create $CLUSTER_NAME --cluster-template kubernetes-1.13.3-1 --keypair lxplus --node-count 1 --master-count 1 --flavor m2.small
+    - openstack coe cluster create $CLUSTER_NAME --cluster-template kubernetes-preview --keypair lxplus --node-count 1 --master-count 1 --flavor m2.small --labels influx_grafana_dashboard_enabled=True --labels cephfs_csi_enabled=True --labels manila_enabled=True --labels kube_tag=v1.14.1 --labels kube_csi_enabled=True --labels kube_csi_version=cern-csi-1.0-1 --labels heat_container_agent_tag=stein-dev-1 --labels cgroup_driver=cgroupfs --labels container_infra_prefix=gitlab-registry.cern.ch/cloud/atomic-system-containers/ --labels flannel_backend=vxlan --labels cvmfs_csi_version=$CI_COMMIT_SHA --labels admission_control_list=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota,Priority --labels ingress_controller=traefik --labels manila_version=v0.3.0 --labels cvmfs_csi_enabled=True --labels cvmfs_tag=qa --labels cephfs_csi_version=cern-csi-1.0-1
     - sleep 10
     - STATUS=$(openstack coe cluster show $CLUSTER_NAME -c status | grep 'status ' | awk '{print $4}')
     - while [ "$STATUS" != "CREATE_COMPLETE" ] && [ "$STATUS" != "CREATE_FAILED" ]; do STATUS=$(openstack coe cluster show $CLUSTER_NAME -c status | grep 'status ' | awk '{print $4}'); done
     - openstack coe cluster show $CLUSTER_NAME
     - openstack coe cluster config $CLUSTER_NAME
     - export KUBECONFIG=config
     - kubectl create --validate=false -f magnum-cvmfs.yaml
-    - kubectl rollout status deployment/cvmfs
+    - until kubectl rollout status deployment/cvmfs; do kubectl get all; kubectl describe pvc; done
     - POD=$(kubectl get pod | grep cvmfs | awk '{print $1}')
     - kubectl exec $POD -c atlas cat /cvmfs/atlas.cern.ch/repo/ATLASLocalRootBase/README.INSTALL
     - kubectl exec $POD -c cms cat /cvmfs/cms.cern.ch/README
@@ -93,9 +93,9 @@ deploy tag:
   stage: deploy
   image: gitlab-registry.cern.ch/cloud/ciadm
   script:
-    - docker pull gitlab-registry.cern.ch/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_SHA
-    - docker tag gitlab-registry.cern.ch/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_SHA gitlab-registry.cern.ch/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_TAG
-    - docker push gitlab-registry.cern.ch/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_TAG
+    - docker pull gitlab-registry.cern.ch/cloud-infrastructure/cvmfs-csi/cvmfsplugin:$CI_COMMIT_SHA
+    - docker tag gitlab-registry.cern.ch/cloud-infrastructure/cvmfs-csi/cvmfsplugin:$CI_COMMIT_SHA gitlab-registry.cern.ch/cloud-infrastructure/cvmfs-csi/cvmfsplugin:$CI_COMMIT_TAG
+    - docker push gitlab-registry.cern.ch/cloud-infrastructure/cvmfs-csi/cvmfsplugin:$CI_COMMIT_TAG
   only:
     - tags
   tags:

Gopkg.lock

@@ -1,38 +1,38 @@
 [[constraint]]
   name = "github.com/container-storage-interface/spec"
-  version = "~0.3.0"
+  version = "v1.0.0"
 
 [[constraint]]
-  branch = "master"
+  version = "v1.0.2"
   name = "github.com/kubernetes-csi/drivers"
 
 [[constraint]]
   branch = "master"
   name = "github.com/golang/glog"
 
 [[override]]
-  revision = "5db89f0ca68677abc5eefce8f2a0a772c98ba52d"
+  revision = "v2.7.1"
   name = "github.com/docker/distribution"
 
 [[constraint]]
   name = "google.golang.org/grpc"
-  version = "1.10.0"
+  version = "1.18.0"
 
-[[constraint]]
-  version = "kubernetes-1.10.0-beta.1"
+[[override]]
+  version = "kubernetes-1.13.3"
   name = "k8s.io/apimachinery"
 
 [[constraint]]
   name = "k8s.io/kubernetes"
-  version = "v1.10.0-beta.1"
+  version = "v1.13.3"
 
 [[override]]
-  version = "kubernetes-1.10.0-beta.1"
+  version = "kubernetes-1.13.3"
   name = "k8s.io/api"
 
 [[override]]
   name = "github.com/golang/protobuf"
-  version = "1.1.0"
+  version = "1.2.0"
 
 [prune]
   go-tests = true

Gopkg.toml

@@ -1,7 +1,7 @@
 .PHONY: all cvmfsplugin
 
 NAME=csi-cvmfsplugin
-IMAGE_VERSION=v0.3.0
+IMAGE_VERSION=v1.0.1
 
 all: cvmfsplugin
 
@@ -10,7 +10,8 @@ test:
 	go vet gitlab.cern.ch/cloud-infrastructure/cvmfs-csi/pkg/...
 
 cvmfsplugin:
-	go mod tidy
+	go version
+	go mod tidy -v
 	CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' -o  _output/$(NAME) ./cvmfs
 
 image:

Makefile

@@ -32,8 +32,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	driver := cvmfs.NewCvmfsDriver()
-	driver.Run(*driverName, *nodeId, *endpoint)
+	driver := cvmfs.NewDriver(*nodeId, *endpoint)
+	driver.Run()
 
 	os.Exit(0)
 }

cvmfs/main.go

@@ -1,6 +1,7 @@
+CVMFS_USER=root
 CVMFS_SERVER_URL="http://cvmfs-stratum-one.cern.ch/cvmfs/@fqrn@;http://cernvmfs.gridpp.rl.ac.uk/cvmfs/@fqrn@;http://cvmfs.racf.bnl.gov/cvmfs/@fqrn@;http://cvmfs.fnal.gov/cvmfs/@fqrn@"
 CVMFS_KEYS_DIR=/etc/cvmfs/keys/cern.ch
 CVMFS_USE_GEOAPI=yes
 
 CVMFS_HTTP_PROXY="http://ca-proxy.cern.ch:3128"
-CVMFS_QUOTA_LIMIT=20000
+CVMFS_QUOTA_LIMIT=20000

deploy/docker/default.local

@@ -1,13 +1,14 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: csi-attacher
+  name: cvmfs-attacher
+  namespace: cvmfs
 
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: external-attacher-runner
+  name: cvmfs-external-attacher-runner
 rules:
   - apiGroups: [""]
     resources: ["events"]
@@ -26,12 +27,13 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-attacher-role
+  name: cvmfs-attacher-role
+  namespace: cvmfs
 subjects:
   - kind: ServiceAccount
-    name: csi-attacher
-    namespace: default
+    name: cvmfs-attacher
+    namespace: cvmfs
 roleRef:
   kind: ClusterRole
-  name: external-attacher-runner
+  name: cvmfs-external-attacher-runner
   apiGroup: rbac.authorization.k8s.io