Replaced config map usage with, omaps and volume ID generation

.mergify.yml

@@ -3,7 +3,7 @@ pull_request_rules:
   - name: automatic merge
     conditions:
       - label!=DNM
-      - '#approved-reviews-by>=1'
+      - '#approved-reviews-by>=2'
       - 'status-success=continuous-integration/travis-ci/pr'
     actions:
       merge:

Makefile

@@ -1,4 +1,4 @@
-# Copyright 2018 The Kubernetes Authors.
+# Copyright 2018 The Ceph-CSI Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

README.md

@@ -1,5 +1,10 @@
 # Ceph CSI 1.0.0
 
+[![Go Report
+Card](https://goreportcard.com/badge/github.com/ceph/ceph-csi)](https://goreportcard.com/report/github.com/ceph/ceph-csi)
+[![Build
+Status](https://travis-ci.org/ceph/ceph-csi.svg?branch=master)](https://travis-ci.org/ceph/ceph-csi)
+
 [Container Storage Interface
 (CSI)](https://github.com/container-storage-interface/) driver, provisioner,
 and attacher for Ceph RBD and CephFS.

cmd/cephfs/main.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes Authors.
+Copyright 2018 The Ceph-CSI Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cmd/rbd/main.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2018 The Kubernetes Authors.
+Copyright 2018 The Ceph-CSI Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,13 +26,14 @@ import (
 )
 
 var (
-	endpoint        = flag.String("endpoint", "unix://tmp/csi.sock", "CSI endpoint")
-	driverName      = flag.String("drivername", "rbd.csi.ceph.com", "name of the driver")
-	nodeID          = flag.String("nodeid", "", "node id")
-	containerized   = flag.Bool("containerized", true, "whether run as containerized")
-	metadataStorage = flag.String("metadatastorage", "", "metadata persistence method [node|k8s_configmap]")
-	configRoot      = flag.String("configroot", "/etc/csi-config", "directory in which CSI specific Ceph"+
+	endpoint      = flag.String("endpoint", "unix://tmp/csi.sock", "CSI endpoint")
+	driverName    = flag.String("drivername", "csi-rbdplugin", "name of the driver")
+	nodeID        = flag.String("nodeid", "", "node id")
+	containerized = flag.Bool("containerized", true, "whether run as containerized")
+	configRoot    = flag.String("configroot", "/etc/csi-config", "directory in which CSI specific Ceph"+
 		" cluster configurations are present, OR the value \"k8s_objects\" if present as kubernetes secrets")
+	instanceID = flag.String("instanceid", "", "Unique ID distinguishing this instance of Ceph CSI among other"+
+		" instances, when sharing Ceph clusters across CSI instances for provisioning")
 )
 
 func init() {
@@ -44,21 +45,15 @@ func init() {
 }
 
 func main() {
-
 	err := util.ValidateDriverName(*driverName)
 	if err != nil {
 		klog.Fatalln(err)
 	}
 	//update plugin name
 	rbd.PluginFolder = rbd.PluginFolder + *driverName
 
-	cp, err := util.CreatePersistanceStorage(rbd.PluginFolder, *metadataStorage, *driverName)
-	if err != nil {
-		os.Exit(1)
-	}
-
 	driver := rbd.NewDriver()
-	driver.Run(*driverName, *nodeID, *endpoint, *configRoot, *containerized, cp)
+	driver.Run(*driverName, *nodeID, *endpoint, *configRoot, *instanceID, *containerized)
 
 	os.Exit(0)
 }

deploy/cephfs/helm/Chart.yaml

@@ -4,7 +4,7 @@ appVersion: "1.0.0"
 description: "Container Storage Interface (CSI) driver,
 provisioner, and attacher for Ceph cephfs"
 name: ceph-csi-cephfs
-version: 0.5.1
+version: 0.5.2
 keywords:
   - ceph
   - cephfs

deploy/cephfs/helm/templates/_helpers.tpl

@@ -24,24 +24,6 @@ If release name contains chart name it will be used as a full name.
 {{- end -}}
 {{- end -}}
 
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "ceph-csi-cephfs.attacher.fullname" -}}
-{{- if .Values.attacher.fullnameOverride -}}
-{{- .Values.attacher.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- printf "%s-%s" .Release.Name .Values.attacher.name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s-%s" .Release.Name $name .Values.attacher.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
@@ -85,17 +67,6 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "ceph-csi-cephfs.serviceAccountName.attacher" -}}
-{{- if .Values.serviceAccounts.attacher.create -}}
-    {{ default (include "ceph-csi-cephfs.attacher.fullname" .) .Values.serviceAccounts.attacher.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccounts.attacher.name }}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Create the name of the service account to use
 */}}

deploy/cephfs/helm/templates/csidriver-crd.yaml

@@ -0,0 +1,10 @@
+---
+{{ if not .Values.attacher.enabled }}
+apiVersion: storage.k8s.io/v1beta1
+kind: CSIDriver
+metadata:
+  name: {{ .Values.driverName }}
+spec:
+  attachRequired: false
+  podInfoOnMount: false
+{{ end }}

deploy/cephfs/helm/templates/provisioner-clusterrole.yaml

@@ -28,10 +28,12 @@ rules:
   - apiGroups: [""]
     resources: ["events"]
     verbs: ["list", "watch", "create", "update", "patch"]
-  - apiGroups: [""]
-    resources: ["configmaps"]
-    verbs: ["get", "list", "create", "delete"]
   - apiGroups: ["csi.storage.k8s.io"]
     resources: ["csinodeinfos"]
     verbs: ["get", "list", "watch"]
+  {{ if .Values.attacher.enabled }}
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["volumeattachments"]
+    verbs: ["get", "list", "watch", "update"]
+  {{ end }}
 {{- end -}}

deploy/cephfs/helm/templates/provisioner-statefulset.yaml

@@ -41,6 +41,20 @@ spec:
               mountPath: {{ .Values.socketDir }}
           resources:
 {{ toYaml .Values.provisioner.resources | indent 12 }}
+        {{ if .Values.attacher.enabled }}
+        - name: csi-attacher
+          image: "{{ .Values.attacher.image.repository }}:{{ .Values.attacher.image.tag }}"
+          args:
+            - "--v=5"
+            - "--csi-address=$(ADDRESS)"
+          env:
+            - name: ADDRESS
+              value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}"
+          imagePullPolicy: {{ .Values.attacher.image.pullPolicy }}
+          volumeMounts:
+            - name: socket-dir
+              mountPath: {{ .Values.socketDir }}
+        {{ end }}
         - name: csi-cephfsplugin
           securityContext:
             privileged: true
@@ -79,7 +93,7 @@ spec:
 #FIXME this seems way too much. Why is it needed at all for this?
         - name: host-rootfs
           hostPath:
-            path: /            
+            path: /
     {{- if .Values.provisioner.affinity -}}
       affinity:
 {{ toYaml .Values.provisioner.affinity . | indent 8 }}

deploy/cephfs/helm/values.yaml

@@ -20,7 +20,7 @@ volumeDevicesDir: /var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices
 driverName: cephfs.csi.ceph.com
 attacher:
   name: attacher
-
+  enabled: true
   replicaCount: 1
 
   image: