Skip to content

Commit e9182e5

Browse files
cvvzcvvz
committed
Merge branch 'master' of https://github.com/kubernetes-sigs/blob-csi-driver into fix-1236
2 parents 5f1b421 + 4effa8e commit e9182e5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+3362
-178
lines changed

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

-1 Bytes
Binary file not shown.

‎charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ spec:
9191
args:
9292
- --csi-address=/csi/csi.sock
9393
- --probe-timeout=3s
94-
- --health-port={{ .Values.controller.livenessProbe.healthPort }}
94+
- --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }}
9595
imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
9696
volumeMounts:
9797
- name: socket-dir
@@ -114,17 +114,15 @@ spec:
114114
- "--cloud-config-secret-namespace={{ .Values.controller.cloudConfigSecretNamespace }}"
115115
- "--allow-empty-cloud-config={{ .Values.controller.allowEmptyCloudConfig }}"
116116
ports:
117-
- containerPort: {{ .Values.controller.livenessProbe.healthPort }}
118-
name: healthz
119-
protocol: TCP
120117
- containerPort: {{ .Values.controller.metricsPort }}
121118
name: metrics
122119
protocol: TCP
123120
livenessProbe:
124121
failureThreshold: 5
125122
httpGet:
123+
host: localhost
126124
path: /healthz
127-
port: healthz
125+
port: {{ .Values.controller.livenessProbe.healthPort }}
128126
initialDelaySeconds: 30
129127
timeoutSeconds: 10
130128
periodSeconds: 30

‎charts/latest/blob-csi-driver/templates/csi-blob-node.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ spec:
120120
args:
121121
- --csi-address=/csi/csi.sock
122122
- --probe-timeout=3s
123-
- --health-port={{ .Values.node.livenessProbe.healthPort }}
123+
- --http-endpoint=localhost:{{ .Values.node.livenessProbe.healthPort }}
124124
- --v=2
125125
resources: {{- toYaml .Values.node.resources.livenessProbe | nindent 12 }}
126126
- name: node-driver-registrar
@@ -176,15 +176,12 @@ spec:
176176
- "--allow-inline-volume-key-access-with-idenitity={{ .Values.node.allowInlineVolumeKeyAccessWithIdentity }}"
177177
- "--enable-aznfs-mount={{ .Values.node.enableAznfsMount }}"
178178
- "--metrics-address=0.0.0.0:{{ .Values.node.metricsPort }}"
179-
ports:
180-
- containerPort: {{ .Values.node.livenessProbe.healthPort }}
181-
name: healthz
182-
protocol: TCP
183179
livenessProbe:
184180
failureThreshold: 5
185181
httpGet:
182+
host: localhost
186183
path: /healthz
187-
port: healthz
184+
port: {{ .Values.node.livenessProbe.healthPort }}
188185
initialDelaySeconds: 30
189186
timeoutSeconds: 10
190187
periodSeconds: 30

‎charts/v1.23.3/blob-csi-driver-v1.23.3.tgz

5 Bytes
Binary file not shown.

‎charts/v1.23.3/blob-csi-driver/templates/csi-blob-controller.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ spec:
9191
args:
9292
- --csi-address=/csi/csi.sock
9393
- --probe-timeout=3s
94-
- --health-port={{ .Values.controller.livenessProbe.healthPort }}
94+
- --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }}
9595
imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
9696
volumeMounts:
9797
- name: socket-dir
@@ -114,17 +114,15 @@ spec:
114114
- "--cloud-config-secret-namespace={{ .Values.controller.cloudConfigSecretNamespace }}"
115115
- "--allow-empty-cloud-config={{ .Values.controller.allowEmptyCloudConfig }}"
116116
ports:
117-
- containerPort: {{ .Values.controller.livenessProbe.healthPort }}
118-
name: healthz
119-
protocol: TCP
120117
- containerPort: {{ .Values.controller.metricsPort }}
121118
name: metrics
122119
protocol: TCP
123120
livenessProbe:
124121
failureThreshold: 5
125122
httpGet:
123+
host: localhost
126124
path: /healthz
127-
port: healthz
125+
port: {{ .Values.controller.livenessProbe.healthPort }}
128126
initialDelaySeconds: 30
129127
timeoutSeconds: 10
130128
periodSeconds: 30

‎charts/v1.23.3/blob-csi-driver/templates/csi-blob-node.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ spec:
118118
args:
119119
- --csi-address=/csi/csi.sock
120120
- --probe-timeout=3s
121-
- --health-port={{ .Values.node.livenessProbe.healthPort }}
121+
- --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }}
122122
- --v=2
123123
resources: {{- toYaml .Values.node.resources.livenessProbe | nindent 12 }}
124124
- name: node-driver-registrar
@@ -173,15 +173,12 @@ spec:
173173
- "--mount-permissions={{ .Values.node.mountPermissions }}"
174174
- "--allow-inline-volume-key-access-with-idenitity={{ .Values.node.allowInlineVolumeKeyAccessWithIdentity }}"
175175
- "--enable-aznfs-mount={{ .Values.node.enableAznfsMount }}"
176-
ports:
177-
- containerPort: {{ .Values.node.livenessProbe.healthPort }}
178-
name: healthz
179-
protocol: TCP
180176
livenessProbe:
181177
failureThreshold: 5
182178
httpGet:
179+
host: localhost
183180
path: /healthz
184-
port: healthz
181+
port: {{ .Values.node.livenessProbe.healthPort }}
185182
initialDelaySeconds: 30
186183
timeoutSeconds: 10
187184
periodSeconds: 30

‎charts/v1.24.0/blob-csi-driver-v1.24.0.tgz

6 Bytes
Binary file not shown.

‎charts/v1.24.0/blob-csi-driver/templates/csi-blob-controller.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ spec:
9191
args:
9292
- --csi-address=/csi/csi.sock
9393
- --probe-timeout=3s
94-
- --health-port={{ .Values.controller.livenessProbe.healthPort }}
94+
- --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }}
9595
imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
9696
volumeMounts:
9797
- name: socket-dir
@@ -114,17 +114,15 @@ spec:
114114
- "--cloud-config-secret-namespace={{ .Values.controller.cloudConfigSecretNamespace }}"
115115
- "--allow-empty-cloud-config={{ .Values.controller.allowEmptyCloudConfig }}"
116116
ports:
117-
- containerPort: {{ .Values.controller.livenessProbe.healthPort }}
118-
name: healthz
119-
protocol: TCP
120117
- containerPort: {{ .Values.controller.metricsPort }}
121118
name: metrics
122119
protocol: TCP
123120
livenessProbe:
124121
failureThreshold: 5
125122
httpGet:
123+
host: localhost
126124
path: /healthz
127-
port: healthz
125+
port: {{ .Values.controller.livenessProbe.healthPort }}
128126
initialDelaySeconds: 30
129127
timeoutSeconds: 10
130128
periodSeconds: 30

‎charts/v1.24.0/blob-csi-driver/templates/csi-blob-node.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ spec:
118118
args:
119119
- --csi-address=/csi/csi.sock
120120
- --probe-timeout=3s
121-
- --health-port={{ .Values.node.livenessProbe.healthPort }}
121+
- --http-endpoint=localhost:{{ .Values.node.livenessProbe.healthPort }}
122122
- --v=2
123123
resources: {{- toYaml .Values.node.resources.livenessProbe | nindent 12 }}
124124
- name: node-driver-registrar
@@ -174,15 +174,12 @@ spec:
174174
- "--allow-inline-volume-key-access-with-idenitity={{ .Values.node.allowInlineVolumeKeyAccessWithIdentity }}"
175175
- "--enable-aznfs-mount={{ .Values.node.enableAznfsMount }}"
176176
- "--metrics-address=0.0.0.0:{{ .Values.node.metricsPort }}"
177-
ports:
178-
- containerPort: {{ .Values.node.livenessProbe.healthPort }}
179-
name: healthz
180-
protocol: TCP
181177
livenessProbe:
182178
failureThreshold: 5
183179
httpGet:
180+
host: localhost
184181
path: /healthz
185-
port: healthz
182+
port: {{ .Values.node.livenessProbe.healthPort }}
186183
initialDelaySeconds: 30
187184
timeoutSeconds: 10
188185
periodSeconds: 30

‎deploy/csi-blob-controller.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
args:
6363
- --csi-address=/csi/csi.sock
6464
- --probe-timeout=3s
65-
- --health-port=29632
65+
- --http-endpoint=localhost:29632
6666
volumeMounts:
6767
- name: socket-dir
6868
mountPath: /csi
@@ -81,17 +81,15 @@ spec:
8181
- "--metrics-address=0.0.0.0:29634"
8282
- "--user-agent-suffix=OSS-kubectl"
8383
ports:
84-
- containerPort: 29632
85-
name: healthz
86-
protocol: TCP
8784
- containerPort: 29634
8885
name: metrics
8986
protocol: TCP
9087
livenessProbe:
9188
failureThreshold: 5
9289
httpGet:
90+
host: localhost
9391
path: /healthz
94-
port: healthz
92+
port: 29632
9593
initialDelaySeconds: 30
9694
timeoutSeconds: 10
9795
periodSeconds: 30

‎deploy/csi-blob-node.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ spec:
8181
args:
8282
- --csi-address=/csi/csi.sock
8383
- --probe-timeout=3s
84-
- --health-port=29633
84+
- --http-endpoint=localhost:29633
8585
- --v=2
8686
resources:
8787
limits:
@@ -131,15 +131,12 @@ spec:
131131
- "--user-agent-suffix=OSS-kubectl"
132132
- "--metrics-address=0.0.0.0:29635"
133133
- "--enable-aznfs-mount=true"
134-
ports:
135-
- containerPort: 29633
136-
name: healthz
137-
protocol: TCP
138134
livenessProbe:
139135
failureThreshold: 5
140136
httpGet:
137+
host: localhost
141138
path: /healthz
142-
port: healthz
139+
port: 29633
143140
initialDelaySeconds: 30
144141
timeoutSeconds: 10
145142
periodSeconds: 30

