Merge branch 'master' into azuredisk-utilities-refactoring

Author: landreasyan

Makefile

@@ -19,7 +19,7 @@ REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
 IMAGE_NAME ?= azuredisk-csi
 ifndef BUILD_V2
 PLUGIN_NAME = azurediskplugin
-IMAGE_VERSION ?= v1.6.0
+IMAGE_VERSION ?= v1.7.0
 CHART_VERSION ?= latest
 else
 PLUGIN_NAME = azurediskpluginv2

README.md

@@ -12,9 +12,9 @@ This driver allows Kubernetes to use [Azure Disk](https://azure.microsoft.com/en
 |Driver Version  |Image                                           | supported k8s version |
 |----------------|------------------------------------------------|-----------------------|
 |master branch   |mcr.microsoft.com/k8s/csi/azuredisk-csi:latest  | 1.18+                 |
+|v1.6.0          |mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.6.0  | 1.18+                 |
 |v1.5.1          |mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.5.1  | 1.18+                 |
 |v1.4.0          |mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.4.0  | 1.18+                 |
-|v1.2.0          |mcr.microsoft.com/k8s/csi/azuredisk-csi:v1.2.0  | 1.17+                 |
 
 ### Driver parameters
 Please refer to [`disk.csi.azure.com` driver parameters](./docs/driver-parameters.md)

charts/README.md

@@ -22,7 +22,7 @@ helm install azuredisk-csi-driver azuredisk-csi-driver/azuredisk-csi-driver --na
 ### install a specific version
 ```console
 helm repo add azuredisk-csi-driver https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts
-helm install azuredisk-csi-driver azuredisk-csi-driver/azuredisk-csi-driver --namespace kube-system --version v1.5.1
+helm install azuredisk-csi-driver azuredisk-csi-driver/azuredisk-csi-driver --namespace kube-system --version v1.6.0
 ```
 
 ### install on Azure Stack

charts/index.yaml

@@ -3,7 +3,7 @@ entries:
   azuredisk-csi-driver:
   - apiVersion: v1
     appVersion: v2.0.0-alpha.1
-    created: "2021-08-11T06:00:40.188775095Z"
+    created: "2021-08-23T07:31:17.343760304Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 78489f4429e68903d79e59bbba2a0d2d284164ac26068b96176f6da77da5fd6a
     name: azuredisk-csi-driver
@@ -12,16 +12,34 @@ entries:
     version: v2.0.0-alpha.1
   - apiVersion: v1
     appVersion: latest
-    created: "2021-08-11T06:00:40.174681679Z"
+    created: "2021-08-23T07:31:17.32561305Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
-    digest: 25ea433d50c4fa9ece68a729d26923a496d531c81f7a831540c142db9d9277dd
+    digest: 67021033a29da5b5b4bdb37000313325c57cb2ddeaff6976037491f8b6564021
     name: azuredisk-csi-driver
     urls:
-    - https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts/latest/azuredisk-csi-driver-v1.6.0.tgz
+    - https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts/latest/azuredisk-csi-driver-v1.7.0.tgz
+    version: v1.7.0
+  - apiVersion: v1
+    appVersion: v1.6.0
+    created: "2021-08-23T07:31:17.342824696Z"
+    description: Azure disk Container Storage Interface (CSI) Storage Plugin
+    digest: b1a4c384fdfdb6577dd6dfd3709fb746b5c79247846e5c582b93c3a1187f6d88
+    name: azuredisk-csi-driver
+    urls:
+    - https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts/v1.6.0/azuredisk-csi-driver-v1.6.0.tgz
     version: v1.6.0
+  - apiVersion: v1
+    appVersion: v1.5.1
+    created: "2021-08-23T07:31:17.341274883Z"
+    description: Azure disk Container Storage Interface (CSI) Storage Plugin
+    digest: efb42e1d56cc5596eb4e695b658c2748bc05cc6c47862e3f20ea6b5b199d01d6
+    name: azuredisk-csi-driver
+    urls:
+    - https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts/v1.5.1/azuredisk-csi-driver-v1.5.1.tgz
+    version: v1.5.1
   - apiVersion: v1
     appVersion: v1.5.0
-    created: "2021-08-11T06:00:40.187722487Z"
+    created: "2021-08-23T07:31:17.339788071Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: c8490efde8d4a43bd25f5c619887498dfb4b41edf3929ac8dbf0a9d3f691e6ae
     name: azuredisk-csi-driver
@@ -30,7 +48,7 @@ entries:
     version: v1.5.0
   - apiVersion: v1
     appVersion: v1.4.0
-    created: "2021-08-11T06:00:40.186119373Z"
+    created: "2021-08-23T07:31:17.338380959Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 55e5e17aac7c144b21a198867654ef70ad272987b0bb165782905adf91ca3c03
     name: azuredisk-csi-driver
@@ -39,7 +57,7 @@ entries:
     version: v1.4.0
   - apiVersion: v1
     appVersion: v1.3.0
-    created: "2021-08-11T06:00:40.184257658Z"
+    created: "2021-08-23T07:31:17.337055847Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 2665483e922a577feb8539ca7f774bc70c945ce490294fd3378f098c2d244dde
     name: azuredisk-csi-driver
@@ -48,7 +66,7 @@ entries:
     version: v1.3.0
   - apiVersion: v1
     appVersion: v1.2.0
-    created: "2021-08-11T06:00:40.183358451Z"
+    created: "2021-08-23T07:31:17.335783437Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 2bbfe2f9d080f1b3ff10590c7168d05ce026c5a73332b4d48014610a52337808
     name: azuredisk-csi-driver
@@ -57,7 +75,7 @@ entries:
     version: v1.2.0
   - apiVersion: v1
     appVersion: v1.1.1
-    created: "2021-08-11T06:00:40.182513244Z"
+    created: "2021-08-23T07:31:17.333906221Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: dd7066be8f499f6c1a396ab27c0013c09f5a8d8319cc04fbdd480d31107bb851
     name: azuredisk-csi-driver
@@ -66,7 +84,7 @@ entries:
     version: v1.1.1
   - apiVersion: v1
     appVersion: v1.1.0
-    created: "2021-08-11T06:00:40.181692837Z"
+    created: "2021-08-23T07:31:17.332762711Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 3d2a5189416dd6a43bd3e2097bbe23a8db347b6e1a36c6a43fd59cc9c9633ff3
     name: azuredisk-csi-driver
@@ -75,7 +93,7 @@ entries:
     version: v1.1.0
   - apiVersion: v1
     appVersion: v1.0.0
-    created: "2021-08-11T06:00:40.18083893Z"
+    created: "2021-08-23T07:31:17.331605201Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: d179bc6f338518859b6efdc3b3bed8d06513313e8047563eb4b654b2d417c81e
     name: azuredisk-csi-driver
@@ -84,7 +102,7 @@ entries:
     version: v1.0.0
   - apiVersion: v1
     appVersion: v0.10.0
-    created: "2021-08-11T06:00:40.175479285Z"
+    created: "2021-08-23T07:31:17.326576658Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 3dbbaca098fe8316de079236598253b5831e8e85fd88b390231d828157d62206
     name: azuredisk-csi-driver
@@ -93,7 +111,7 @@ entries:
     version: v0.10.0
   - apiVersion: v1
     appVersion: v0.9.0
-    created: "2021-08-11T06:00:40.180001623Z"
+    created: "2021-08-23T07:31:17.330487492Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: a978f3e6ef5d678c3b6512bd8a63277cb4ce40d3f3e34b80370f0c37298824f2
     name: azuredisk-csi-driver
@@ -102,7 +120,7 @@ entries:
     version: v0.9.0
   - apiVersion: v1
     appVersion: v0.8.0
-    created: "2021-08-11T06:00:40.179180616Z"
+    created: "2021-08-23T07:31:17.329534483Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 1762b832389b4f7a5eab9748127fa6dbb85131485d67bc3fe485bbe86c468128
     name: azuredisk-csi-driver
@@ -111,7 +129,7 @@ entries:
     version: v0.8.0
   - apiVersion: v1
     appVersion: v0.7.0
-    created: "2021-08-11T06:00:40.178370509Z"
+    created: "2021-08-23T07:31:17.328596275Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: 29e21f686814f46c1edaaaa95ce2d25579ff1aad270c58b774bdb5a89858b8bf
     name: azuredisk-csi-driver
@@ -120,11 +138,11 @@ entries:
     version: v0.7.0
   - apiVersion: v1
     appVersion: v0.6.0
-    created: "2021-08-11T06:00:40.176479694Z"
+    created: "2021-08-23T07:31:17.327488166Z"
     description: Azure disk Container Storage Interface (CSI) Storage Plugin
     digest: b11d8dfee371ca7c63a1448ba27c1fd1f032ea33575fefeeb16927fc95d1eeb7
     name: azuredisk-csi-driver
     urls:
     - https://raw.githubusercontent.com/kubernetes-sigs/azuredisk-csi-driver/master/charts/v0.6.0/azuredisk-csi-driver-v0.6.0.tgz
     version: v0.6.0
-generated: "2021-08-11T06:00:40.173325867Z"
+generated: "2021-08-23T07:31:17.323411631Z"

charts/latest/azuredisk-csi-driver-v1.6.0.tgz

@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: latest
 description: Azure disk Container Storage Interface (CSI) Storage Plugin
 name: azuredisk-csi-driver
-version: v1.6.0
+version: v1.7.0

charts/latest/azuredisk-csi-driver-v1.7.0.tgz

@@ -81,7 +81,11 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: csi-snapshotter
+{{- if eq .Values.snapshot.apiVersion "beta" }}
           image: "{{ .Values.snapshot.image.csiSnapshotter.repository }}:{{ .Values.snapshot.image.csiSnapshotter.tag }}"
+{{- else }}
+          image: "{{ .Values.snapshot.image.csiSnapshotter.repository }}:{{ .Values.snapshot.image.csiSnapshotter.gaTag }}"
+{{- end }}
           args:
             - "-csi-address=$(ADDRESS)"
             - "-leader-election"

charts/latest/azuredisk-csi-driver/Chart.yaml

@@ -29,7 +29,11 @@ spec:
       {{- include "azuredisk.pullSecrets" . | indent 6 }}
       containers:
         - name: {{ .Values.snapshot.snapshotController.name }}
+{{- if eq .Values.snapshot.apiVersion "beta" }}
           image: "{{ .Values.snapshot.image.csiSnapshotController.repository }}:{{ .Values.snapshot.image.csiSnapshotController.tag }}"
+{{- else }}
+          image: "{{ .Values.snapshot.image.csiSnapshotController.repository }}:{{ .Values.snapshot.image.csiSnapshotController.gaTag }}"
+{{- end }}
           args:
             - "--v=2"
             - "--leader-election=false"

charts/latest/azuredisk-csi-driver/templates/NOTES.txt

@@ -74,10 +74,12 @@ snapshot:
     csiSnapshotter:
       repository: mcr.microsoft.com/oss/kubernetes-csi/csi-snapshotter
       tag: v3.0.3
+      gaTag: v4.2.0
       pullPolicy: IfNotPresent
     csiSnapshotController:
       repository: mcr.microsoft.com/oss/kubernetes-csi/snapshot-controller
       tag: v3.0.3
+      gaTag: v4.2.0
       pullPolicy: IfNotPresent
   snapshotController:
     name: csi-snapshot-controller

charts/latest/azuredisk-csi-driver/templates/_helpers.tpl

@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: v1.6.0
+description: Azure disk Container Storage Interface (CSI) Storage Plugin
+name: azuredisk-csi-driver
+version: v1.6.0

charts/latest/azuredisk-csi-driver/templates/crd-csi-snapshot.yaml

@@ -0,0 +1,5 @@
+The Azure Disk CSI Driver is getting deployed to your cluster.
+
+To check Azure Disk CSI Driver pods status, please run:
+
+  kubectl --namespace={{ .Release.Namespace }} get pods --selector="release={{ .Release.Name }}" --watch

charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml

@@ -0,0 +1,26 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/* Expand the name of the chart.*/}}
+{{- define "azuredisk.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/* labels for helm resources */}}
+{{- define "azuredisk.labels" -}}
+labels:
+  app.kubernetes.io/instance: "{{ .Release.Name }}"
+  app.kubernetes.io/managed-by: "{{ .Release.Service }}"
+  app.kubernetes.io/name: "{{ template "azuredisk.name" . }}"
+  app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
+  helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+{{- end -}}
+
+{{/* pull secrets for containers */}}
+{{- define "azuredisk.pullSecrets" -}}
+{{- if .Values.imagePullSecrets }}
+imagePullSecrets:
+{{- range .Values.imagePullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end }}
+{{- end -}}