diff --git a/charts/README.md b/charts/README.md index 372278c7695..86f574ca9b9 100644 --- a/charts/README.md +++ b/charts/README.md @@ -96,7 +96,6 @@ The following table lists the configurable parameters of the latest SMB CSI Driv | `controller.nodeSelector` | controller pod node selector | `{}` | | `controller.tolerations` | controller pod tolerations | `[]` | | `node.maxUnavailable` | `maxUnavailable` value of csi-smb-node daemonset | `1` | -| `node.metricsPort` | metrics port of csi-smb-node | `29645` | | `node.livenessProbe.healthPort ` | health check port for liveness probe | `29643` | | `node.logLevel` | node driver log level | `5` | | `node.affinity` | node pod affinity | {} | diff --git a/charts/latest/csi-driver-smb-v0.0.0.tgz b/charts/latest/csi-driver-smb-v0.0.0.tgz index b223394c06c..9cfa23e6e79 100644 Binary files a/charts/latest/csi-driver-smb-v0.0.0.tgz and b/charts/latest/csi-driver-smb-v0.0.0.tgz differ diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-node-windows.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-node-windows.yaml index 3d55a7ff66e..d2dafacce19 100755 --- a/charts/latest/csi-driver-smb/templates/csi-smb-node-windows.yaml +++ b/charts/latest/csi-driver-smb/templates/csi-smb-node-windows.yaml @@ -100,7 +100,6 @@ spec: - "--drivername={{ .Values.driver.name }}" - --endpoint=$(CSI_ENDPOINT) - --nodeid=$(KUBE_NODE_NAME) - - "--metrics-address=0.0.0.0:{{ .Values.node.metricsPort }}" - "--enable-get-volume-stats={{ .Values.feature.enableGetVolumeStats }}" - "--remove-smb-mapping-during-unmount={{ .Values.windows.removeSMBMappingDuringUnmount }}" ports: diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-node.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-node.yaml index 9c874060b3b..fd966ac5abc 100755 --- a/charts/latest/csi-driver-smb/templates/csi-smb-node.yaml +++ b/charts/latest/csi-driver-smb/templates/csi-smb-node.yaml @@ -102,7 +102,6 @@ spec: - "--drivername={{ .Values.driver.name }}" - "--endpoint=$(CSI_ENDPOINT)" - "--nodeid=$(KUBE_NODE_NAME)" - - "--metrics-address=0.0.0.0:{{ .Values.node.metricsPort }}" - "--enable-get-volume-stats={{ .Values.feature.enableGetVolumeStats }}" ports: - containerPort: {{ .Values.node.livenessProbe.healthPort }} diff --git a/charts/latest/csi-driver-smb/values.yaml b/charts/latest/csi-driver-smb/values.yaml index f5160dee446..2d9d6c978d7 100755 --- a/charts/latest/csi-driver-smb/values.yaml +++ b/charts/latest/csi-driver-smb/values.yaml @@ -77,7 +77,6 @@ controller: node: maxUnavailable: 1 - metricsPort: 29645 logLevel: 5 livenessProbe: healthPort: 29643 diff --git a/cmd/smbplugin/main.go b/cmd/smbplugin/main.go index d12d7e8d092..38fd41a15e6 100644 --- a/cmd/smbplugin/main.go +++ b/cmd/smbplugin/main.go @@ -39,7 +39,7 @@ var ( nodeID = flag.String("nodeid", "", "node id") driverName = flag.String("drivername", smb.DefaultDriverName, "name of the driver") ver = flag.Bool("ver", false, "Print the version and exit.") - metricsAddress = flag.String("metrics-address", "0.0.0.0:29644", "export the metrics") + metricsAddress = flag.String("metrics-address", "", "export the metrics") kubeconfig = flag.String("kubeconfig", "", "Absolute path to the kubeconfig file. Required only when running out of cluster.") enableGetVolumeStats = flag.Bool("enable-get-volume-stats", true, "allow GET_VOLUME_STATS on agent node") removeSMBMappingDuringUnmount = flag.Bool("remove-smb-mapping-during-unmount", true, "remove SMBMapping during unmount on Windows node") @@ -78,6 +78,9 @@ func handle() { } func exportMetrics() { + if *metricsAddress == "" { + return + } l, err := net.Listen("tcp", *metricsAddress) if err != nil { klog.Warningf("failed to get listener for metrics endpoint: %v", err) diff --git a/deploy/csi-smb-node-windows.yaml b/deploy/csi-smb-node-windows.yaml index fec7de83e2a..cf486448176 100644 --- a/deploy/csi-smb-node-windows.yaml +++ b/deploy/csi-smb-node-windows.yaml @@ -88,7 +88,6 @@ spec: - --v=5 - --endpoint=$(CSI_ENDPOINT) - --nodeid=$(KUBE_NODE_NAME) - - "--metrics-address=0.0.0.0:29645" - "--remove-smb-mapping-during-unmount=true" ports: - containerPort: 29643 diff --git a/deploy/csi-smb-node.yaml b/deploy/csi-smb-node.yaml index 12d0528762b..e5a1cd0108b 100644 --- a/deploy/csi-smb-node.yaml +++ b/deploy/csi-smb-node.yaml @@ -79,7 +79,6 @@ spec: - "--v=5" - "--endpoint=$(CSI_ENDPOINT)" - "--nodeid=$(KUBE_NODE_NAME)" - - "--metrics-address=0.0.0.0:29645" ports: - containerPort: 29643 name: healthz