Merge pull request kubernetes-sigs#7 from RomanBednar/rebase-v1.8.0

Rebase to v1.8.0 for OCP 4.10
dobsonj · Dec 16, 2021 · f88155b · f88155b
2 parents 19be5d3 + e0b9dc6
commit f88155b
Show file tree

Hide file tree

Showing 133 changed files with 5,157 additions and 563 deletions.
diff --git a/.github/workflows/trivy.yaml b/.github/workflows/trivy.yaml
@@ -28,5 +28,5 @@ jobs:
           exit-code: '1'
           ignore-unfixed: true
           vuln-type: 'os,library'
-          severity: 'CRITICAL,HIGH'
+          severity: 'CRITICAL,HIGH,MEDIUM,LOW,UNKNOWN'
 
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
@@ -25,7 +25,7 @@ jobs:
         run: |
           # start the CSI Proxy before running tests on windows
           Start-Job -Name CSIProxy -ScriptBlock {
-            Invoke-WebRequest https://acs-mirror.azureedge.net/csi-proxy/v1.0.0/binaries/csi-proxy-v1.0.0.tar.gz -OutFile csi-proxy.tar.gz;
+            Invoke-WebRequest https://acs-mirror.azureedge.net/csi-proxy/v1.0.2/binaries/csi-proxy-v1.0.2.tar.gz -OutFile csi-proxy.tar.gz;
             tar -xvf csi-proxy.tar.gz
             .\bin\csi-proxy.exe --kubelet-path $pwd
           };

diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ GIT_COMMIT ?= $(shell git rev-parse HEAD)
 REGISTRY ?= andyzhangx
 REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
 IMAGE_NAME ?= azurefile-csi
-IMAGE_VERSION ?= v1.7.0
+IMAGE_VERSION ?= v1.8.0
 # Use a custom version for E2E tests if we are testing in CI
 ifdef CI
 ifndef PUBLISH

