Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply validation to check the conversion #4597

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion test/e2e/v4/plugin_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -412,8 +412,23 @@ func Run(kbc *utils.TestContext, hasWebhook, isToUseInstaller, isToUseHelmChart,
_, err = kbc.Kubectl.Apply(true, "-f", conversionCRPath)
Expect(err).NotTo(HaveOccurred(), "failed to apply modified ConversionTest CR")

// TODO: Add validation to check the conversion
// Apply validation to check the conversion
// the v2 should have spec.replicas == 3
By("validating that v2 spec.replicas is set to 3 via conversion")
Eventually(func(g Gomega) {
output, err := kbc.Kubectl.Get(
true,
"-n", "test-ns",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to re-check the code above to confirm think the ns is true only right?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. And I have added validation check for v1 -> v2 conversion. Thanks

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should not "-n", "test-ns",
The true will get the CRs from the namespace defined in the TestContext
Give a look on its implementation

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I found that.

Do I need establish a CRD for that? sth like

crdName := "conversiontests." + kbc.Group
Eventually(func(g Gomega) {
    _, err := kbc.Kubectl.Get(false, "crd", crdName)
    g.Expect(err).NotTo(HaveOccurred(), "CRD %s not found", crdName)
}

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@p-shah256 currently I am working here, plz free to review it. thanks

"conversiontest.v2."+kbc.Group,
"conversion-test",
"-o", "jsonpath={.spec.replicas}",
)
g.Expect(err).NotTo(HaveOccurred(), "failed to fetch v2 conversiontest")

replicas, err := strconv.Atoi(output)
g.Expect(err).NotTo(HaveOccurred(), "invalid replicas value")
g.Expect(replicas).To(Equal(3), "expected v2.spec.replicas == 3")
}, time.Minute, time.Second).Should(Succeed())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See the test is not accurate and it still failing


if hasMetrics {
By("validating conversion metrics to confirm conversion operations")
Expand Down