‎deploy/v1.23.3/csi-blob-controller.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
args:
6363
- --csi-address=/csi/csi.sock
6464
- --probe-timeout=3s
65-
- --health-port=29632
65+
- --http-endpoint=localhost:29632
6666
volumeMounts:
6767
- name: socket-dir
6868
mountPath: /csi
@@ -81,17 +81,15 @@ spec:
8181
- "--metrics-address=0.0.0.0:29634"
8282
- "--user-agent-suffix=OSS-kubectl"
8383
ports:
84-
- containerPort: 29632
85-
name: healthz
86-
protocol: TCP
8784
- containerPort: 29634
8885
name: metrics
8986
protocol: TCP
9087
livenessProbe:
9188
failureThreshold: 5
9289
httpGet:
90+
host: localhost
9391
path: /healthz
94-
port: healthz
92+
port: 29632
9593
initialDelaySeconds: 30
9694
timeoutSeconds: 10
9795
periodSeconds: 30

‎deploy/v1.23.3/csi-blob-node.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ spec:
8181
args:
8282
- --csi-address=/csi/csi.sock
8383
- --probe-timeout=3s
84-
- --health-port=29633
84+
- --http-endpoint=localhost:29633
8585
- --v=2
8686
resources:
8787
limits:
@@ -129,15 +129,12 @@ spec:
129129
- "--blobfuse-proxy-endpoint=$(BLOBFUSE_PROXY_ENDPOINT)"
130130
- "--nodeid=$(KUBE_NODE_NAME)"
131131
- "--user-agent-suffix=OSS-kubectl"
132-
ports:
133-
- containerPort: 29633
134-
name: healthz
135-
protocol: TCP
136132
livenessProbe:
137133
failureThreshold: 5
138134
httpGet:
135+
host: localhost
139136
path: /healthz
140-
port: healthz
137+
port: 29633
141138
initialDelaySeconds: 30
142139
timeoutSeconds: 10
143140
periodSeconds: 30

‎deploy/v1.24.0/csi-blob-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
args:
6363
- --csi-address=/csi/csi.sock
6464
- --probe-timeout=3s
65-
- --health-port=29632
65+
- --http-endpoint=localhost:29632
6666
volumeMounts:
6767
- name: socket-dir
6868
mountPath: /csi

‎deploy/v1.24.0/csi-blob-node.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ spec:
8181
args:
8282
- --csi-address=/csi/csi.sock
8383
- --probe-timeout=3s
84-
- --health-port=29633
84+
- --http-endpoint=localhost:29633
8585
- --v=2
8686
resources:
8787
limits:
@@ -131,15 +131,12 @@ spec:
131131
- "--user-agent-suffix=OSS-kubectl"
132132
- "--metrics-address=0.0.0.0:29635"
133133
- "--enable-aznfs-mount=true"
134-
ports:
135-
- containerPort: 29633
136-
name: healthz
137-
protocol: TCP
138134
livenessProbe:
139135
failureThreshold: 5
140136
httpGet:
137+
host: localhost
141138
path: /healthz
142-
port: healthz
139+
port: 29633
143140
initialDelaySeconds: 30
144141
timeoutSeconds: 10
145142
periodSeconds: 30

‎go.mod

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ toolchain go1.21.4
66

77
require (
88
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
9-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.10.0
9+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.0
1010
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1
1111
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.4.0
1212
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
@@ -38,7 +38,7 @@ require (
3838
k8s.io/mount-utils v0.29.0
3939
k8s.io/utils v0.0.0-20231127182322-b307cd553661
4040
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240319093822-58cad130d9dc
41-
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.2
41+
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.3
4242
sigs.k8s.io/yaml v1.4.0
4343
)
4444

@@ -131,7 +131,7 @@ require (
131131
golang.org/x/crypto v0.21.0 // indirect
132132
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
133133
golang.org/x/oauth2 v0.11.0 // indirect
134-
golang.org/x/sync v0.6.0
134+
golang.org/x/sync v0.7.0
135135
golang.org/x/sys v0.18.0 // indirect
136136
golang.org/x/term v0.18.0 // indirect
137137
golang.org/x/text v0.14.0 // indirect
@@ -156,12 +156,14 @@ require (
156156
k8s.io/kubelet v0.29.2 // indirect
157157
k8s.io/pod-security-admission v0.29.0
158158
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
159-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.5
159+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.10
160160
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
161161
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
162162
)
163163

164164
require (
165+
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.12.0 // indirect
166+
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
165167
github.com/distribution/reference v0.5.0 // indirect
166168
github.com/gorilla/websocket v1.5.0 // indirect
167169
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect

0 commit comments

Comments
 (0)