update v4.11.1

Author: cabbetlong

connector/host/host_helper.go

@@ -65,11 +65,6 @@ func NewNodeHostInfo(ctx context.Context) (*NodeHostInfo, error) {
 		return nil, err
 	}
 
-	hostIPs, err := utils.GetHostIPs(ctx)
-	if err != nil {
-		log.AddContext(ctx).Warningf("failed to get host ips: [%v]", err)
-	}
-
 	iscsiInitiator, err := proto.GetISCSIInitiator(ctx)
 	if err != nil {
 		log.AddContext(ctx).Warningf("failed to get ISCSI initiator: [%v]", err)
@@ -85,13 +80,22 @@ func NewNodeHostInfo(ctx context.Context) (*NodeHostInfo, error) {
 		log.AddContext(ctx).Warningf("failed to get RoCE initiator: [%v]", err)
 	}
 
-	return &NodeHostInfo{
+	hostInfo := &NodeHostInfo{
 		HostName:       strings.Trim(hostName, " "),
-		HostIPs:        hostIPs,
 		IscsiInitiator: iscsiInitiator,
 		FCInitiators:   fcInitiators,
 		RoCEInitiator:  roCEInitiator,
-	}, nil
+	}
+
+	if app.GetGlobalConfig().ReportNodeIP {
+		if hostIPs, err := utils.GetHostIPs(ctx); err != nil {
+			log.AddContext(ctx).Warningf("failed to get host ips: [%v]", err)
+		} else {
+			hostInfo.HostIPs = hostIPs
+		}
+	}
+
+	return hostInfo, nil
 }
 
 // SaveNodeHostInfoToSecret save the current node host information to secret.

csi/app/config/config.go

@@ -64,6 +64,7 @@ type serviceConfig struct {
 
 	// kubeletVolumeDevicesDirName, default is /volumeDevices/
 	KubeletVolumeDevicesDirName string
+	ReportNodeIP                bool
 }
 
 type connectorConfig struct {

csi/app/options/service.go

@@ -66,6 +66,7 @@ type serviceOptions struct {
 	timeout             time.Duration
 
 	kubeletVolumeDevicesDirName string
+	reportNodeIP                bool
 }
 
 // NewServiceOptions returns service configurations
@@ -119,6 +120,7 @@ func (opt *serviceOptions) AddFlags(ff *flag.FlagSet) {
 		"The port of exported csi server")
 	ff.StringVar(&opt.exportCsiServerAddress, "export-csi-service-address", "",
 		"The address of exported csi server")
+	ff.BoolVar(&opt.reportNodeIP, "report-node-ip", false, "Whether to report node IP")
 }
 
 // ApplyFlags assign the service flags
@@ -145,6 +147,7 @@ func (opt *serviceOptions) ApplyFlags(cfg *config.AppConfig) {
 	cfg.KubeletVolumeDevicesDirName = opt.kubeletVolumeDevicesDirName
 	cfg.ExportCsiServerAddress = opt.exportCsiServerAddress
 	cfg.ExportCsiServerPort = opt.exportCsiServerPort
+	cfg.ReportNodeIP = opt.reportNodeIP
 }
 
 // ValidateFlags validate the service flags

helm/esdk/templates/huawei-csi-node.yaml

@@ -180,6 +180,7 @@ spec:
             {{ if .Values.node.maxVolumesPerNode }}
             - "--max-volumes-per-node={{ .Values.node.maxVolumesPerNode }}"
             {{ end }}
+            - "-report-node-ip={{ .Values.csiDriver.reportNodeIP | default false }}"
           env:
             - name: CSI_NODENAME
               valueFrom:
@@ -277,4 +278,4 @@ spec:
         - hostPath:
             path: /etc/localtime
             type: File
-          name: host-time
+          name: host-time

helm/esdk/values.yaml

@@ -265,6 +265,8 @@ csiDriver:
     fileSize: 20M
     # Maximum number of log files that can be backed up.
     maxBackups: 9
+  # Whether to report node IP
+  reportNodeIP: false
 
 # leaderElection configuration
 leaderElection: