Rebase to v1.2.2

CHANGELOG-1.2.md

@@ -0,0 +1,25 @@
+# Changelog since v1.2.1
+
+## Notable Changes
+
+- Cherry picks PR #172: Added extra verification of source PersistentVolumeClaim before creating snapshot.([#173](https://github.com/kubernetes-csi/external-snapshotter/pull/173), [@xing-yang](https://github.com/xing-yang))
+
+# Changelog since v1.2.0
+
+## Notable Changes
+
+- Cherry picks PR #138: Prebound snapshots will work correctly with CSI drivers that does not support ListSnasphots.([#156](https://github.com/kubernetes-csi/external-snapshotter/pull/156), [@hakanmemisoglu](https://github.com/hakanmemisoglu))
+
+# Changelog since v1.1.0
+
+## Breaking Changes
+
+- Changes the API group name for the fake VolumeSnapshot object to "snapshot.storage.k8s.io" to be in-sync with the group name of the real VolumeSnapshot object. As a result, the generated interfaces for clientset and informers of VolumeSnapshot are also changed from "VolumeSnapshot" to "Snapshot". ([#123](https://github.com/kubernetes-csi/external-snapshotter/pull/123), [@xing-yang](https://github.com/xing-yang))
+
+## New Features
+
+- Adds Finalizer on the snapshot source PVC to prevent it from being deleted when a snapshot is being created from it. ([#47](https://github.com/kubernetes-csi/external-snapshotter/pull/47), [@xing-yang](https://github.com/xing-yang))
+
+## Other Notable Changes
+
+- Add Status subresource for VolumeSnapshot. ([#121](https://github.com/kubernetes-csi/external-snapshotter/pull/121), [@zhucan](https://github.com/zhucan))

Dockerfile.openshift

@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.11 AS builder
+FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
 WORKDIR /go/src/github.com/kubernetes-csi/external-snapshotter
 COPY . .
 RUN make build

Dockerfile.openshift.rhel7

@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
 WORKDIR /go/src/github.com/kubernetes-csi/external-snapshotter
 COPY . .
 RUN make build

cmd/csi-snapshotter/create_crd.go

@@ -38,8 +38,12 @@ func CreateCRD(clientset apiextensionsclient.Interface) error {
 				Plural: crdv1.VolumeSnapshotClassResourcePlural,
 				Kind:   reflect.TypeOf(crdv1.VolumeSnapshotClass{}).Name(),
 			},
+			Subresources: &apiextensionsv1beta1.CustomResourceSubresources{
+				Status: &apiextensionsv1beta1.CustomResourceSubresourceStatus{},
+			},
 		},
 	}
+
 	res, err := clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Create(crd)
 
 	if err != nil && !apierrors.IsAlreadyExists(err) {
@@ -80,6 +84,9 @@ func CreateCRD(clientset apiextensionsclient.Interface) error {
 				Plural: crdv1.VolumeSnapshotResourcePlural,
 				Kind:   reflect.TypeOf(crdv1.VolumeSnapshot{}).Name(),
 			},
+			Subresources: &apiextensionsv1beta1.CustomResourceSubresources{
+				Status: &apiextensionsv1beta1.CustomResourceSubresourceStatus{},
+			},
 		},
 	}
 	res, err = clientset.ApiextensionsV1beta1().CustomResourceDefinitions().Create(crd)

cmd/csi-snapshotter/main.go

@@ -66,7 +66,7 @@ var (
 	snapshotNamePrefix              = flag.String("snapshot-name-prefix", "snapshot", "Prefix to apply to the name of a created snapshot")
 	snapshotNameUUIDLength          = flag.Int("snapshot-name-uuid-length", -1, "Length in characters for the generated uuid of a created snapshot. Defaults behavior is to NOT truncate.")
 	showVersion                     = flag.Bool("version", false, "Show version.")
-	csiTimeout                      = flag.Duration("timeout", defaultCSITimeout, "The timeout for any RPCs to the CSI driver. Default is 10s.")
+	csiTimeout                      = flag.Duration("timeout", defaultCSITimeout, "The timeout for any RPCs to the CSI driver. Default is 1 minute.")
 
 	leaderElection          = flag.Bool("leader-election", false, "Enables leader election.")
 	leaderElectionNamespace = flag.String("leader-election-namespace", "", "The namespace where the leader election resource exists. Defaults to the pod namespace if not set.")
@@ -184,9 +184,9 @@ func main() {
 		snapClient,
 		kubeClient,
 		*snapshotterName,
-		factory.Volumesnapshot().V1alpha1().VolumeSnapshots(),
-		factory.Volumesnapshot().V1alpha1().VolumeSnapshotContents(),
-		factory.Volumesnapshot().V1alpha1().VolumeSnapshotClasses(),
+		factory.Snapshot().V1alpha1().VolumeSnapshots(),
+		factory.Snapshot().V1alpha1().VolumeSnapshotContents(),
+		factory.Snapshot().V1alpha1().VolumeSnapshotClasses(),
 		coreFactory.Core().V1().PersistentVolumeClaims(),
 		*createSnapshotContentRetryCount,
 		*createSnapshotContentInterval,

deploy/kubernetes/rbac.yaml

@@ -25,7 +25,7 @@ rules:
     verbs: ["get", "list", "watch"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
-    verbs: ["get", "list", "watch"]
+    verbs: ["get", "list", "watch", "update"]
   - apiGroups: ["storage.k8s.io"]
     resources: ["storageclasses"]
     verbs: ["get", "list", "watch"]
@@ -44,9 +44,12 @@ rules:
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshots"]
     verbs: ["get", "list", "watch", "update"]
+  - apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshots/status"]
+    verbs: ["update"]
   - apiGroups: ["apiextensions.k8s.io"]
     resources: ["customresourcedefinitions"]
-    verbs: ["create", "list", "watch", "delete"]
+    verbs: ["create", "list", "watch", "delete", "get", "update"]
 
 ---
 kind: ClusterRoleBinding

deploy/kubernetes/setup-csi-snapshotter.yaml

@@ -72,7 +72,7 @@ spec:
       serviceAccount: csi-snapshotter
       containers:
         - name: csi-provisioner
-          image: quay.io/k8scsi/csi-provisioner:v1.0.1
+          image: quay.io/k8scsi/csi-provisioner:v1.1.0
           args:
             - "--provisioner=csi-hostpath"
             - "--csi-address=$(ADDRESS)"
@@ -85,7 +85,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-snapshotter
-          image: quay.io/k8scsi/csi-snapshotter:v1.0.1
+          image: quay.io/k8scsi/csi-snapshotter:v1.1.0
           args:
             - "--csi-address=$(ADDRESS)"
             - "--connection-timeout=15s"
@@ -98,7 +98,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: hostpath
-          image: quay.io/k8scsi/hostpathplugin:v1.0.1
+          image: quay.io/k8scsi/hostpathplugin:v1.1.0
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"

pkg/apis/volumesnapshot/v1alpha1/doc.go

@@ -15,5 +15,6 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+// +groupName=snapshot.storage.k8s.io
 
 package v1alpha1