Use status.hostIP for kubelet requests

commit_hash:fdc60fe71c26abe6abb90bdafd971b821b0664c1
yandex · Feb 10, 2025 · c571db5 · c571db5
1 parent a9e002e
commit c571db5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/perforator/agent/collector/pkg/deploy_system/kubelet/kubelet.go b/perforator/agent/collector/pkg/deploy_system/kubelet/kubelet.go
@@ -25,6 +25,7 @@ const (
 	tokenPath   = "/var/run/secrets/kubernetes.io/serviceaccount/token"
 	kubeletPort = "10250"
 	nodeEnv     = "NODE_NAME"
+	nodeIP      = "NODE_IP"
 
 	kubernetesAPIServerHost = "kubernetes.default.svc.cluster.local"
 
@@ -47,11 +48,22 @@ func getNodeName() (string, error) {
 }
 
 func getNodeURL() (string, error) {
-	name, err := getNodeName()
-	if err != nil {
-		return "", fmt.Errorf("can't get node url %w", err)
+	var host string
+	ip := os.Getenv(nodeIP)
+	if ip != "" {
+		if strings.Contains(ip, ":") {
+			// ipv6 address
+			ip = fmt.Sprintf("[%s]", ip)
+		}
+		host = ip
+	} else {
+		name, err := getNodeName()
+		if err != nil {
+			return "", fmt.Errorf("can't get node url %w", err)
+		}
+		host = name
 	}
-	url := fmt.Sprintf("https://%s:%s", name, kubeletPort)
+	url := fmt.Sprintf("https://%s:%s", host, kubeletPort)
 
 	return url, nil
 }

diff --git a/perforator/deploy/kubernetes/helm/perforator/templates/agent/daemonset.yaml b/perforator/deploy/kubernetes/helm/perforator/templates/agent/daemonset.yaml
@@ -50,10 +50,14 @@ spec:
         - {{ . }}
           {{- end}}
         env:
-          - name: NODE_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: spec.nodeName
+        - name: NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
+        - name: NODE_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.hostIP
         {{- range .Values.agent.extraEnv }}
         - name: {{ .name }}
           value: {{ .value }}