Skip to content

Commit c1190f7

Browse files
authored
Merge pull request #681 from linthan/k8ssyncfixnilpoint
fix: 消除空指针
2 parents 896c0d0 + eb6267f commit c1190f7

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

assets/src/pages/monitor/pannel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function GrafanaPannel(props: any) {
6666
position: 'relative',
6767
display: 'flex',
6868
flex: 'auto',
69-
marginLeft: iframeVisible ? 0 : -60,
69+
marginLeft: 0,
7070
flexDirection: 'column',
7171
justifyContent: 'center',
7272
alignItems: 'center',

internal/pkg/service/k8s/pod.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,9 @@ func (i *syncPod) update(old interface{}, new interface{}) {
276276
func (i *syncPod) delete(obj interface{}) {
277277
in, ok := obj.(*v1.Pod)
278278
if !ok {
279-
xlog.Warn("k8sWork",
279+
xlog.Warn("k8sWork not ok",
280280
xlog.String("step", "add-check"),
281281
xlog.String("zoneCode", i.zoneCode),
282-
xlog.String("podName", in.Name),
283282
xlog.Any("obj", obj),
284283
xlog.String("reason", "type error"))
285284
return

0 commit comments

Comments
 (0)