fix result annotation key use hostPort and remove unused role permission

Signed-off-by: roc <[email protected]>

Author: imroc

charts/tke-extend-network-controller/templates/role.yaml

@@ -97,8 +97,6 @@ rules:
   resources:
   - nodes
   verbs:
-  - create
-  - delete
   - get
   - list
   - patch
@@ -123,8 +121,6 @@ rules:
   resources:
   - pods
   verbs:
-  - create
-  - delete
   - get
   - list
   - patch

config/rbac/role.yaml

@@ -26,8 +26,6 @@ rules:
   resources:
   - nodes
   verbs:
-  - create
-  - delete
   - get
   - list
   - patch
@@ -52,8 +50,6 @@ rules:
   resources:
   - pods
   verbs:
-  - create
-  - delete
   - get
   - list
   - patch

internal/controller/clbbinding.go

@@ -528,23 +528,31 @@ func (r *CLBBindingReconciler[T]) ensureBackendStatusAnnotation(ctx context.Cont
 		return errors.WithStack(err)
 	}
 
-	if err := patchResult(ctx, r.Client, backend.GetObject(), string(val)); err != nil {
+	if err := patchResult(ctx, r.Client, backend.GetObject(), string(val), false); err != nil {
 		return errors.WithStack(err)
 	}
 	return nil
 }
 
-func patchResult(ctx context.Context, c client.Client, obj client.Object, result string) error {
+func patchResult(ctx context.Context, c client.Client, obj client.Object, result string, hostPort bool) error {
 	annotations := obj.GetAnnotations()
 	if annotations == nil {
 		annotations = map[string]string{}
 	}
+	var resultKey, statusKey string
+	if hostPort {
+		resultKey = constant.CLBHostPortMappingResultKey
+		statusKey = constant.CLBHostPortMappingStatuslKey
+	} else {
+		resultKey = constant.CLBPortMappingResultKey
+		statusKey = constant.CLBPortMappingStatuslKey
+	}
 	if annotations[constant.CLBPortMappingResultKey] != string(result) {
 		patchMap := map[string]any{
 			"metadata": map[string]any{
 				"annotations": map[string]string{
-					constant.CLBPortMappingResultKey:  string(result),
-					constant.CLBPortMappingStatuslKey: "Ready",
+					resultKey: string(result),
+					statusKey: "Ready",
 				},
 			},
 		}
@@ -571,11 +579,11 @@ func patchResult(ctx context.Context, c client.Client, obj client.Object, result
 		}
 		// 存在对应的 gameserver，patch result 注解
 		gsAnnotations := gs.GetAnnotations()
-		if gsAnnotations == nil || gsAnnotations[constant.CLBPortMappingResultKey] != string(result) {
+		if gsAnnotations == nil || gsAnnotations[resultKey] != string(result) {
 			patchMap := map[string]any{
 				"metadata": map[string]any{
 					"annotations": map[string]string{
-						constant.CLBPortMappingResultKey: string(result),
+						resultKey: string(result),
 					},
 				},
 			}

internal/controller/node_controller.go

@@ -38,7 +38,7 @@ type NodeReconciler struct {
 	CLBBindingReconciler[*clbbinding.CLBNodeBinding]
 }
 
-// +kubebuilder:rbac:groups=core,resources=nodes,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=core,resources=nodes,verbs=get;list;watch;update;patch
 // +kubebuilder:rbac:groups=core,resources=nodes/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=core,resources=nodes/finalizers,verbs=update
 // +kubebuilder:rbac:groups=core,resources=events,verbs=create;patch

internal/controller/pod_controller.go

@@ -51,7 +51,7 @@ type PodReconciler struct {
 	CLBBindingReconciler[*clbbinding.CLBPodBinding]
 }
 
-// +kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;watch;update;patch
 // +kubebuilder:rbac:groups=core,resources=pods/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=core,resources=pods/finalizers,verbs=update
 // +kubebuilder:rbac:groups=core,resources=events,verbs=create;patch
@@ -189,7 +189,7 @@ func (r *PodReconciler) syncCLBHostPortMapping(ctx context.Context, pod *corev1.
 	if err != nil {
 		return result, errors.WithStack(err)
 	}
-	if err := patchResult(ctx, r.Client, pod, string(val)); err != nil {
+	if err := patchResult(ctx, r.Client, pod, string(val), true); err != nil {
 		return result, errors.WithStack(err)
 	}
 	return