Merge pull request #2 from xuezhichao/feature/optimize

agentVersion requeue

pkg/config/av_watcher.go

@@ -143,6 +143,7 @@ func (w *AgentVersionWatcher) processAgentVersion() bool {
 	item, exists, err := w.agentVersionInformer.GetIndexer().GetByKey(key.(string))
 	if err != nil {
 		log.Error("get agentVersion by key error", zap.String("key", key.(string)), zap.Error(err))
+		w.cmQueue.AddRateLimited(item)
 		return true
 	}
 	if !exists {
@@ -152,7 +153,6 @@ func (w *AgentVersionWatcher) processAgentVersion() bool {
 	if agentVersion, ok := item.(*v1.AgentVersion); ok {
 		if err := w.cacheAgentVersion(agentVersion); err != nil {
 			log.Error("cache this agentVersion error", zap.String("key", key.(string)), zap.Error(err))
-			w.cmQueue.AddRateLimited(item)
 			return true
 		}
 	}

pkg/mutation/mutation_deploy.go

@@ -10,6 +10,7 @@ import (
 	jsoniter "github.com/json-iterator/go"
 	"go.uber.org/zap"
 	admissionv1 "k8s.io/api/admission/v1"
+	apiv1 "k8s.io/api/admission/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -31,7 +32,7 @@ func injectionDeploy(request *admissionv1.AdmissionRequest) (*admissionv1.Admiss
 	switch request.Kind.Kind {
 	case "Deployment":
 		log.Debugf("[mutation] ----- /injection-deploy: received request: %v,the operition is %s ", request.Resource, request.Operation)
-		if request.Operation == "DELETE" {
+		if request.Operation == apiv1.Operation("DELETE") {
 			log.Debugf("[mutation] /injection-deploy: received delete request name is : %s, namespace is %s ", request.Name, request.Namespace)
 			err := deleteConfigMap(request.Name, request.Namespace)
 			if err != nil {