summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com>2023-11-27 13:01:40 +0800
committerGitHub <noreply@github.com>2023-11-27 13:01:40 +0800
commitf42b4af761a14fc6d6a42e01af742bbbd7079499 (patch)
tree94b94e8b97ddd94a48bc63c5f45c9062408afc54
parentMerge pull request #5204 from Shelley-BaoYue/automated-cherry-pick-of-#5112-u... (diff)
parentfix panic when get serviceaccount uid (diff)
downloadkubeedge-f42b4af761a14fc6d6a42e01af742bbbd7079499.tar.gz
Merge pull request #5199 from Shelley-BaoYue/delete-serviceaccount-panic
[release-1.15] fix panic when TokenRequest.Spec.BoundObjectRef is null pointer
-rw-r--r--edge/pkg/metamanager/client/serviceaccount.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/edge/pkg/metamanager/client/serviceaccount.go b/edge/pkg/metamanager/client/serviceaccount.go
index eeb5e2efa..df861cb63 100644
--- a/edge/pkg/metamanager/client/serviceaccount.go
+++ b/edge/pkg/metamanager/client/serviceaccount.go
@@ -49,7 +49,7 @@ func (c *serviceAccountToken) DeleteServiceAccountToken(podUID types.UID) {
for _, sa := range *svcAccounts {
var tr authenticationv1.TokenRequest
err = json.Unmarshal([]byte(sa.Value), &tr)
- if err != nil {
+ if err != nil || tr.Spec.BoundObjectRef == nil {
klog.Errorf("unmarshal resource %s token request failed: %v", sa.Key, err)
continue
}