Merge pull request #171 from wnxn/master

Prepare for releasing v1.2.0

Author: ks-ci-bot

.travis.yml

@@ -8,4 +8,4 @@ before_install:
   - docker pull k8s.gcr.io/debian-base:v1.0.0
 
 script:
-  - make disk-container
+  - go build -o _output/main cmd/disk/main.go

CHANGELOG.md

@@ -1,12 +1,37 @@
-<!-- BEGIN MUNGE: GENERATED_TOC -->
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+
+- [v1.2.0](#v120)
+  - [Changelog since v1.1.0](#changelog-since-v110)
+    - [Features](#features)
+    - [Bug Fixed](#bug-fixed)
+- [v1.1.1](#v111)
+  - [Changelog since v1.1.0](#changelog-since-v110-1)
+    - [Features](#features-1)
 - [v1.1.0](#v110)
-    - [Changelog since v1.1.0](#changelog-since-v110)
-        - [Features](#features)
-        - [Bug Fixed](#bug-fixed)
-<!-- END MUNGE: GENERATED_TOC -->
+  - [Changelog since v0.2.1](#changelog-since-v021)
+    - [Features](#features-2)
+    - [Bug Fixed](#bug-fixed-1)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
 <!-- NEW RELEASE NOTES ENTRY -->
 
+# v1.2.0
+## Changelog since v1.1.0
+### Features
+* Update CSI v1.2.0 and QingCloud SDK ([#164](https://github.com/yunify/qingcloud-csi/pull/164), [@wnxn](https://github.com/wnxn))
+* Add retry limiter when detach volume ([#160](https://github.com/yunify/qingcloud-csi/pull/160), [@wnxn](https://github.com/wnxn))
+* Support deploy on Kubernetes v1.16 ([#168](https://github.com/yunify/qingcloud-csi/pull/168), [@wnxn](https://github.com/wnxn))
+
+### Bug Fixed
+* Update snapshot content source ([#164](https://github.com/yunify/qingcloud-csi/pull/164), [@wnxn](https://github.com/wnxn))
+
+# v1.1.1
+## Changelog since v1.1.0
+### Features
+* Support more volume types ([#170](https://github.com/yunify/qingcloud-csi/pull/170), [@wnxn](https://github.com/wnxn))
+
 # v1.1.0
 ## Changelog since v0.2.1
 ### Features

Makefile

@@ -16,8 +16,8 @@
 
 .PHONY: all disk
 
-DISK_IMAGE_NAME=csidriver/csi-qingcloud
-DISK_VERSION=canary
+DISK_IMAGE_NAME=csiplugin/csi-qingcloud
+DISK_VERSION=v1.2.0-rc.1
 ROOT_PATH=$(pwd)
 PACKAGE_LIST=./cmd/... ./pkg/...
 

README.md

@@ -42,27 +42,38 @@ After plugin installation completes, user can create volumes based on several ty
 |:---:|:---:|:---:|:---:|:---:|:---:|:---:|
 |v0.2.x |✓|-|-|-|-|-|
 |v1.1.0 |✓|✓|✓|✓|✓|✓|
-|v1.2.0*** |✓|✓|✓|✓|✓|✓|
+|v1.2.0 |✓|✓|✓|✓|✓***|✓|
 
 Notes:
 - `*`: Volume Management including creating/deleting volume and mounting/unmount volume on Pod.
 - `**`: Snapshot management including creating/deleting snapshot and restoring volume from snapshot.
-- `***`: On Kubernetes v1.16, QingCloud CSI v1.2.0 only supports volume management.
+- `***`: Only supports Snapshot Management on Kubernetes v1.17+ because snapshot features goes into Beta on this version.
 
 ### Installation
-This guide will install CSI plugin in the *kube-system* namespace of Kubernetes v1.14+. You can also deploy the plugin in other namespace. 
+This guide will install CSI plugin in the *kube-system* namespace of Kubernetes v1.16+. You can also deploy the plugin in other namespace. 
 
 - Set Kubernetes Parameters
   - For Kubernetes v1.16
     - Enable `--allow-privileged=true` on kube-apiserver, kube-controller-manager, kube-scheduler, kubelet.
     - Enable (Default enabled) [Mount Propagation](https://kubernetes.io/docs/concepts/storage/volumes/#mount-propagation) feature gate。
-    - Enable (Default enabled) `--feature-gates=CSINodeInfo=true,CSIDriverRegistry=true,KubeletPluginsWatcher=true` option on kube-apiserver, kube-controller-manager, kube-scheduler, kubelet
+    - Enable (Default enabled) `--feature-gates=CSINodeInfo=true,CSIDriverRegistry=true,ExpandCSIVolumes=true` option on kube-apiserver, kube-controller-manager, kube-scheduler, kubelet
     - Enable `--read-only-port=10255` on kubelet
-  - For Kubernetes v1.17
+  - For Kubernetes v1.17+
     - Enable `--allow-privileged=true` on kube-apiserver, kube-controller-manager, kube-scheduler, kubelet.
     - Enable (Default enabled) [Mount Propagation](https://kubernetes.io/docs/concepts/storage/volumes/#mount-propagation) feature gate。
-    - Enable (Default enabled) `--feature-gates=CSINodeInfo=true,CSIDriverRegistry=true,KubeletPluginsWatcher=true,ExpandCSIVolumes=true,VolumePVCDataSource=true` option on kube-apiserver, kube-controller-manager, kube-scheduler, kubelet
+    - Enable (Default enabled) `--feature-gates=CSINodeInfo=true,CSIDriverRegistry=true,ExpandCSIVolumes=true,VolumePVCDataSource=true` option on kube-apiserver, kube-controller-manager, kube-scheduler, kubelet
     - Enable `--read-only-port=10255` on kubelet
+    - Install Snapshot CRD
+        ```
+        kubectl create -f https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/v2.1.1/config/crd/snapshot.storage.k8s.io_volumesnapshotclasses.yaml
+        kubectl create -f https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/v2.1.1/config/crd/snapshot.storage.k8s.io_volumesnapshotcontents.yaml
+        kubectl create -f https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/v2.1.1/config/crd/snapshot.storage.k8s.io_volumesnapshots.yaml
+        ```
+    - Install Snapshot Controller
+        ```
+        kubectl create -f https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/v2.1.1/deploy/kubernetes/snapshot-controller/rbac-snapshot-controller.yaml
+        kubectl create -f https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/v2.1.1/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml
+        ```
 - Download installation file
   - For Kubernetes v1.16
 ```

deploy/disk/example/snapshot/snapshot-class.yaml

@@ -18,4 +18,5 @@ metadata:
   name: csi-qingcloud
 driver: disk.csi.qingcloud.com
 parameters:
-  tags: "tag-y7uu1q2a"
+  tags: "tag-y7uu1q2a"
+deletionPolicy: Delete

deploy/disk/kubernetes/releases/qingcloud-csi-disk-v1.16.yaml

@@ -32,16 +32,28 @@ metadata:
   namespace: kube-system
 rules:
   - apiGroups:
-      - ""
+      - coordination.k8s.io
     resources:
-      - configmaps
+      - leases
     verbs:
       - get
       - watch
       - list
       - delete
       - update
       - create
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    app: csi-qingcloud
+    owner: yunify
+    role: controller
+    ver: v1.2.0
+  name: csi-qingcloud-provisioner
+  namespace: kube-system
+rules:
   - apiGroups:
       - coordination.k8s.io
     resources:
@@ -62,7 +74,7 @@ metadata:
     owner: yunify
     role: controller
     ver: v1.2.0
-  name: csi-qingcloud-provisioner
+  name: csi-qingcloud-resizer
   namespace: kube-system
 rules:
   - apiGroups:
@@ -238,6 +250,52 @@ rules:
       - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app: csi-qingcloud
+    owner: yunify
+    role: controller
+    ver: v1.2.0
+  name: csi-qingcloud-resizer
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - persistentvolumes
+    verbs:
+      - get
+      - list
+      - watch
+      - update
+      - patch
+  - apiGroups:
+      - ""
+    resources:
+      - persistentvolumeclaims
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - persistentvolumeclaims/status
+    verbs:
+      - update
+      - patch
+  - apiGroups:
+      - ""
+    resources:
+      - events
+    verbs:
+      - list
+      - watch
+      - create
+      - update
+      - patch
+---
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
@@ -276,6 +334,25 @@ subjects:
     namespace: kube-system
 ---
 apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app: csi-qingcloud
+    owner: yunify
+    role: controller
+    ver: v1.2.0
+  name: csi-qingcloud-resizer
+  namespace: kube-system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: csi-qingcloud-resizer
+subjects:
+  - kind: ServiceAccount
+    name: csi-resizer
+    namespace: kube-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
@@ -385,7 +462,7 @@ spec:
           env:
             - name: ADDRESS
               value: /csi/csi.sock
-          image: quay.io/k8scsi/csi-provisioner:v1.5.0
+          image: quay.io/k8scsi/csi-provisioner:v1.6.0
           imagePullPolicy: IfNotPresent
           name: csi-provisioner
           resources:
@@ -413,7 +490,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.name
-          image: quay.io/k8scsi/csi-attacher:v2.1.1
+          image: quay.io/k8scsi/csi-attacher:v2.2.0
           imagePullPolicy: IfNotPresent
           name: csi-attacher
           resources:
@@ -426,6 +503,26 @@ spec:
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
+        - args:
+            - --csi-address=$(ADDRESS)
+            - --leader-election
+            - --v=5
+          env:
+            - name: ADDRESS
+              value: /csi/csi.sock
+          image: quay.io/k8scsi/csi-resizer:v0.5.0
+          imagePullPolicy: IfNotPresent
+          name: csi-resizer
+          resources:
+            limits:
+              cpu: 20m
+              memory: 20Mi
+            requests:
+              cpu: 20m
+              memory: 20Mi
+          volumeMounts:
+            - mountPath: /csi
+              name: socket-dir
         - args:
             - --config=/etc/config/config.yaml
             - --drivername=disk.csi.qingcloud.com
@@ -440,8 +537,8 @@ spec:
                   fieldPath: spec.nodeName
             - name: CSI_ENDPOINT
               value: unix://csi/csi.sock
-          image: csidriver/csi-qingcloud:canary
-          imagePullPolicy: IfNotPresent
+          image: csiplugin/csi-qingcloud:v1.2.0-rc.1
+          imagePullPolicy: Always
           name: csi-qingcloud
           resources:
             limits:
@@ -496,7 +593,7 @@ spec:
           env:
             - name: ADDRESS
               value: /csi/csi.sock
-          image: quay.io/k8scsi/csi-node-driver-registrar:v1.2.0
+          image: quay.io/k8scsi/csi-node-driver-registrar:v1.3.0
           lifecycle:
             preStop:
               exec:
@@ -531,8 +628,8 @@ spec:
                   fieldPath: spec.nodeName
             - name: CSI_ENDPOINT
               value: unix://csi/csi.sock
-          image: csidriver/csi-qingcloud:canary
-          imagePullPolicy: IfNotPresent
+          image: csiplugin/csi-qingcloud:v1.2.0-rc.1
+          imagePullPolicy: Always
           name: csi-qingcloud
           resources:
             limits: