Skip to content

Commit e1c2303

Browse files
andyzhangxandyzhangx
authored
Merge pull request #3466 from andyzhangx/cut-v1.34.0
doc: cut v1.34.0 release
2 parents f94d671 + 92df719 commit e1c2303

33 files changed

+5038
-77
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ Disclaimer: Deploying this driver manually is not an officially supported Micros
1717
|Driver Version |Image | supported k8s version |
1818
|----------------|-----------------------------------------------------------|-----------------------|
1919
|`master` branch |mcr.microsoft.com/k8s/csi/azuredisk-csi:latest | 1.21+ |
20+
|v1.34.0 |mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.0 | 1.21+ |
2021
|v1.33.7 |mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.33.7 | 1.21+ |
21-
|v1.32.11 |mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.32.11 | 1.21+ |
22-
|v1.31.12 |mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.31.12 | 1.21+ |
22+
|v1.32.11 |mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.32.11 | 1.21+ |
2323

2424
### Driver parameters
2525

‎charts/index.yaml‎

Lines changed: 83 additions & 74 deletions
Large diffs are not rendered by default.

‎charts/latest/azuredisk-csi-driver-v0.0.0.tgz‎

0 Bytes
Binary file not shown.

‎charts/v1.34.0/azuredisk-csi-driver-1.34.0.tgz‎

15.6 KB
Binary file not shown.

‎charts/v1.34.0/azuredisk-csi-driver/Chart.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: v1
2+
appVersion: 1.34.0
3+
description: Azure disk Container Storage Interface (CSI) Storage Plugin
4+
name: azuredisk-csi-driver
5+
version: 1.34.0

‎charts/v1.34.0/azuredisk-csi-driver/templates/NOTES.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
The Azure Disk CSI Driver is getting deployed to your cluster.
2+
3+
To check Azure Disk CSI Driver pods status, please run:
4+
5+
kubectl --namespace={{ .Release.Namespace }} get pods --selector="app.kubernetes.io/name={{ .Release.Name }}" --watch

‎charts/v1.34.0/azuredisk-csi-driver/templates/_helpers.tpl‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{{/* vim: set filetype=mustache: */}}
2+
3+
{{/* Expand the name of the chart.*/}}
4+
{{- define "azuredisk.name" -}}
5+
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
6+
{{- end -}}
7+
8+
{{/* labels for helm resources */}}
9+
{{- define "azuredisk.labels" -}}
10+
labels:
11+
app.kubernetes.io/instance: "{{ .Release.Name }}"
12+
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
13+
app.kubernetes.io/name: "{{ template "azuredisk.name" . }}"
14+
app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
15+
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
16+
{{- end -}}
17+
18+
{{/* pull secrets for containers */}}
19+
{{- define "azuredisk.pullSecrets" -}}
20+
{{- if .Values.imagePullSecrets }}
21+
imagePullSecrets:
22+
{{- range .Values.imagePullSecrets }}
23+
- name: {{ . }}
24+
{{- end }}
25+
{{- end }}
26+
{{- end -}}

‎charts/v1.34.0/azuredisk-csi-driver/templates/crd-csi-snapshot.yaml‎

Lines changed: 953 additions & 0 deletions
Large diffs are not rendered by default.

‎charts/v1.34.0/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml‎

