From 138b47274b4af8d6e7019f37800bf64cf27401ad Mon Sep 17 00:00:00 2001 From: zhzhuang-zju Date: Wed, 17 Apr 2024 17:35:42 +0800 Subject: [PATCH] update lazy-activation-preference.md and lazy_activation_policy_test.go Signed-off-by: zhzhuang-zju --- .../lazy-activation-preference.md | 6 +++--- test/e2e/lazy_activation_policy_test.go | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md b/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md index 4b6dfb4fe..6530a75b9 100644 --- a/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md +++ b/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md @@ -323,7 +323,7 @@ sequenceDiagram PP2 ->> Karmada: create PP2 (match nginx, cluster=member2, lazy) activate Karmada PP1 ->> Karmada: delete PP1 - Karmada -->> nginx: label of policy name changed, but propagation unchanged + Karmada -->> nginx: annotation of policy name changed, but propagation unchanged nginx ->> Karmada: update nginx (e.g. update a label: refresh-time=$(date +%s)) Karmada -->> nginx: propagate it to member2 deactivate Karmada @@ -347,7 +347,7 @@ sequenceDiagram CPP2 ->> Karmada: create CPP2 (match nginx, cluster=member2, lazy) activate Karmada CPP1 ->> Karmada: update CPP1 (no longer match nginx) - Karmada -->> nginx: label of policy name changed, but propagation unchanged + Karmada -->> nginx: annotation of policy name changed, but propagation unchanged nginx ->> Karmada: update nginx (e.g. update a label: refresh-time=$(date +%s)) Karmada -->> nginx: propagate it to member2 deactivate Karmada @@ -391,7 +391,7 @@ sequenceDiagram PP2 ->> Karmada: create PP2 (match nginx, cluster=member2, lazy, priority=2, preemption=true) activate Karmada - Karmada -->> nginx: label of policy name changed, but propagation unchanged + Karmada -->> nginx: annotation of policy name changed, but propagation unchanged nginx ->> Karmada: update nginx (e.g. update a label: refresh-time=$(date +%s)) Karmada -->> nginx: propagate it to member2 deactivate Karmada diff --git a/test/e2e/lazy_activation_policy_test.go b/test/e2e/lazy_activation_policy_test.go index dbac92a25..537edb761 100644 --- a/test/e2e/lazy_activation_policy_test.go +++ b/test/e2e/lazy_activation_policy_test.go @@ -33,7 +33,7 @@ import ( const waitIntervalForLazyPolicyTest = 3 * time.Second -// e2e test for https://github.com/karmada-io/karmada/blob/master/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md#test-plan +// e2e test for https://github.com/karmada-io/karmada/blob/release-1.9/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md#test-plan var _ = ginkgo.Describe("Lazy activation policy testing", func() { var namespace string var deploymentName, configMapName, policyName, policyHigherPriorityName string @@ -92,7 +92,7 @@ var _ = ginkgo.Describe("Lazy activation policy testing", func() { }) // Simple Case 1 (Policy created before resource) - // refer: https://github.com/karmada-io/karmada/blob/master/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md#simple-case-1-policy-created-before-resource + // refer: https://github.com/karmada-io/karmada/blob/release-1.9/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md#simple-case-1-policy-created-before-resource ginkgo.It("Simple Case 1 (Policy created before resource)", func() { ginkgo.By("step 1: deployment propagate success when policy created before it", func() { waitDeploymentPresentOnCluster(originalCluster, namespace, deploymentName) @@ -107,7 +107,7 @@ var _ = ginkgo.Describe("Lazy activation policy testing", func() { }) // Simple Case 3 (Lazy to immediate) - // refer: https://github.com/karmada-io/karmada/blob/master/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md#simple-case-3-lazy-to-immediate + // refer: https://github.com/karmada-io/karmada/blob/release-1.9/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md#simple-case-3-lazy-to-immediate ginkgo.It("Simple Case 3 (Lazy to immediate)", func() { ginkgo.By("step 1: deployment propagate success when policy created before it", func() { waitDeploymentPresentOnCluster(originalCluster, namespace, deploymentName) @@ -131,7 +131,7 @@ var _ = ginkgo.Describe("Lazy activation policy testing", func() { }) // Simple Case 4 (Immediate to lazy) - // refer: https://github.com/karmada-io/karmada/blob/master/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md#simple-case-4-immediate-to-lazy + // refer: https://github.com/karmada-io/karmada/blob/release-1.9/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md#simple-case-4-immediate-to-lazy ginkgo.It("Simple Case 4 (Immediate to lazy)", func() { ginkgo.By("step 1: deployment propagate success", func() { waitDeploymentPresentOnCluster(originalCluster, namespace, deploymentName) @@ -159,7 +159,7 @@ var _ = ginkgo.Describe("Lazy activation policy testing", func() { }) // Combined Case 4 (Policy preemption) - // refer: https://github.com/chaosi-zju/karmada/blob/lazy-proposal/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md#combined-case-4-policy-preemption + // refer: https://github.com/karmada-io/karmada/blob/release-1.9/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md#combined-case-4-policy-preemption ginkgo.It("Policy preemption", func() { ginkgo.By("step 1: deployment propagate success when policy created before it", func() { waitDeploymentPresentOnCluster(originalCluster, namespace, deploymentName) @@ -206,7 +206,7 @@ var _ = ginkgo.Describe("Lazy activation policy testing", func() { }) // Combined Case 5 (Propagate dependencies) - // refer: https://github.com/karmada-io/karmada/blob/master/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md#combined-case-5-propagate-dependencies + // refer: https://github.com/karmada-io/karmada/blob/release-1.9/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md#combined-case-5-propagate-dependencies ginkgo.It("Combined Case 5 (Propagate dependencies)", func() { ginkgo.By("step 1: deployment and its dependencies could propagate success.", func() { waitDeploymentPresentOnCluster(originalCluster, namespace, deploymentName) @@ -244,7 +244,7 @@ var _ = ginkgo.Describe("Lazy activation policy testing", func() { }) // Simple Case 2 (Policy created after resource) - // refer: https://github.com/karmada-io/karmada/blob/master/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md#simple-case-2-policy-created-after-resource + // refer: https://github.com/karmada-io/karmada/blob/release-1.9/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md#simple-case-2-policy-created-after-resource ginkgo.It("Simple Case 2 (Policy created after resource)", func() { ginkgo.By("step1: deployment would not propagate when lazy policy created after deployment", func() { // wait to distinguish whether the deployment will not propagate or have no time to propagate @@ -268,7 +268,7 @@ var _ = ginkgo.Describe("Lazy activation policy testing", func() { }) // Combined Case 6 (Propagate dependencies) - // refer: https://github.com/karmada-io/karmada/blob/master/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md#combined-case-6-propagate-dependencies + // refer: https://github.com/karmada-io/karmada/blob/release-1.9/docs/proposals/scheduling/activation-preference/lazy-activation-preference.md#combined-case-6-propagate-dependencies ginkgo.It("Combined Case 6 (Propagate dependencies)", func() { ginkgo.By("step 1: resources would not propagate when lazy policy created after resources", func() { // wait to distinguish whether the resource will not propagate or have no time to propagate