Rebase to 2.2.0-rc1

.cloudbuild.sh

@@ -0,0 +1 @@
+release-tools/cloudbuild.sh

.prow.sh

@@ -1,7 +1,5 @@
 #! /bin/bash
 
-CSI_PROW_TESTS="unit"
-
 . release-tools/prow.sh
 
 main

CHANGELOG/README.md

@@ -0,0 +1,6 @@
+# CHANGELOGs
+
+- [CHANGELOG-2.1.md](./CHANGELOG-2.1.md)
+- [CHANGELOG-2.0.md](./CHANGELOG-2.0.md)
+- [CHANGELOG-1.2.md](./CHANGELOG-1.2.md)
+- [CHANGELOG-1.1.md](./CHANGELOG-1.1.md)

README.md

@@ -15,7 +15,7 @@ The move of the Kubernetes Volume Snapshot feature to beta also means:
 * A revamp of volume snapshot APIs.
 * The CSI external-snapshotter sidecar is split into two controllers, a snapshot controller and a CSI external-snapshotter sidecar.
 
-The snapshot controller is deployed by the Kubernetes distributions and is responsible for watching the VolumeSnapshot CRD objects and manges the creation and deletion lifecycle of snapshots.
+The snapshot controller is deployed by the Kubernetes distributions and is responsible for watching the VolumeSnapshot CRD objects and manages the creation and deletion lifecycle of snapshots.
 
 The CSI external-snapshotter sidecar watches Kubernetes VolumeSnapshotContent CRD objects and triggers CreateSnapshot/DeleteSnapshot against a CSI endpoint.
 
