修改Pod注解遇到冲突自动重试

Author: imroc

pkg/kube/pod.go

@@ -8,16 +8,13 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
 
-func SetPodAnnotation(ctx context.Context, cachedPod client.Object, name, value string) error {
-	pod := &corev1.Pod{}
-	if err := apiReader.Get(ctx, client.ObjectKeyFromObject(cachedPod), pod); err != nil {
-		return err
-	}
-	if pod.Annotations == nil {
-		pod.Annotations = make(map[string]string)
-	}
-	pod.Annotations[name] = value
-	return apiClient.Update(ctx, pod)
+func SetPodAnnotation(ctx context.Context, pod *corev1.Pod, name, value string) error {
+	return update(ctx, pod, func() {
+		if pod.Annotations == nil {
+			pod.Annotations = make(map[string]string)
+		}
+		pod.Annotations[name] = value
+	}, false, false)
 }
 
 func AddPodFinalizer(ctx context.Context, pod client.Object, finalizerName string) error {

pkg/kube/retry.go

@@ -10,17 +10,23 @@ import (
 )
 
 func Update(ctx context.Context, obj client.Object, mutate func()) error {
-	return update(ctx, obj, mutate, false)
+	return update(ctx, obj, mutate, false, true)
 }
 
 func UpdateStatus(ctx context.Context, obj client.Object, mutate func()) error {
-	return update(ctx, obj, mutate, true)
+	return update(ctx, obj, mutate, true, true)
 }
 
-func update(ctx context.Context, obj client.Object, mutate func(), updateStatus bool) error {
+func update(ctx context.Context, obj client.Object, mutate func(), updateStatus, useCache bool) error {
 	return wait.ExponentialBackoff(retry.DefaultBackoff, func() (done bool, err error) {
 		key := client.ObjectKeyFromObject(obj)
-		err = apiClient.Get(ctx, key, obj)
+		var reader client.Reader
+		if useCache {
+			reader = apiClient
+		} else {
+			reader = apiReader
+		}
+		err = reader.Get(ctx, key, obj)
 		if err != nil {
 			return false, err
 		}