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

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

Merged
merged 1 commit into from
Feb 23, 2023
Merged

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

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 @@ -120,7 +120,6 @@ The following table lists the configurable parameters of the latest Azure Blob S
| `node.allowEmptyCloudConfig` | Whether allow running node driver without cloud config | `true`
| `node.allowInlineVolumeKeyAccessWithIdentity` | Whether allow accessing storage account key using cluster identity for inline volume | `false`
| `node.maxUnavailable` | `maxUnavailable` value of driver node daemonset | `1`
| `node.metricsPort` | metrics port of csi-blob-node | `29635` |
| `node.livenessProbe.healthPort ` | health check port for liveness probe | `29633` |
| `node.logLevel` | node driver log level | `5` |
| `node.mountPermissions` | mounted folder permissions (only applies for NFS) | `0777`
Expand Down
Binary file modified charts/latest/blob-csi-driver-v0.0.0.tgz
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion charts/latest/blob-csi-driver/templates/csi-blob-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ spec:
- "--blobfuse-proxy-endpoint=$(BLOBFUSE_PROXY_ENDPOINT)"
- "--enable-blobfuse-proxy={{ .Values.node.enableBlobfuseProxy }}"
- "--nodeid=$(KUBE_NODE_NAME)"
- "--metrics-address=0.0.0.0:{{ .Values.node.metricsPort }}"
- "--drivername={{ .Values.driver.name }}"
- "--cloud-config-secret-name={{ .Values.node.cloudConfigSecretName }}"
- "--cloud-config-secret-namespace={{ .Values.node.cloudConfigSecretNamespace }}"
Expand Down
1 change: 0 additions & 1 deletion charts/latest/blob-csi-driver/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ node:
allowEmptyCloudConfig: true
allowInlineVolumeKeyAccessWithIdentity: false
maxUnavailable: 1
metricsPort: 29635
livenessProbe:
healthPort: 29633
logLevel: 5
Expand Down
1 change: 0 additions & 1 deletion deploy/csi-blob-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ spec:
- "--enable-blobfuse-proxy=false"
- "--blobfuse-proxy-endpoint=$(BLOBFUSE_PROXY_ENDPOINT)"
- "--nodeid=$(KUBE_NODE_NAME)"
- "--metrics-address=0.0.0.0:29635"
- "--user-agent-suffix=OSS-kubectl"
ports:
- containerPort: 29633
Expand Down
5 changes: 4 additions & 1 deletion pkg/blobplugin/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var (
blobfuseProxyEndpoint = flag.String("blobfuse-proxy-endpoint", "unix://tmp/blobfuse-proxy.sock", "blobfuse-proxy endpoint")
nodeID = flag.String("nodeid", "", "node id")
version = flag.Bool("version", false, "Print the version and exit.")
metricsAddress = flag.String("metrics-address", "0.0.0.0:29634", "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.")
driverName = flag.String("drivername", blob.DefaultDriverName, "name of the driver")
enableBlobfuseProxy = flag.Bool("enable-blobfuse-proxy", false, "using blobfuse proxy for mounts")
Expand Down Expand Up @@ -106,6 +106,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