diff options
| author | Shelley-BaoYue <baoyue2@huawei.com> | 2023-11-28 18:43:14 +0800 |
|---|---|---|
| committer | Shelley-BaoYue <baoyue2@huawei.com> | 2023-11-28 19:07:24 +0800 |
| commit | d2e9e6e4d53bc95bf7ee37f70331fd50edf36b6d (patch) | |
| tree | 4b5c64269077d55cf7710bd0181ebd4d6db8b2da | |
| parent | Merge pull request #5212 from Onion-of-dreamed/automated-cherry-pick-of-#5107... (diff) | |
| download | kubeedge-d2e9e6e4d53bc95bf7ee37f70331fd50edf36b6d.tar.gz | |
delete serviceaccount token in edgedb
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
| -rw-r--r-- | edge/pkg/edged/kubeclientbridge/typed/core/v1/serviceaccount_bridge.go | 7 | ||||
| -rw-r--r-- | edge/pkg/metamanager/client/serviceaccount.go | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/edge/pkg/edged/kubeclientbridge/typed/core/v1/serviceaccount_bridge.go b/edge/pkg/edged/kubeclientbridge/typed/core/v1/serviceaccount_bridge.go index b16c93721..987873f66 100644 --- a/edge/pkg/edged/kubeclientbridge/typed/core/v1/serviceaccount_bridge.go +++ b/edge/pkg/edged/kubeclientbridge/typed/core/v1/serviceaccount_bridge.go @@ -29,6 +29,7 @@ import ( authenticationv1 "k8s.io/api/authentication/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" fakecorev1 "k8s.io/client-go/kubernetes/typed/core/v1/fake" "github.com/kubeedge/kubeedge/edge/pkg/metamanager/client" @@ -46,6 +47,12 @@ func (c *ServiceAccountsBridge) CreateToken(ctx context.Context, serviceAccountN return c.MetaClient.ServiceAccountToken().GetServiceAccountToken(c.ns, serviceAccountName, tokenRequest) } +func (c *ServiceAccountsBridge) Delete(ctx context.Context, podUID string, opts metav1.DeleteOptions) error { + c.MetaClient.ServiceAccountToken().DeleteServiceAccountToken(types.UID(podUID)) + return nil +} + func (c *ServiceAccountsBridge) Get(ctx context.Context, name string, options metav1.GetOptions) (result *corev1.ServiceAccount, err error) { return c.MetaClient.ServiceAccounts(c.ns).Get(name) } + 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 } |