@@ -26,7 +26,7 @@ Blog post for the beta feature can be found [here](https://kubernetes.io/blog/20
 
 This information reflects the head of this branch.
 
-| Compatible with CSI Version                                                                | Container Image             | Min K8s Version | Snapshot CRD version |
+| Compatible with CSI Version                                                                | Container Image             | [Min K8s Version](https://kubernetes-csi.github.io/docs/kubernetes-compatibility.html#minimum-version) | Snapshot CRD version |
 | ------------------------------------------------------------------------------------------ | ----------------------------| --------------- | -------------------- |
 | [CSI Spec v1.0.0](https://github.com/container-storage-interface/spec/releases/tag/v1.0.0) | quay.io/k8scsi/csi-snapshotter | 1.17         | v1beta1              |
 | [CSI Spec v1.0.0](https://github.com/container-storage-interface/spec/releases/tag/v1.0.0) | quay.io/k8scsi/snapshot-controller | 1.17     | v1beta1              |
@@ -60,14 +60,15 @@ The Volume Snapshot feature now depends on a new, volume snapshot controller in
 
 Therefore, it is strongly recommended that Kubernetes distributors bundle and deploy the controller and CRDs as part of their Kubernetes cluster management process (independent of any CSI Driver).
 
-If your cluster does not come pre-installed with the correct components, you may manually install these components by executing the following steps.
+If your Kubernetes distribution does not bundle the snapshot controller, you may manually install these components by executing the following steps. Note that the snapshot controller YAML files in the git repository deploy into the default namespace for system testing purposes. For general use, update the snapshot controller YAMLs with an appropriate namespace prior to installing. For example, on a Vanilla Kubernetes cluster update the namespace from 'default' to 'kube-system' prior to issuing the kubectl create command.
 
 Install Snapshot Beta CRDs:
 * kubectl create -f config/crd
 * https://github.com/kubernetes-csi/external-snapshotter/tree/master/config/crd
 * Do this once per cluster
 
 Install Common Snapshot Controller:
+* Update the namespace to an appropriate value for your environment (e.g. kube-system)
 * kubectl create -f deploy/kubernetes/snapshot-controller
 * https://github.com/kubernetes-csi/external-snapshotter/tree/master/deploy/kubernetes/snapshot-controller
 * Do this once per cluster

cloudbuild.yaml

@@ -0,0 +1 @@
+release-tools/cloudbuild.yaml

cmd/csi-snapshotter/Dockerfile

@@ -1,6 +1,7 @@
 FROM gcr.io/distroless/static:latest
 LABEL maintainers="Kubernetes Authors"
 LABEL description="CSI External Snapshotter Sidecar"
+ARG binary=./bin/csi-snapshotter
 
-COPY ./bin/csi-snapshotter csi-snapshotter
+COPY ${binary} csi-snapshotter
 ENTRYPOINT ["/csi-snapshotter"]

cmd/csi-snapshotter/main.go

@@ -108,7 +108,7 @@ func main() {
 	factory := informers.NewSharedInformerFactory(snapClient, *resyncPeriod)
 	coreFactory := coreinformers.NewSharedInformerFactory(kubeClient, *resyncPeriod)
 
-	// Add Snapshot types to the defualt Kubernetes so events can be logged for them
+	// Add Snapshot types to the default Kubernetes so events can be logged for them
 	snapshotscheme.AddToScheme(scheme.Scheme)
 
 	// Connect to CSI.

cmd/snapshot-controller/Dockerfile

@@ -1,6 +1,7 @@
 FROM gcr.io/distroless/static:latest
 LABEL maintainers="Kubernetes Authors"
 LABEL description="Snapshot Controller"
+ARG binary=./bin/snapshot-controller
 
-COPY ./bin/snapshot-controller snapshot-controller
+COPY ${binary} snapshot-controller
 ENTRYPOINT ["/snapshot-controller"]

cmd/snapshot-controller/main.go

@@ -87,7 +87,7 @@ func main() {
 	factory := informers.NewSharedInformerFactory(snapClient, *resyncPeriod)
 	coreFactory := coreinformers.NewSharedInformerFactory(kubeClient, *resyncPeriod)
 
-	// Add Snapshot types to the defualt Kubernetes so events can be logged for them
+	// Add Snapshot types to the default Kubernetes so events can be logged for them
 	snapshotscheme.AddToScheme(scheme.Scheme)
 
 	klog.V(2).Infof("Start NewCSISnapshotController with kubeconfig [%s] resyncPeriod [%+v]", *kubeconfig, *resyncPeriod)

deploy/kubernetes/snapshot-controller/rbac-snapshot-controller.yaml

@@ -1,8 +1,15 @@
 # RBAC file for the snapshot controller.
+#
+# The snapshot controller implements the control loop for CSI snapshot functionality.
+# It should be installed as part of the base Kubernetes distribution in an appropriate
+# namespace for components implementing base system functionality. For installing with
+# Vanilla Kubernetes, kube-system makes sense for the namespace.
+
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: snapshot-controller
+  namespace: default # TODO: replace with the namespace you want for your controller, e.g. kube-system
 
 ---
 kind: ClusterRole
@@ -44,8 +51,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: snapshot-controller
-    # replace with non-default namespace name
-    namespace: default
+    namespace: default # TODO: replace with the namespace you want for your controller, e.g. kube-system
 roleRef:
   kind: ClusterRole
   # change the name also here if the ClusterRole gets renamed
@@ -56,7 +62,7 @@ roleRef:
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  namespace: default # TODO: replace with the namespace you want for your controller
+  namespace: default # TODO: replace with the namespace you want for your controller, e.g. kube-system
   name: snapshot-controller-leaderelection
 rules:
 - apiGroups: ["coordination.k8s.io"]
@@ -68,11 +74,11 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: snapshot-controller-leaderelection
-  namespace: default # TODO: replace with the namespace you want for your controller
+  namespace: default # TODO: replace with the namespace you want for your controller, e.g. kube-system
 subjects:
   - kind: ServiceAccount
     name: snapshot-controller
-    namespace: default # TODO: replace with the namespace you want for your controller
+    namespace: default # TODO: replace with the namespace you want for your controller, e.g. kube-system
 roleRef:
   kind: Role
   name: snapshot-controller-leaderelection

deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml

@@ -1,10 +1,16 @@
 # This YAML file shows how to deploy the snapshot controller
 
+# The snapshot controller implements the control loop for CSI snapshot functionality.
+# It should be installed as part of the base Kubernetes distribution in an appropriate
+# namespace for components implementing base system functionality. For installing with
+# Vanilla Kubernetes, kube-system makes sense for the namespace.
+
 ---
 kind: StatefulSet
 apiVersion: apps/v1
 metadata:
   name: snapshot-controller
+  namespace: default # TODO: replace with the namespace you want for your controller, e.g. kube-system
 spec:
   serviceName: "snapshot-controller"
   replicas: 1

go.mod

@@ -4,57 +4,63 @@ go 1.12
 
 require (
 	github.com/container-storage-interface/spec v1.2.0
-	github.com/golang/mock v1.2.0
-	github.com/golang/protobuf v1.3.2
-	github.com/google/go-cmp v0.3.1 // indirect
-	github.com/imdario/mergo v0.3.7 // indirect
+	github.com/golang/mock v1.4.3
+	github.com/golang/protobuf v1.3.5
+	github.com/google/go-cmp v0.4.0 // indirect
+	github.com/imdario/mergo v0.3.9 // indirect
 	github.com/kubernetes-csi/csi-lib-utils v0.7.0
 	github.com/kubernetes-csi/csi-test v2.0.0+incompatible
-	google.golang.org/grpc v1.26.0
-	k8s.io/api v0.17.0
-	k8s.io/apimachinery v0.17.1-beta.0
-	k8s.io/client-go v0.17.0
-	k8s.io/code-generator v0.0.0-20191121015212-c4c8f8345c7e
+	github.com/prometheus/client_golang v1.0.0
+	github.com/prometheus/client_model v0.2.0
+	github.com/prometheus/common v0.4.1
+	google.golang.org/grpc v1.28.0
+	k8s.io/api v0.18.0
+	k8s.io/apimachinery v0.18.0
+	k8s.io/client-go v0.18.0
+	k8s.io/code-generator v0.18.0
+	k8s.io/component-base v0.18.0
 	k8s.io/klog v1.0.0
-	k8s.io/kubernetes v1.14.0
+	k8s.io/kubernetes v1.18.0
 )
 
-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.0
+replace k8s.io/api => k8s.io/api v0.18.0
 
-replace k8s.io/apiserver => k8s.io/apiserver v0.17.0
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.0
 
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.0
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.18.0
 
-replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.0
+replace k8s.io/apiserver => k8s.io/apiserver v0.18.0
 
-replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.0
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.0
 
-replace k8s.io/code-generator => k8s.io/code-generator v0.17.1-beta.0
+replace k8s.io/client-go => k8s.io/client-go v0.18.0
 
-replace k8s.io/component-base => k8s.io/component-base v0.17.0
+replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.0
 
-replace k8s.io/cri-api => k8s.io/cri-api v0.17.1-beta.0
+replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.0
 
-replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.0
+replace k8s.io/code-generator => k8s.io/code-generator v0.18.0
 
-replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.0
+replace k8s.io/component-base => k8s.io/component-base v0.18.0
 
-replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.0
+replace k8s.io/cri-api => k8s.io/cri-api v0.18.0
 
-replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.0
+replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.0
 
-replace k8s.io/kubectl => k8s.io/kubectl v0.17.0
+replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.0
 
-replace k8s.io/kubelet => k8s.io/kubelet v0.17.0
+replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.0
 
-replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.0
+replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.0
 
-replace k8s.io/metrics => k8s.io/metrics v0.17.0
+replace k8s.io/kubectl => k8s.io/kubectl v0.18.0
 
-replace k8s.io/node-api => k8s.io/node-api v0.17.0
+replace k8s.io/kubelet => k8s.io/kubelet v0.18.0
 
-replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.0
+replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.0
 
-replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.17.0
+replace k8s.io/metrics => k8s.io/metrics v0.18.0
 
-replace k8s.io/sample-controller => k8s.io/sample-controller v0.17.0
+replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.0
+
+replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.0