Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cleanup: remove metrics-address on driver daemonset on the node #588

Merged
merged 1 commit into from
Mar 7, 2023
Merged

cleanup: remove metrics-address on driver daemonset on the node #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion charts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | {} |
Expand Down
Binary file modified charts/latest/csi-driver-smb-v0.0.0.tgz
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion charts/latest/csi-driver-smb/templates/csi-smb-node-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion charts/latest/csi-driver-smb/templates/csi-smb-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 0 additions & 1 deletion charts/latest/csi-driver-smb/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ controller:

node:
maxUnavailable: 1
metricsPort: 29645
logLevel: 5
livenessProbe:
healthPort: 29643
Expand Down
5 changes: 4 additions & 1 deletion cmd/smbplugin/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion deploy/csi-smb-node-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion deploy/csi-smb-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down