Skip to content

Commit 4be5792

Browse files
committed
cleanup: remove metrics-address on driver daemonset on the node
1 parent 139479a commit 4be5792

File tree

6 files changed

+4
-5
lines changed

6 files changed

+4
-5
lines changed

charts/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ The following table lists the configurable parameters of the latest Azure Blob S
120120
| `node.allowEmptyCloudConfig` | Whether allow running node driver without cloud config | `true`
121121
| `node.allowInlineVolumeKeyAccessWithIdentity` | Whether allow accessing storage account key using cluster identity for inline volume | `false`
122122
| `node.maxUnavailable` | `maxUnavailable` value of driver node daemonset | `1`
123-
| `node.metricsPort` | metrics port of csi-blob-node | `29635` |
124123
| `node.livenessProbe.healthPort ` | health check port for liveness probe | `29633` |
125124
| `node.logLevel` | node driver log level | `5` |
126125
| `node.mountPermissions` | mounted folder permissions (only applies for NFS) | `0777`
-8 Bytes
Binary file not shown.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ spec:
150150
- "--blobfuse-proxy-endpoint=$(BLOBFUSE_PROXY_ENDPOINT)"
151151
- "--enable-blobfuse-proxy={{ .Values.node.enableBlobfuseProxy }}"
152152
- "--nodeid=$(KUBE_NODE_NAME)"
153-
- "--metrics-address=0.0.0.0:{{ .Values.node.metricsPort }}"
154153
- "--drivername={{ .Values.driver.name }}"
155154
- "--cloud-config-secret-name={{ .Values.node.cloudConfigSecretName }}"
156155
- "--cloud-config-secret-namespace={{ .Values.node.cloudConfigSecretNamespace }}"

charts/latest/blob-csi-driver/values.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ node:
111111
allowEmptyCloudConfig: true
112112
allowInlineVolumeKeyAccessWithIdentity: false
113113
maxUnavailable: 1
114-
metricsPort: 29635
115114
livenessProbe:
116115
healthPort: 29633
117116
logLevel: 5

deploy/csi-blob-node.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ spec:
119119
- "--enable-blobfuse-proxy=false"
120120
- "--blobfuse-proxy-endpoint=$(BLOBFUSE_PROXY_ENDPOINT)"
121121
- "--nodeid=$(KUBE_NODE_NAME)"
122-
- "--metrics-address=0.0.0.0:29635"
123122
- "--user-agent-suffix=OSS-kubectl"
124123
ports:
125124
- containerPort: 29633

pkg/blobplugin/main.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ var (
4040
blobfuseProxyEndpoint = flag.String("blobfuse-proxy-endpoint", "unix://tmp/blobfuse-proxy.sock", "blobfuse-proxy endpoint")
4141
nodeID = flag.String("nodeid", "", "node id")
4242
version = flag.Bool("version", false, "Print the version and exit.")
43-
metricsAddress = flag.String("metrics-address", "0.0.0.0:29634", "export the metrics")
43+
metricsAddress = flag.String("metrics-address", "", "export the metrics")
4444
kubeconfig = flag.String("kubeconfig", "", "Absolute path to the kubeconfig file. Required only when running out of cluster.")
4545
driverName = flag.String("drivername", blob.DefaultDriverName, "name of the driver")
4646
enableBlobfuseProxy = flag.Bool("enable-blobfuse-proxy", false, "using blobfuse proxy for mounts")
@@ -106,6 +106,9 @@ func handle() {
106106
}
107107

108108
func exportMetrics() {
109+
if *metricsAddress == "" {
110+
return
111+
}
109112
l, err := net.Listen("tcp", *metricsAddress)
110113
if err != nil {
111114
klog.Warningf("failed to get listener for metrics endpoint: %v", err)

0 commit comments

Comments
 (0)