Lines changed: 342 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,342 @@
1+
kind: Deployment
2+
apiVersion: apps/v1
3+
metadata:
4+
name: {{ .Values.controller.name }}
5+
namespace: {{ .Release.Namespace }}
6+
{{ include "azuredisk.labels" . | indent 2 }}
7+
{{- with .Values.controller.labels }}
8+
{{ . | toYaml | indent 4 }}
9+
{{- end }}
10+
{{- with .Values.controller.annotations }}
11+
annotations:
12+
{{ . | toYaml | indent 4 }}
13+
{{- end }}
14+
spec:
15+
replicas: {{ .Values.controller.replicas }}
16+
selector:
17+
matchLabels:
18+
app: {{ .Values.controller.name }}
19+
template:
20+
metadata:
21+
{{ include "azuredisk.labels" . | indent 6 }}
22+
app: {{ .Values.controller.name }}
23+
{{- if .Values.workloadIdentity.clientID }}
24+
azure.workload.identity/use: "true"
25+
{{- end }}
26+
{{- with .Values.controller.podLabels }}
27+
{{ toYaml . | indent 8 }}
28+
{{- end }}
29+
{{- with .Values.controller.podAnnotations }}
30+
annotations:
31+
{{ toYaml . | indent 8 }}
32+
{{- end }}
33+
spec:
34+
hostNetwork: {{ .Values.controller.hostNetwork }}
35+
serviceAccountName: {{ .Values.serviceAccount.controller }}
36+
nodeSelector:
37+
kubernetes.io/os: linux
38+
{{- with .Values.controller.nodeSelector }}
39+
{{ toYaml . | indent 8 }}
40+
{{- end }}
41+
# runOnControlPlane=true or runOnMaster=true only takes effect if affinity is not set
42+
{{- if tpl "{{ .Values.controller.affinity }}" . | contains "nodeSelectorTerms" }}
43+
{{- with .Values.controller.affinity }}
44+
affinity:
45+
{{ toYaml . | indent 8 }}
46+
{{- end }}
47+
{{- else if or .Values.controller.runOnControlPlane .Values.controller.runOnMaster}}
48+
affinity:
49+
nodeAffinity:
50+
requiredDuringSchedulingIgnoredDuringExecution:
51+
nodeSelectorTerms:
52+
- matchExpressions:
53+
{{- if .Values.controller.runOnControlPlane}}
54+
- key: node-role.kubernetes.io/control-plane
55+
operator: Exists
56+
{{- end}}
57+
{{- if .Values.controller.runOnMaster}}
58+
- key: node-role.kubernetes.io/master
59+
operator: Exists
60+
{{- end}}
61+
{{- end }}
62+
priorityClassName: system-cluster-critical
63+
securityContext:
64+
seccompProfile:
65+
type: RuntimeDefault
66+
{{- with .Values.controller.tolerations }}
67+
tolerations:
68+
{{ toYaml . | indent 8 }}
69+
{{- end }}
70+
{{- include "azuredisk.pullSecrets" . | indent 6 }}
71+
containers:
72+
- name: csi-provisioner
73+
{{- if hasPrefix "/" .Values.image.csiProvisioner.repository }}
74+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.csiProvisioner.repository }}:{{ .Values.image.csiProvisioner.tag }}"
75+
{{- else }}
76+
image: "{{ .Values.image.csiProvisioner.repository }}:{{ .Values.image.csiProvisioner.tag }}"
77+
{{- end }}
78+
args:
79+
{{- if .Values.controller.featureGates.csiProvisioner }}
80+
- "--feature-gates={{ join "," .Values.controller.featureGates.csiProvisioner }}"
81+
{{- end }}
82+
- "--csi-address=$(ADDRESS)"
83+
- "--v=2"
84+
- "--timeout=30s"
85+
- "--leader-election"
86+
- "--leader-election-namespace={{ .Release.Namespace }}"
87+
- "--worker-threads={{ .Values.controller.provisionerWorkerThreads }}"
88+
- "--extra-create-metadata=true"
89+
- "--strict-topology=true"
90+
- "--kube-api-qps=50"
91+
- "--kube-api-burst=100"
92+
- "--retry-interval-max=30m"
93+
env:
94+
- name: ADDRESS
95+
value: /csi/csi.sock
96+
volumeMounts:
97+
- mountPath: /csi
98+
name: socket-dir
99+
resources: {{- toYaml .Values.controller.resources.csiProvisioner | nindent 12 }}
100+
securityContext:
101+
capabilities:
102+
drop:
103+
- ALL
104+
- name: csi-attacher
105+
{{- if hasPrefix "/" .Values.image.csiAttacher.repository }}
106+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.csiAttacher.repository }}:{{ .Values.image.csiAttacher.tag }}"
107+
{{- else }}
108+
image: "{{ .Values.image.csiAttacher.repository }}:{{ .Values.image.csiAttacher.tag }}"
109+
{{- end }}
110+
args:
111+
- "-v=2"
112+
- "-csi-address=$(ADDRESS)"
113+
- "-timeout=600s"
114+
- "-leader-election"
115+
- "--leader-election-namespace={{ .Release.Namespace }}"
116+
- "-worker-threads={{ .Values.controller.attacherWorkerThreads }}"
117+
- "-kube-api-qps=200"
118+
- "-kube-api-burst=400"
119+
env:
120+
- name: ADDRESS
121+
value: /csi/csi.sock
122+
volumeMounts:
123+
- mountPath: /csi
124+
name: socket-dir
125+
resources: {{- toYaml .Values.controller.resources.csiAttacher | nindent 12 }}
126+
securityContext:
127+
capabilities:
128+
drop:
129+
- ALL
130+
- name: csi-snapshotter
131+
{{- if hasPrefix "/" .Values.snapshot.image.csiSnapshotter.repository }}
132+
image: "{{ .Values.image.baseRepo }}{{ .Values.snapshot.image.csiSnapshotter.repository }}:{{ .Values.snapshot.image.csiSnapshotter.tag }}"
133+
{{- else }}
134+
image: "{{ .Values.snapshot.image.csiSnapshotter.repository }}:{{ .Values.snapshot.image.csiSnapshotter.tag }}"
135+
{{- end }}
136+
args:
137+
- "-csi-address=$(ADDRESS)"
138+
- "-leader-election"
139+
- "--leader-election-namespace={{ .Release.Namespace }}"
140+
- "-v=2"
141+
- "--timeout=1200s"
142+
- "--extra-create-metadata=true"
143+
- "--retry-interval-max=30m"
144+
- "--worker-threads=250"
145+
env:
146+
- name: ADDRESS
147+
value: /csi/csi.sock
148+
volumeMounts:
149+
- name: socket-dir
150+
mountPath: /csi
151+
resources: {{- toYaml .Values.controller.resources.csiSnapshotter | nindent 12 }}
152+
securityContext:
153+
capabilities:
154+
drop:
155+
- ALL
156+
- name: csi-resizer
157+
{{- if hasPrefix "/" .Values.image.csiResizer.repository }}
158+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.csiResizer.repository }}:{{ .Values.image.csiResizer.tag }}"
159+
{{- else }}
160+
image: "{{ .Values.image.csiResizer.repository }}:{{ .Values.image.csiResizer.tag }}"
161+
{{- end }}
162+
args:
163+
- "-csi-address=$(ADDRESS)"
164+
- "-v=2"
165+
- "-leader-election"
166+
- "--leader-election-namespace={{ .Release.Namespace }}"
167+
- '-handle-volume-inuse-error=false'
168+
{{- if .Values.controller.featureGates.csiResizer }}
169+
- "--feature-gates={{ join "," .Values.controller.featureGates.csiResizer }}"
170+
{{- end }}
171+
- "-timeout=240s"
172+
- "--retry-interval-max=30m"
173+
env:
174+
- name: ADDRESS
175+
value: /csi/csi.sock
176+
volumeMounts:
177+
- name: socket-dir
178+
mountPath: /csi
179+
resources: {{- toYaml .Values.controller.resources.csiResizer | nindent 12 }}
180+
securityContext:
181+
capabilities:
182+
drop:
183+
- ALL
184+
- name: liveness-probe
185+
{{- if hasPrefix "/" .Values.image.livenessProbe.repository }}
186+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
187+
{{- else }}
188+
image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
189+
{{- end }}
190+
args:
191+
- --csi-address=/csi/csi.sock
192+
- --probe-timeout=3s
193+
{{- if eq .Values.controller.hostNetwork true }}
194+
- --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }}
195+
{{- else }}
196+
- --health-port={{ .Values.controller.livenessProbe.healthPort }}
197+
{{- end }}
198+
- --v=2
199+
volumeMounts:
200+
- name: socket-dir
201+
mountPath: /csi
202+
resources: {{- toYaml .Values.controller.resources.livenessProbe | nindent 12 }}
203+
securityContext:
204+
capabilities:
205+
drop:
206+
- ALL
207+
{{- if eq .Values.controller.enableTrafficManager true }}
208+
- image: mcr.microsoft.com/aks/ccp/ccp-auto-thrust:master.250307.1
209+
imagePullPolicy: IfNotPresent
210+
name: proxy
211+
command:
212+
- /ccp-auto-thrust
213+
args:
214+
- "--port={{ .Values.controller.trafficManagerPort }}"
215+
ports:
216+
- containerPort: {{ .Values.controller.trafficManagerPort }}
217+
protocol: TCP
218+
securityContext:
219+
capabilities:
220+
drop:
221+
- ALL
222+
{{- end }}
223+
- name: azuredisk
224+
{{- if hasPrefix "/" .Values.image.azuredisk.repository }}
225+
image: "{{ .Values.image.baseRepo }}{{ .Values.image.azuredisk.repository }}:{{ .Values.image.azuredisk.tag }}"
226+
{{- else }}
227+
image: "{{ .Values.image.azuredisk.repository }}:{{ .Values.image.azuredisk.tag }}"
228+
{{- end }}
229+
args:
230+
- "--v={{ .Values.controller.logLevel }}"
231+
- "--endpoint=$(CSI_ENDPOINT)"
232+
- "--metrics-address=0.0.0.0:{{ .Values.controller.metricsPort }}"
233+
- "--disable-avset-nodes={{ .Values.controller.disableAvailabilitySetNodes }}"
234+
- "--vm-type={{ .Values.controller.vmType }}"
235+
- "--drivername={{ .Values.driver.name }}"
236+
- "--cloud-config-secret-name={{ .Values.controller.cloudConfigSecretName }}"
237+
- "--cloud-config-secret-namespace={{ .Values.controller.cloudConfigSecretNamespace }}"
238+
- "--custom-user-agent={{ .Values.driver.customUserAgent }}"
239+
- "--user-agent-suffix={{ .Values.driver.userAgentSuffix }}"
240+
- "--allow-empty-cloud-config={{ .Values.controller.allowEmptyCloudConfig }}"
241+
- "--vmss-cache-ttl-seconds={{ .Values.controller.vmssCacheTTLInSeconds }}"
242+
- "--enable-traffic-manager={{ .Values.controller.enableTrafficManager }}"
243+
- "--traffic-manager-port={{ .Values.controller.trafficManagerPort }}"
244+
- "--enable-otel-tracing={{ .Values.controller.otelTracing.enabled }}"
245+
- "--check-disk-lun-collision=true"
246+
- "--vmss-detach-timeout-seconds={{ .Values.controller.VMSSDetachTimeoutInSeconds }}"
247+
{{- range $value := .Values.controller.extraArgs }}
248+
- {{ $value | quote }}
249+
{{- end }}
250+
ports:
251+
- containerPort: {{ .Values.controller.metricsPort }}
252+
name: metrics
253+
protocol: TCP
254+
{{- if ne .Values.controller.hostNetwork true }}
255+
- containerPort: {{ .Values.controller.livenessProbe.healthPort }}
256+
name: healthz
257+
protocol: TCP
258+
{{- end }}
259+
livenessProbe:
260+
failureThreshold: 5
261+
httpGet:
262+
path: /healthz
263+
{{- if eq .Values.controller.hostNetwork true }}
264+
host: localhost
265+
port: {{ .Values.controller.livenessProbe.healthPort }}
266+
{{- else }}
267+
port: healthz
268+
{{- end }}
269+
initialDelaySeconds: 30
270+
timeoutSeconds: 10
271+
periodSeconds: 30
272+
env:
273+
- name: AZURE_CREDENTIAL_FILE
274+
valueFrom:
275+
configMapKeyRef:
276+
name: {{ .Values.azureCredentialFileConfigMap }}
277+
key: path
278+
optional: true
279+
- name: CSI_ENDPOINT
280+
value: unix:///csi/csi.sock
281+
{{- if ne .Values.driver.httpsProxy "" }}
282+
- name: HTTPS_PROXY
283+
value: {{ .Values.driver.httpsProxy }}
284+
{{- end }}
285+
{{- if ne .Values.driver.httpProxy "" }}
286+
- name: HTTP_PROXY
287+
value: {{ .Values.driver.httpProxy }}
288+
{{- end }}
289+
{{- if ne .Values.driver.noProxy "" }}
290+
- name: NO_PROXY
291+
value: {{ .Values.driver.noProxy }}
292+
{{- end }}
293+
- name: AZURE_GO_SDK_LOG_LEVEL
294+
value: {{ .Values.driver.azureGoSDKLogLevel }}
295+
{{- if eq .Values.cloud "AzureStackCloud" }}
296+
- name: AZURE_ENVIRONMENT_FILEPATH
297+
value: /etc/kubernetes/azurestackcloud.json
298+
{{- end }}
299+
{{- if .Values.controller.otelTracing.enabled }}
300+
- name: OTEL_SERVICE_NAME
301+
value: {{ .Values.controller.otelTracing.otelServiceName }}
302+
- name: OTEL_EXPORTER_OTLP_ENDPOINT
303+
value: {{ .Values.controller.otelTracing.otelExporterEndpoint }}
304+
{{- end }}
305+
imagePullPolicy: {{ .Values.image.azuredisk.pullPolicy }}
306+
volumeMounts:
307+
- mountPath: /csi
308+
name: socket-dir
309+
- mountPath: /etc/kubernetes/
310+
name: azure-cred
311+
{{- if or (eq .Values.cloud "AzureStackCloud") (eq .Values.linux.distro "fedora") }}
312+
- name: ssl
313+
mountPath: /etc/ssl/certs
314+
readOnly: true
315+
{{- end }}
316+
{{- if eq .Values.linux.distro "fedora" }}
317+
- name: ssl-pki
318+
mountPath: /etc/pki/ca-trust/extracted
319+
readOnly: true
320+
{{- end }}
321+
resources: {{- toYaml .Values.controller.resources.azuredisk | nindent 12 }}
322+
securityContext:
323+
capabilities:
324+
drop:
325+
- ALL
326+
volumes:
327+
- name: socket-dir
328+
emptyDir: {}
329+
- name: azure-cred
330+
hostPath:
331+
path: /etc/kubernetes/
332+
type: DirectoryOrCreate
333+
{{- if or (eq .Values.cloud "AzureStackCloud") (eq .Values.linux.distro "fedora") }}
334+
- name: ssl
335+
hostPath:
336+
path: /etc/ssl/certs
337+
{{- end }}
338+
{{- if eq .Values.linux.distro "fedora" }}
339+
- name: ssl-pki
340+
hostPath:
341+
path: /etc/pki/ca-trust/extracted
342+
{{- end }}

0 commit comments

Comments
 (0)