diff --git a/README.md b/README.md
@@ -11,10 +11,10 @@ This driver allows Kubernetes to use [Azure File](https://docs.microsoft.com/en-
 ### Container Images & Kubernetes Compatibility:
 |Driver Version  |Image                                           | supported k8s version |
 |----------------|----------------------------------------------- |-----------------------|
-|master branch   |mcr.microsoft.com/k8s/csi/azurefile-csi:latest  | 1.18+                 |
+|master branch   |mcr.microsoft.com/k8s/csi/azurefile-csi:latest  | 1.19+                 |
+|v1.8.0          |mcr.microsoft.com/k8s/csi/azurefile-csi:v1.8.0  | 1.19+                 |
 |v1.7.0          |mcr.microsoft.com/k8s/csi/azurefile-csi:v1.7.0  | 1.18+                 |
 |v1.6.0          |mcr.microsoft.com/k8s/csi/azurefile-csi:v1.6.0  | 1.18+                 |
-|v1.5.0          |mcr.microsoft.com/k8s/csi/azurefile-csi:v1.5.0  | 1.18+                 |
 
 ### Driver parameters
 Please refer to [driver parameters](./docs/driver-parameters.md)

diff --git a/charts/README.md b/charts/README.md
diff --git a/charts/index.yaml b/charts/index.yaml
@@ -3,16 +3,25 @@ entries:
   azurefile-csi-driver:
   - apiVersion: v1
     appVersion: latest
-    created: "2021-10-11T02:43:43.59088318Z"
+    created: "2021-12-04T14:04:56.612011554Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
-    digest: 85c31eb051f01f0445621be8e9961b8802b6d52bf0f02d68c41650cabb29a39d
+    digest: 2ad3c8fee576ea02983126a0ecc068904f26827b2f475275d111099bae97f58f
     name: azurefile-csi-driver
     urls:
-    - https://raw.githubusercontent.com/kubernetes-sigs/azurefile-csi-driver/master/charts/latest/azurefile-csi-driver-v1.7.0.tgz
-    version: v1.7.0
+    - https://raw.githubusercontent.com/kubernetes-sigs/azurefile-csi-driver/master/charts/latest/azurefile-csi-driver-v1.8.0.tgz
+    version: v1.8.0
+  - apiVersion: v1
+    appVersion: v1.8.0
+    created: "2021-12-04T14:04:56.627689653Z"
+    description: Azure File Container Storage Interface (CSI) Storage Plugin
+    digest: 541f66b3cd8cf6565cd4c50cedab85275821b74fb2ed15eb3d1ad8d34f64dde1
+    name: azurefile-csi-driver
+    urls:
+    - https://raw.githubusercontent.com/kubernetes-sigs/azurefile-csi-driver/master/charts/v1.8.0/azurefile-csi-driver-v1.8.0.tgz
+    version: v1.8.0
   - apiVersion: v1
     appVersion: v1.7.0
-    created: "2021-10-11T02:43:43.614171361Z"
+    created: "2021-12-04T14:04:56.626147243Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: 057b3f6ef6001d3457fbffc27f90316c981a089696abd3d38bcc8de5537dfa6f
     name: azurefile-csi-driver
@@ -21,7 +30,7 @@ entries:
     version: v1.7.0
   - apiVersion: v1
     appVersion: v1.6.0
-    created: "2021-10-11T02:43:43.613176353Z"
+    created: "2021-12-04T14:04:56.625174137Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: cc2a0dda824cdda4e8141e26878bbb481c5a52e45785a5dbf72e54f2a376e522
     name: azurefile-csi-driver
@@ -30,7 +39,7 @@ entries:
     version: v1.6.0
   - apiVersion: v1
     appVersion: v1.5.0
-    created: "2021-10-11T02:43:43.611693742Z"
+    created: "2021-12-04T14:04:56.62408433Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: 2258177477415ddecd83dc46dfd88833223623224c7fe396590b617082bcd845
     name: azurefile-csi-driver
@@ -39,7 +48,7 @@ entries:
     version: v1.5.0
   - apiVersion: v1
     appVersion: v1.4.0
-    created: "2021-10-11T02:43:43.610298831Z"
+    created: "2021-12-04T14:04:56.622890323Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: 40e9bc4ee187789166fcb7c3c82b85b33ecd3a6096266fe74e411d6b48961ece
     name: azurefile-csi-driver
@@ -48,7 +57,7 @@ entries:
     version: v1.4.0
   - apiVersion: v1
     appVersion: v1.3.0
-    created: "2021-10-11T02:43:43.608223815Z"
+    created: "2021-12-04T14:04:56.621085211Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: 12942f422b7cccbfe950bbdbd5c844f5ae4b7c292f32389cba312730a6fe9a62
     name: azurefile-csi-driver
@@ -57,7 +66,7 @@ entries:
     version: v1.3.0
   - apiVersion: v1
     appVersion: v1.2.0
-    created: "2021-10-11T02:43:43.606129199Z"
+    created: "2021-12-04T14:04:56.620238606Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: b62f44b757416a9e1f5a91e19285f5f5056ec6068802dd9cd82373bef40c9ee9
     name: azurefile-csi-driver
@@ -66,7 +75,7 @@ entries:
     version: v1.2.0
   - apiVersion: v1
     appVersion: v1.1.0
-    created: "2021-10-11T02:43:43.605159291Z"
+    created: "2021-12-04T14:04:56.619406801Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: 675d96b309a1c5c491053ebbb854c046737420929c4f0692839afdaaf0db3933
     name: azurefile-csi-driver
@@ -75,7 +84,7 @@ entries:
     version: v1.1.0
   - apiVersion: v1
     appVersion: v1.0.0
-    created: "2021-10-11T02:43:43.60370208Z"
+    created: "2021-12-04T14:04:56.618761697Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: 6fd5e54e949ef1061a08d5477bc580204c91dde8f01da195e95dd60ade209492
     name: azurefile-csi-driver
@@ -84,7 +93,7 @@ entries:
     version: v1.0.0
   - apiVersion: v1
     appVersion: v0.10.0
-    created: "2021-10-11T02:43:43.592210391Z"
+    created: "2021-12-04T14:04:56.613008861Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: 8437b70c263de3ba365d4719f1cdd976e7461d217504b43d136d985b40f2f7ef
     name: azurefile-csi-driver
@@ -93,7 +102,7 @@ entries:
     version: v0.10.0
   - apiVersion: v1
     appVersion: v0.9.0
-    created: "2021-10-11T02:43:43.602261769Z"
+    created: "2021-12-04T14:04:56.618083993Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: ff42d33b0b98ce138e95028e084ce1fe9cecde82d2b96e22ca4aaf3e6453a15b
     name: azurefile-csi-driver
@@ -102,7 +111,7 @@ entries:
     version: v0.9.0
   - apiVersion: v1
     appVersion: v0.8.0
-    created: "2021-10-11T02:43:43.600839158Z"
+    created: "2021-12-04T14:04:56.617060586Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: 6811326fbd54832ef441bd54bb5a8bf5b0ca4734da1755c84b51ae713e35fb72
     name: azurefile-csi-driver
@@ -111,7 +120,7 @@ entries:
     version: v0.8.0
   - apiVersion: v1
     appVersion: v0.7.0
-    created: "2021-10-11T02:43:43.599587048Z"
+    created: "2021-12-04T14:04:56.616222381Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: cc529dd3f6d19acc695f79cb08656ed0d8192f449eb70af3ab94d6b76c28c38d
     name: azurefile-csi-driver
@@ -120,7 +129,7 @@ entries:
     version: v0.7.0
   - apiVersion: v1
     appVersion: v0.6.0
-    created: "2021-10-11T02:43:43.59855834Z"
+    created: "2021-12-04T14:04:56.615681077Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: eb6bc5333d6ed5788c0aa6d42e14e6228c1bf72c0db44de6f60c746e6f0cd3dd
     name: azurefile-csi-driver
@@ -129,7 +138,7 @@ entries:
     version: v0.6.0
   - apiVersion: v1
     appVersion: v0.5.0
-    created: "2021-10-11T02:43:43.59727663Z"
+    created: "2021-12-04T14:04:56.615242275Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: 2d16cae9af5e306e4b3f1cba341532089e9871abe31d9ff20f6751215f908a01
     name: azurefile-csi-driver
@@ -138,7 +147,7 @@ entries:
     version: v0.5.0
   - apiVersion: v1
     appVersion: v0.4.0
-    created: "2021-10-11T02:43:43.59599892Z"
+    created: "2021-12-04T14:04:56.614766272Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: fcc251b21abb2a5aee4df751424b33705850226119c1bfbb0c741d0ce020d1f2
     name: azurefile-csi-driver
@@ -147,7 +156,7 @@ entries:
     version: v0.4.0
   - apiVersion: v1
     appVersion: 0.3.0
-    created: "2021-10-11T02:43:43.595004312Z"
+    created: "2021-12-04T14:04:56.614308069Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: d0fa02e4c7c15f106050c6d795e97b437ec8be359d33130ca02509effc1d7082
     name: azurefile-csi-driver
@@ -156,11 +165,11 @@ entries:
     version: 0.3.0
   - apiVersion: v1
     appVersion: 0.2.0
-    created: "2021-10-11T02:43:43.593729003Z"
+    created: "2021-12-04T14:04:56.613650365Z"
     description: Azure File Container Storage Interface (CSI) Storage Plugin
     digest: fde4b97c4a57b1aa6a9345e25c29eccc6b83da7746b465813473a955a4fe9896
     name: azurefile-csi-driver
     urls:
     - https://raw.githubusercontent.com/kubernetes-sigs/azurefile-csi-driver/master/charts/v0.2.0/azurefile-csi-driver-0.2.0.tgz
     version: 0.2.0
-generated: "2021-10-11T02:43:43.589402669Z"
+generated: "2021-12-04T14:04:56.610484045Z"
diff --git a/charts/latest/azurefile-csi-driver-v1.7.0.tgz b/charts/latest/azurefile-csi-driver-v1.7.0.tgz
diff --git a/charts/latest/azurefile-csi-driver-v1.8.0.tgz b/charts/latest/azurefile-csi-driver-v1.8.0.tgz
diff --git a/charts/latest/azurefile-csi-driver/Chart.yaml b/charts/latest/azurefile-csi-driver/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: latest
 description: Azure File Container Storage Interface (CSI) Storage Plugin
 name: azurefile-csi-driver
-version: v1.7.0
+version: v1.8.0
diff --git a/charts/latest/azurefile-csi-driver/templates/_helpers.tpl b/charts/latest/azurefile-csi-driver/templates/_helpers.tpl
@@ -5,16 +5,39 @@
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/* labels for helm resources */}}
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "azurefile.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common selectors.
+*/}}
+{{- define "azurefile.selectorLabels" -}}
+app.kubernetes.io/name: {{ template "azurefile.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
+
+{{/*
+Common labels.
+*/}}
 {{- define "azurefile.labels" -}}
-labels:
-  app.kubernetes.io/instance: "{{ .Release.Name }}"
-  app.kubernetes.io/managed-by: "{{ .Release.Service }}"
-  app.kubernetes.io/name: "{{ template "azurefile.name" . }}"
-  app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
-  helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+{{- include "azurefile.selectorLabels" . }}
+app.kubernetes.io/component: csi-driver
+app.kubernetes.io/part-of: {{ template "azurefile.name" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+helm.sh/chart: {{ template "azurefile.chart" . }}
+{{- if .Values.customLabels }}
+{{ toYaml .Values.customLabels }}
+{{- end }}
 {{- end -}}
 
+
 {{/* pull secrets for containers */}}
 {{- define "azurefile.pullSecrets" -}}
 {{- if .Values.imagePullSecrets }}

diff --git a/charts/latest/azurefile-csi-driver/templates/csi-azurefile-controller.yaml b/charts/latest/azurefile-csi-driver/templates/csi-azurefile-controller.yaml
@@ -3,15 +3,19 @@ apiVersion: apps/v1
 metadata:
   name: {{ .Values.controller.name }}
   namespace: {{ .Release.Namespace }}
-{{ include "azurefile.labels" . | indent 2 }}
+  labels:
+    app: {{ .Values.controller.name }}
+    {{- include "azurefile.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.controller.replicas }}
   selector:
     matchLabels:
+      {{- include "azurefile.selectorLabels" . | nindent 6 }}
       app: {{ .Values.controller.name }}
   template:
     metadata:
-{{ include "azurefile.labels" . | indent 6 }}
+      labels:
+        {{- include "azurefile.labels" . | nindent 8 }}
         app: {{ .Values.controller.name }}
     spec:
       hostNetwork: {{ .Values.controller.hostNetwork }}
@@ -54,13 +58,7 @@ spec:
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
-          resources:
-            limits:
-              cpu: 100m
-              memory: 300Mi
-            requests:
-              cpu: 10m
-              memory: 20Mi
+          resources: {{- toYaml .Values.controller.resources.csiProvisioner | nindent 12 }}
         - name: csi-attacher
 {{- if hasPrefix "/" .Values.image.csiAttacher.repository }}
           image: "{{ .Values.image.baseRepo }}{{ .Values.image.csiAttacher.repository }}:{{ .Values.image.csiAttacher.tag }}"
@@ -79,13 +77,7 @@ spec:
           volumeMounts:
           - mountPath: /csi
             name: socket-dir
-          resources:
-            limits:
-              cpu: 100m
-              memory: 200Mi
-            requests:
-              cpu: 10m
-              memory: 20Mi
+          resources: {{- toYaml .Values.controller.resources.csiAttacher | nindent 12 }}
         - name: csi-snapshotter
 {{- if eq .Values.snapshot.apiVersion "beta" }}
   {{- if hasPrefix "/" .Values.snapshot.image.csiSnapshotter.repository }}
@@ -110,13 +102,7 @@ spec:
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
-          resources:
-            limits:
-              cpu: 100m
-              memory: 100Mi
-            requests:
-              cpu: 10m
-              memory: 20Mi
+          resources: {{- toYaml .Values.controller.resources.csiSnapshotter | nindent 12 }}
         - name: csi-resizer
 {{- if hasPrefix "/" .Values.image.csiResizer.repository }}
           image: "{{ .Values.image.baseRepo }}{{ .Values.image.csiResizer.repository }}:{{ .Values.image.csiResizer.tag }}"
@@ -135,13 +121,7 @@ spec:
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
-          resources:
-            limits:
-              cpu: 100m
-              memory: 300Mi
-            requests:
-              cpu: 10m
-              memory: 20Mi
+          resources: {{- toYaml .Values.controller.resources.csiResizer | nindent 12 }}
         - name: liveness-probe
 {{- if hasPrefix "/" .Values.image.livenessProbe.repository }}
           image: "{{ .Values.image.baseRepo }}{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
@@ -157,13 +137,7 @@ spec:
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
-          resources:
-            limits:
-              cpu: 100m
-              memory: 100Mi
-            requests:
-              cpu: 10m
-              memory: 20Mi
+          resources: {{- toYaml .Values.controller.resources.livenessProbe | nindent 12 }}
         - name: azurefile
 {{- if hasPrefix "/" .Values.image.azurefile.repository }}
           image: "{{ .Values.image.baseRepo }}{{ .Values.image.azurefile.repository }}:{{ .Values.image.azurefile.tag }}"
@@ -180,6 +154,7 @@ spec:
             - "--cloud-config-secret-namespace={{ .Values.controller.cloudConfigSecretNamespace }}"
             - "--custom-user-agent={{ .Values.driver.customUserAgent }}"
             - "--user-agent-suffix={{ .Values.driver.userAgentSuffix }}"
+            - "--allow-empty-cloud-config={{ .Values.controller.allowEmptyCloudConfig }}"
           ports:
             - containerPort: {{ .Values.controller.livenessProbe.healthPort }}
               name: healthz
@@ -218,13 +193,7 @@ spec:
               mountPath: /etc/pki/ca-trust/extracted
               readOnly: true
             {{- end }}
-          resources:
-            limits:
-              cpu: 200m
-              memory: 200Mi
-            requests:
-              cpu: 10m
-              memory: 20Mi
+          resources: {{- toYaml .Values.controller.resources.azurefile | nindent 12 }}
       volumes:
         - name: socket-dir
           emptyDir: {}

diff --git a/charts/latest/azurefile-csi-driver/templates/csi-azurefile-driver.yaml b/charts/latest/azurefile-csi-driver/templates/csi-azurefile-driver.yaml
@@ -3,6 +3,8 @@ apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
   name: {{ .Values.driver.name }}
+  labels:
+    {{- include "azurefile.labels" . | nindent 4 }}
   annotations:
     csiDriver: "{{ .Values.image.azurefile.tag }}"
 {{- if eq .Values.snapshot.apiVersion "beta" }}