Merge pull request #157 from wnxn/master

Release v1.1.0

Makefile

@@ -17,7 +17,7 @@
 .PHONY: all disk
 
 DISK_IMAGE_NAME=csiplugin/csi-qingcloud
-DISK_VERSION=v1.1.0-rc.4
+DISK_VERSION=v1.1.0
 ROOT_PATH=$(pwd)
 PACKAGE_LIST=./cmd/... ./pkg/...
 

README.md

@@ -57,7 +57,7 @@ This guide will install CSI plugin in the *kube-system* namespace of Kubernetes
   - Enable `--read-only-port=10255` on kubelet
 - Download installation file 
 ```
-$ wget https://raw.githubusercontent.com/yunify/qingcloud-csi/master/deploy/disk/kubernetes/releases/qingcloud-csi-disk-v1.1.0-rc.4.yaml
+$ wget https://raw.githubusercontent.com/yunify/qingcloud-csi/master/deploy/disk/kubernetes/releases/qingcloud-csi-disk-v1.1.0.yaml
 ```
 - Add QingCloud platform parameter on ConfigMap
 QingCloud CSI plugin manipulates cloud resource by QingCloud platform API. User must test the connection between QingCloud platform API and user's own instance by and check QingCloud platform configuration by [QingCloud CLI](https://docs.qingcloud.com/product/cli/).
@@ -83,7 +83,7 @@ QingCloud CSI plugin manipulates cloud resource by QingCloud platform API. User
 > IMPORTANT: If kubelet, a component of Kubernetes, set the `--root-dir` option (default: *"/var/lib/kubelet"*), please replace *"/var/lib/kubelet"* with the value of `--root-dir` at the CSI [DaemonSet](deploy/disk/kubernetes/csi-node-ds.yaml) YAML file's `spec.template.spec.containers[name=csi-qingcloud].volumeMounts[name=mount-dir].mountPath` and `spec.template.spec.volumes[name=mount-dir].hostPath.path` fields. For instance, in Kubernetes cluster based on QingCloud AppCenter, you should replace *"/var/lib/kubelet"* with *"/data/var/lib/kubelet"* in the CSI [DaemonSet](deploy/disk/kubernetes/csi-node-ds.yaml) YAML file.
 
 ```
-$ kubectl apply -f qingcloud-csi-disk-v1.1.0-rc.4.yaml
+$ kubectl apply -f qingcloud-csi-disk-v1.1.0.yaml
 ```
 
 - Check CSI plugin
@@ -99,7 +99,7 @@ $ kubectl get pods -n kube-system --selector=app=csi-qingcloud
 
 ### Uninstall
 ```
-$ kubectl delete -f qingcloud-csi-disk-v1.1.0-rc.4.yaml
+$ kubectl delete -f qingcloud-csi-disk-v1.1.0.yaml
 ```
 
 ### StorageClass Parameters

README_zh.md

@@ -58,7 +58,7 @@ QingCloud CSI 插件实现了 [CSI](https://github.com/container-storage-interfa
 
 - 下载安装文件并解压
 ```
-$ wget https://raw.githubusercontent.com/yunify/qingcloud-csi/master/deploy/disk/kubernetes/releases/qingcloud-csi-disk-v1.1.0-rc.4.yaml
+$ wget https://raw.githubusercontent.com/yunify/qingcloud-csi/master/deploy/disk/kubernetes/releases/qingcloud-csi-disk-v1.1.0.yaml
 ```
 
 - 修改 QingCloud 云平台配置参数
@@ -86,7 +86,7 @@ $ wget https://raw.githubusercontent.com/yunify/qingcloud-csi/master/deploy/disk
 > 注:  如果 Kubernetes 集群的 [kubelet](https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet/) 设置了 `--root-dir` 选项（默认值为 *"/var/lib/kubelet"*），请将 DaemonSet 的 `spec.template.spec.containers[name=csi-qingcloud].volumeMounts[name=mount-dir].mountPath` 和 `spec.template.spec.volumes[name=mount-dir].hostPath.path` 的值 *"/var/lib/kubelet"* 替换为 `--root-dir` 选项的值。例如：在通过 QingCloud AppCenter 创建的 Kubernetes 集群内, 需要将 DaemonSet 的 *"/var/lib/kubelet"* 字段替换为 *"/data/var/lib/kubelet"*。
 
 ```
-$ kubectl apply -f qingcloud-csi-disk-v1.1.0-rc.4.yaml
+$ kubectl apply -f qingcloud-csi-disk-v1.1.0.yaml
 ```
 
 - 检查 CSI 插件状态
@@ -102,7 +102,7 @@ $ kubectl get pods -n kube-system --selector=app=csi-qingcloud
 
 ### 卸载
 ```
-$ kubectl delete -f qingcloud-csi-disk-v1.1.0-rc.4.yaml
+$ kubectl delete -f qingcloud-csi-disk-v1.1.0.yaml
 ```
 
 ### 文档

cmd/disk/main.go

@@ -29,7 +29,7 @@ import (
 )
 
 const (
-	version              = "v1.1.0-rc.4"
+	version              = "v1.1.0"
 	defaultProvisionName = "disk.csi.qingcloud.com"
 	defaultConfigPath    = "/etc/config/config.yaml"
 )

deploy/disk/kubernetes/base/controller-deploy.yaml

@@ -33,11 +33,11 @@ spec:
         image: quay.io/k8scsi/csi-provisioner:v1.4.0
         resources:
           limits:
-            memory: "20Mi"
-            cpu: "20m"
+            memory: "80Mi"
+            cpu: "80m"
           requests:
-            memory: "20Mi"
-            cpu: "20m"
+            memory: "80Mi"
+            cpu: "80m"
         args:
         - "--csi-address=$(ADDRESS)"
         - "--enable-leader-election"
@@ -60,11 +60,11 @@ spec:
         image: quay.io/k8scsi/csi-attacher:v2.0.0
         resources:
           limits:
-            memory: "40Mi"
-            cpu: "40m"
+            memory: "80Mi"
+            cpu: "80m"
           requests:
-            memory: "40Mi"
-            cpu: "40m"
+            memory: "80Mi"
+            cpu: "80m"
         args:
         - "--csi-address=$(ADDRESS)"
         - "--leader-election"

deploy/disk/kubernetes/overlays/patch/kustomization.yaml

@@ -16,11 +16,11 @@ kind: Kustomization
 namespace: kube-system
 images:
   - name: csiplugin/csi-qingcloud
-    newTag: v1.1.0-rc.4
+    newTag: v1.1.0
 commonLabels:
   app: "csi-qingcloud"
   owner: "yunify"
-  ver: "v1.1.0-rc.4"
+  ver: "v1.1.0"
 patchesStrategicMerge:
   - controller-deploy.yaml
   - node-ds.yaml