Skip to content

Commit f14f7d2

Browse files
fix by comments
Signed-off-by: LiZhenCheng9527 <lizhencheng6@huawei.com>
1 parent 7840b4b commit f14f7d2

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

pkg/bpf/bpf.go

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ import (
3939
"kmesh.net/kmesh/pkg/bpf/restart"
4040
"kmesh.net/kmesh/pkg/bpf/workload"
4141
"kmesh.net/kmesh/pkg/constants"
42+
"kmesh.net/kmesh/pkg/kube"
4243
"kmesh.net/kmesh/pkg/logger"
4344
"kmesh.net/kmesh/pkg/nets"
44-
"kmesh.net/kmesh/pkg/utils"
4545
"kmesh.net/kmesh/pkg/version"
4646
)
4747

@@ -286,7 +286,7 @@ func (l *BpfLoader) setBpfProgOptions() {
286286
return
287287
}
288288

289-
clientSet, err := utils.GetK8sclient()
289+
clientSet, err := kube.CreateKubeClient("")
290290
if err != nil {
291291
log.Errorf("get kubernetest client for getting node IP error: %v", err)
292292
return
@@ -310,13 +310,11 @@ func (l *BpfLoader) setBpfProgOptions() {
310310
PodGateway: gateway,
311311
}
312312

313-
if l.kmeshConfig == nil {
314-
log.Errorf("skip kubelet probe failed: %v", "kmeshConfigMap is nil")
315-
return
316-
}
317-
if err := l.kmeshConfig.Update(&keyOfKmeshBpfConfig, &ValueOfKmeshBpfConfig, ebpf.UpdateAny); err != nil {
318-
log.Errorf("update kmeshConfigMap failed: %v", err)
319-
return
313+
if l.kmeshConfig != nil {
314+
if err := l.kmeshConfig.Update(&keyOfKmeshBpfConfig, &ValueOfKmeshBpfConfig, ebpf.UpdateAny); err != nil {
315+
log.Errorf("update kmeshConfig map failed: %v", err)
316+
return
317+
}
320318
}
321319
}
322320

@@ -347,10 +345,6 @@ func getNodePodSubGateway(node *corev1.Node) [16]byte {
347345
}
348346
podGateway := [16]byte{0}
349347
nets.CopyIpByteFromSlice(&podGateway, subNet.IP.To16())
350-
if err != nil {
351-
log.Errorf("failed to parse pod gateway: %v", err)
352-
return [16]byte{}
353-
}
354348
podGateway[15] = podGateway[15] + 1
355349
return podGateway
356350
}

0 commit comments

Comments
 (0)