fix recreate delegate pod when deleted

.gitignore

@@ -39,3 +39,4 @@ kubemcsa
 kubeconfig*
 
 scratch/
+cluster-dump/

pkg/scheduler_plugins/candidate/plugin.go

@@ -53,9 +53,7 @@ func (pl *Plugin) Name() string {
 
 func (pl *Plugin) PreFilter(ctx context.Context, state *framework.CycleState, p *v1.Pod) *framework.Status {
 	// reset annotations
-	patch := []byte(`{"metadata":{"annotations":{
-"` + common.AnnotationKeyIsReserved + `":null,
-"` + common.AnnotationKeyIsAllowed + `":null}}}`)
+	patch := []byte(`{"metadata":{"annotations":{"` + common.AnnotationKeyIsReserved + `":null}}}`)
 	if _, err := pl.client.MulticlusterV1alpha1().PodChaperons(p.Namespace).Patch(ctx, p.Name, types.MergePatchType, patch, metav1.PatchOptions{}); err != nil {
 		return framework.NewStatus(framework.Error, err.Error())
 	}

test/e2e/cleanup/test.sh

@@ -24,16 +24,16 @@ cleanup_test() {
   i=$1
 
   k $i apply -f test/e2e/cleanup/test.yaml
-  k $i rollout status deploy pause
-  target="$(k $i get pod -l app=pause -o json | jq -er '.items[0].metadata.finalizers[0] | split("-") | .[1]')"
+  k $i rollout status deploy cleanup
+  target="$(k $i get pod -l app=cleanup -o json | jq -er '.items[0].metadata.finalizers[0] | split("-") | .[1]')"
   k $i delete target $target
 
   export -f cleanup_test_iteration
   timeout --foreground 90s bash -c "until cleanup_test_iteration $i; do sleep 1; done"
   # use --foreground to catch ctrl-c
   # https://unix.stackexchange.com/a/233685
 
-  admiralty_connect 1 "${target: -1}"
+  admiralty_connect $i "${target: -1}"
   k $i delete -f test/e2e/cleanup/test.yaml
 }
 
@@ -43,7 +43,7 @@ cleanup_test_iteration() {
   set -exuo pipefail
   source test/e2e/aliases.sh
 
-  [ $(k $i get pod -l app=pause -o json | jq -e '.items[0].metadata.finalizers | length') -eq 0 ]
+  [ $(k $i get pod -l app=cleanup -o json | jq -e '.items[0].metadata.finalizers | length') -eq 0 ]
 }
 
 if [[ "${BASH_SOURCE[0]:-}" == "${0}" ]]; then

test/e2e/cleanup/test.yaml

@@ -1,15 +1,15 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: pause
+  name: cleanup
 spec:
   selector:
     matchLabels:
-      app: pause
+      app: cleanup
   template:
     metadata:
       labels:
-        app: pause
+        app: cleanup
       annotations:
         multicluster.admiralty.io/elect: ""
     spec:

test/e2e/delete-delegate/test.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+#
+# Copyright 2022 The Multicluster-Scheduler Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -exuo pipefail
+
+source test/e2e/aliases.sh
+source test/e2e/admiralty.sh
+
+delete-delegate_test() {
+  i=$1
+
+  k $i apply -f test/e2e/delete-delegate/test.yaml
+  k $i rollout status deploy delete-delegate
+  target="$(k $i get pod -l app=delete-delegate -o json | jq -er '.items[0].metadata.finalizers[0] | split("-") | .[1]')"
+  j="${target: -1}"
+  k $j delete pod -l multicluster.admiralty.io/app=delete-delegate --wait --timeout=30s
+  k $j wait pod -l multicluster.admiralty.io/app=delete-delegate --for=condition=PodScheduled
+  k $i delete -f test/e2e/delete-delegate/test.yaml
+}
+
+if [[ "${BASH_SOURCE[0]:-}" == "${0}" ]]; then
+  delete-delegate_test "${@}"
+fi

test/e2e/delete-delegate/test.yaml

@@ -0,0 +1,18 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: delete-delegate
+spec:
+  selector:
+    matchLabels:
+      app: delete-delegate
+  template:
+    metadata:
+      labels:
+        app: delete-delegate
+      annotations:
+        multicluster.admiralty.io/elect: ""
+    spec:
+      containers:
+        - name: pause
+          image: gcr.io/google_containers/pause