Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update E2E tests for RolloutHandler
Browse files Browse the repository at this point in the history
Signed-off-by: Dale Haiducek <[email protected]>
dhaiducek committed Dec 20, 2023

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
1 parent 0c5a832 commit e043d1d
Showing 16 changed files with 160 additions and 156 deletions.
79 changes: 20 additions & 59 deletions test/e2e/case10_policyset_propagation_test.go
Original file line number Diff line number Diff line change
@@ -424,11 +424,16 @@ var _ = Describe("Test policyset propagation", func() {
clientHubDynamic, gvrPlacementDecision, case10PolicySetName+"-plm-decision", testNamespace, true,
defaultTimeoutSeconds,
)
plm.Object["status"] = utils.GeneratePldStatus(plm.GetName(), plm.GetNamespace(), "managed1")
_, err := clientHubDynamic.Resource(gvrPlacementDecision).Namespace(testNamespace).UpdateStatus(
context.TODO(), plm, metav1.UpdateOptions{},
utils.GeneratePldStatus(placementDecisionClient, plm, "managed1")
placement := utils.GetWithTimeout(
clientHubDynamic,
gvrPlacement,
case10PolicySetName+"-plm",
testNamespace,
true,
defaultTimeoutSeconds,
)
Expect(err).ToNot(HaveOccurred())
utils.GeneratePlacementStatus(placementClient, placement, plm.GetName(), 1)
plc := utils.GetWithTimeout(
clientHubDynamic, gvrPolicy, testNamespace+"."+case10PolicyName, "managed1", true,
defaultTimeoutSeconds,
@@ -445,11 +450,7 @@ var _ = Describe("Test policyset propagation", func() {
clientHubDynamic, gvrPlacementDecision, case10PolicySetName+"-plm-decision", testNamespace, true,
defaultTimeoutSeconds,
)
plm.Object["status"] = utils.GeneratePldStatus(plm.GetName(), plm.GetNamespace(), "managed2")
_, err := clientHubDynamic.Resource(gvrPlacementDecision).Namespace(testNamespace).UpdateStatus(
context.TODO(), plm, metav1.UpdateOptions{},
)
Expect(err).ToNot(HaveOccurred())
utils.GeneratePldStatus(placementDecisionClient, plm, "managed2")
plc := utils.GetWithTimeout(
clientHubDynamic, gvrPolicy, testNamespace+"."+case10PolicyName, "managed2", true,
defaultTimeoutSeconds,
@@ -466,11 +467,7 @@ var _ = Describe("Test policyset propagation", func() {
clientHubDynamic, gvrPlacementDecision, case10PolicySetName+"-plm-decision", testNamespace, true,
defaultTimeoutSeconds,
)
plm.Object["status"] = utils.GeneratePldStatus(plm.GetName(), plm.GetNamespace(), "managed1", "managed2")
_, err := clientHubDynamic.Resource(gvrPlacementDecision).Namespace(testNamespace).UpdateStatus(
context.TODO(), plm, metav1.UpdateOptions{},
)
Expect(err).ToNot(HaveOccurred())
utils.GeneratePldStatus(placementDecisionClient, plm, "managed1", "managed2")
plc := utils.GetWithTimeout(
clientHubDynamic, gvrPolicy, testNamespace+"."+case10PolicyName, "managed1", true,
defaultTimeoutSeconds,
@@ -518,11 +515,7 @@ var _ = Describe("Test policyset propagation", func() {
clientHubDynamic, gvrPlacementDecision, case10PolicySetName+"-plm-decision", testNamespace, true,
defaultTimeoutSeconds,
)
plm.Object["status"] = utils.GeneratePldStatus(plm.GetName(), plm.GetNamespace(), "managed1", "managed2")
_, err := clientHubDynamic.Resource(gvrPlacementDecision).Namespace(testNamespace).UpdateStatus(
context.TODO(), plm, metav1.UpdateOptions{},
)
Expect(err).ToNot(HaveOccurred())
utils.GeneratePldStatus(placementDecisionClient, plm, "managed1", "managed2")
plc := utils.GetWithTimeout(
clientHubDynamic, gvrPolicy, testNamespace+"."+case10PolicyName, "managed1", true,
defaultTimeoutSeconds,
@@ -566,11 +559,7 @@ var _ = Describe("Test policyset propagation", func() {
clientHubDynamic, gvrPlacementDecision, case10PolicySetName+"-plm-decision", testNamespace, true,
defaultTimeoutSeconds,
)
plm.Object["status"] = utils.GeneratePldStatus(plm.GetName(), plm.GetNamespace(), "managed1", "managed2")
_, err := clientHubDynamic.Resource(gvrPlacementDecision).Namespace(testNamespace).UpdateStatus(
context.TODO(), plm, metav1.UpdateOptions{},
)
Expect(err).ToNot(HaveOccurred())
utils.GeneratePldStatus(placementDecisionClient, plm, "managed1", "managed2")
plc := utils.GetWithTimeout(
clientHubDynamic, gvrPolicy, testNamespace+"."+case10PolicyName, "managed1", true,
defaultTimeoutSeconds,
@@ -645,11 +634,7 @@ var _ = Describe("Test policyset propagation", func() {
clientHubDynamic, gvrPlacementDecision, case10PolicyName+"-plm-decision", testNamespace, true,
defaultTimeoutSeconds,
)
plm.Object["status"] = utils.GeneratePldStatus(plm.GetName(), plm.GetNamespace(), "managed1")
_, err := clientHubDynamic.Resource(gvrPlacementDecision).Namespace(testNamespace).UpdateStatus(
context.TODO(), plm, metav1.UpdateOptions{},
)
Expect(err).ToNot(HaveOccurred())
utils.GeneratePldStatus(placementDecisionClient, plm, "managed1")
plc := utils.GetWithTimeout(
clientHubDynamic, gvrPolicy, testNamespace+"."+case10PolicyName, "managed1", true,
defaultTimeoutSeconds,
@@ -666,11 +651,7 @@ var _ = Describe("Test policyset propagation", func() {
clientHubDynamic, gvrPlacementDecision, case10PolicySetName+"-plm-decision", testNamespace, true,
defaultTimeoutSeconds,
)
plm.Object["status"] = utils.GeneratePldStatus(plm.GetName(), plm.GetNamespace(), "managed2")
_, err := clientHubDynamic.Resource(gvrPlacementDecision).Namespace(testNamespace).UpdateStatus(
context.TODO(), plm, metav1.UpdateOptions{},
)
Expect(err).ToNot(HaveOccurred())
utils.GeneratePldStatus(placementDecisionClient, plm, "managed2")
plc := utils.GetWithTimeout(
clientHubDynamic, gvrPolicy, testNamespace+"."+case10PolicyName, "managed1", true,
defaultTimeoutSeconds,
@@ -865,11 +846,7 @@ var _ = Describe("Test policyset propagation", func() {
clientHubDynamic, gvrPlacementDecision, case10PolicySetName+"1-plm-decision", testNamespace, true,
defaultTimeoutSeconds,
)
plm.Object["status"] = utils.GeneratePldStatus(plm.GetName(), plm.GetNamespace(), "managed1")
_, err := clientHubDynamic.Resource(gvrPlacementDecision).Namespace(testNamespace).UpdateStatus(
context.TODO(), plm, metav1.UpdateOptions{},
)
Expect(err).ToNot(HaveOccurred())
utils.GeneratePldStatus(placementDecisionClient, plm, "managed1")
plc := utils.GetWithTimeout(
clientHubDynamic, gvrPolicy, testNamespace+"."+case10PolicyName, "managed1", true,
defaultTimeoutSeconds,
@@ -886,11 +863,7 @@ var _ = Describe("Test policyset propagation", func() {
clientHubDynamic, gvrPlacementDecision, case10PolicySetName+"2-plm-decision", testNamespace, true,
defaultTimeoutSeconds,
)
plm.Object["status"] = utils.GeneratePldStatus(plm.GetName(), plm.GetNamespace(), "managed2")
_, err := clientHubDynamic.Resource(gvrPlacementDecision).Namespace(testNamespace).UpdateStatus(
context.TODO(), plm, metav1.UpdateOptions{},
)
Expect(err).ToNot(HaveOccurred())
utils.GeneratePldStatus(placementDecisionClient, plm, "managed2")
plc := utils.GetWithTimeout(
clientHubDynamic, gvrPolicy, testNamespace+"."+case10PolicyName, "managed2", true,
defaultTimeoutSeconds,
@@ -967,11 +940,7 @@ var _ = Describe("Test policyset propagation", func() {
clientHubDynamic, gvrPlacementDecision, case10PolicySetName+"-plm-decision", testNamespace, true,
defaultTimeoutSeconds,
)
plm.Object["status"] = utils.GeneratePldStatus(plm.GetName(), plm.GetNamespace(), "managed1")
_, err := clientHubDynamic.Resource(gvrPlacementDecision).Namespace(testNamespace).UpdateStatus(
context.TODO(), plm, metav1.UpdateOptions{},
)
Expect(err).ToNot(HaveOccurred())
utils.GeneratePldStatus(placementDecisionClient, plm, "managed1")
plc := utils.GetWithTimeout(
clientHubDynamic, gvrPolicy, testNamespace+"."+case10PolicyName+"1", "managed1", true,
defaultTimeoutSeconds,
@@ -997,11 +966,7 @@ var _ = Describe("Test policyset propagation", func() {
clientHubDynamic, gvrPlacementDecision, case10PolicySetName+"-plm-decision", testNamespace, true,
defaultTimeoutSeconds,
)
plm.Object["status"] = utils.GeneratePldStatus(plm.GetName(), plm.GetNamespace(), "managed2")
_, err := clientHubDynamic.Resource(gvrPlacementDecision).Namespace(testNamespace).UpdateStatus(
context.TODO(), plm, metav1.UpdateOptions{},
)
Expect(err).ToNot(HaveOccurred())
utils.GeneratePldStatus(placementDecisionClient, plm, "managed2")
plc := utils.GetWithTimeout(
clientHubDynamic, gvrPolicy, testNamespace+"."+case10PolicyName+"1", "managed1", false,
defaultTimeoutSeconds,
@@ -1052,11 +1017,7 @@ var _ = Describe("Test policyset propagation", func() {
clientHubDynamic, gvrPlacementDecision, case10PolicySetName+"-plm-decision", testNamespace, true,
defaultTimeoutSeconds,
)
plm.Object["status"] = utils.GeneratePldStatus(plm.GetName(), plm.GetNamespace(), "managed1")
_, err := clientHubDynamic.Resource(gvrPlacementDecision).Namespace(testNamespace).UpdateStatus(
context.TODO(), plm, metav1.UpdateOptions{},
)
Expect(err).ToNot(HaveOccurred())
utils.GeneratePldStatus(placementDecisionClient, plm, "managed1")
plc := utils.GetWithTimeout(
clientHubDynamic, gvrPolicy, testNamespace+"."+case10PolicyName+"1", "managed1", true,
defaultTimeoutSeconds,
28 changes: 7 additions & 21 deletions test/e2e/case19_rep_policy_placement_test.go
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ var _ = Describe("Test replicated_policy controller and propagation", Ordered, S
Expect(plc).NotTo(BeNil())
})
AfterAll(func() {
By("Creating " + case19PolicyName)
By("Deleting " + case19PolicyName)
utils.Kubectl("delete",
"-f", case19PolicyYaml,
"-n", testNamespace,
@@ -47,20 +47,16 @@ var _ = Describe("Test replicated_policy controller and propagation", Ordered, S
})
It("should propagate reconcile only managed2", func() {
By("Patching test-policy-plr with decision of cluster managed1, managed2")
decisionName := case19PolicyName + "-plr-1"
plr := utils.GetWithTimeout(
clientHubDynamic,
gvrPlacementDecision,
case19PolicyName+"-plr-1",
decisionName,
testNamespace,
true,
defaultTimeoutSeconds,
)
plr.Object["status"] = utils.GeneratePldStatus(plr.GetName(), plr.GetNamespace(), "managed1", "managed2")
_, err := clientHubDynamic.Resource(gvrPlacementDecision).Namespace(testNamespace).UpdateStatus(
context.TODO(),
plr, metav1.UpdateOptions{},
)
Expect(err).ToNot(HaveOccurred())
utils.GeneratePldStatus(placementDecisionClient, plr, "managed1", "managed2")
plc := utils.GetWithTimeout(
clientHubDynamic, gvrPolicy, testNamespace+"."+case19PolicyName, "managed1", true, defaultTimeoutSeconds,
)
@@ -80,17 +76,12 @@ var _ = Describe("Test replicated_policy controller and propagation", Ordered, S
plr = utils.GetWithTimeout(
clientHubDynamic,
gvrPlacementDecision,
case19PolicyName+"-plr-1",
decisionName,
testNamespace,
true,
defaultTimeoutSeconds,
)
plr.Object["status"] = utils.GeneratePldStatus(plr.GetName(), plr.GetNamespace(), "managed2")
_, err = clientHubDynamic.Resource(gvrPlacementDecision).Namespace(testNamespace).UpdateStatus(
context.TODO(),
plr, metav1.UpdateOptions{},
)
Expect(err).ToNot(HaveOccurred())
utils.GeneratePldStatus(placementDecisionClient, plr, "managed2")
plc = utils.GetWithTimeout(
clientHubDynamic, gvrPolicy, testNamespace+"."+case19PolicyName, "managed1", false, defaultTimeoutSeconds,
)
@@ -125,12 +116,7 @@ var _ = Describe("Test replicated_policy controller and propagation", Ordered, S
true,
defaultTimeoutSeconds,
)
plr.Object["status"] = utils.GeneratePldStatus(plr.GetName(), plr.GetNamespace(), "managed1")
_, err = clientHubDynamic.Resource(gvrPlacementDecision).Namespace(testNamespace).UpdateStatus(
context.TODO(),
plr, metav1.UpdateOptions{},
)
Expect(err).ShouldNot(HaveOccurred())
utils.GeneratePldStatus(placementDecisionClient, plr, "managed1")
By("Patching gvrPlacementBinding placementRef")
plb := utils.GetWithTimeout(
clientHubDynamic,
2 changes: 1 addition & 1 deletion test/e2e/case4_unexpected_policy_test.go
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ const (
case4PolicyYaml string = "../resources/case4_unexpected_policy/case4-test-policy.yaml"
)

var _ = Describe("Test unexpect policy handling", func() {
var _ = Describe("Test unexpected policy handling", func() {
It("Unexpected root policy in cluster namespace should be deleted", func() {
By("Creating " + case4PolicyYaml + "in cluster namespace: managed1")
out, err := utils.KubectlWithOutput("apply",
Loading

0 comments on commit e043d1d

Please sign in to comment.