📖 add e2e test to validate webhook conversion between versions in the tutorials #5069

wazery · 2025-09-01T19:40:25Z

This PR introduces an e2e test to validate webhook conversion between versions, as part of the multiversion tutorial e2e tests.

Fixes: #4255

k8s-ci-robot · 2025-09-01T19:40:35Z

Hi @wazery. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go

camilamacedo86 · 2025-09-13T06:25:36Z

/ok-to-test

Thank you for the contirbution 🥇
But it is not really checking the conversion yet.
See how we do the same in our e2e tests, https://github.com/kubernetes-sigs/kubebuilder/blob/master/test/e2e/v4/plugin_cluster_test.go#L389-L432

We would need to do something very similar to that.

camilamacedo86 · 2025-10-27T07:42:54Z

/override pull-kubebuilder-e2e-k8s-1-34-0

k8s-ci-robot · 2025-10-27T07:42:58Z

@camilamacedo86: Overrode contexts on behalf of camilamacedo86: pull-kubebuilder-e2e-k8s-1-34-0

In response to this:

/override pull-kubebuilder-e2e-k8s-1-34-0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

wazery · 2025-10-27T12:57:34Z

/override pull-kubebuilder-e2e-k8s-1-34-1

k8s-ci-robot · 2025-10-27T12:57:37Z

@wazery: wazery unauthorized: /override is restricted to Repo administrators.

In response to this:

/override pull-kubebuilder-e2e-k8s-1-34-1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

wazery · 2025-10-27T19:38:14Z

@camilamacedo86 I just fixed the failing test, hope the PR is ready now for merge.

camilamacedo86 · 2025-10-27T19:39:53Z

/override pull-kubebuilder-e2e-k8s-1-34-1

/override pull-kubebuilder-e2e-k8s-1-34-0

k8s-ci-robot · 2025-10-27T19:39:56Z

@camilamacedo86: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

pull-kubebuilder-e2e-k8s-1-34-1

Only the following failed contexts/checkruns were expected:

EasyCLA
netlify/kubebuilder/deploy-preview
pull-kubebuilder-e2e-k8s-1-32-0
pull-kubebuilder-e2e-k8s-1-33-0
pull-kubebuilder-e2e-k8s-1-34-0
pull-kubebuilder-test
tide

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

In response to this:

/override pull-kubebuilder-e2e-k8s-1-34-1

/override pull-kubebuilder-e2e-k8s-1-34-0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

camilamacedo86 · 2025-10-27T19:40:08Z

/override pull-kubebuilder-e2e-k8s-1-34-0

k8s-ci-robot · 2025-10-27T19:40:11Z

@camilamacedo86: Overrode contexts on behalf of camilamacedo86: pull-kubebuilder-e2e-k8s-1-34-0

In response to this:

/override pull-kubebuilder-e2e-k8s-1-34-0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

camilamacedo86 · 2025-10-27T19:43:50Z

hack/docs/internal/multiversion-tutorial/generate_multiversion.go

+            - date; echo Hello from the Kubernetes cluster
+          restartPolicy: OnFailure`
+
+	newTextV1 := `      template:


We should instead update the places where those values are defined instead
See: https://github.com/kubernetes-sigs/kubebuilder/blob/master/hack/docs/internal/cronjob-tutorial/sample.go#L19-L34

We can replace all this implementation and just update the const.

I just addressed it, many thanks for the pointer.

Copilot

Pull Request Overview

This PR enhances security for Kubernetes CronJob samples across tutorials and adds comprehensive end-to-end tests for webhook conversion functionality. The changes add security contexts at both pod and container levels following Kubernetes security best practices.

Adds pod-level and container-level security contexts to all CronJob sample YAML files
Implements new e2e test for webhook conversion between v1 and v2 CronJob versions
Updates test infrastructure to include proper cleanup of test resources

Reviewed Changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
hack/docs/internal/multiversion-tutorial/samples.go	Updates the v2 sample code template to include security contexts
hack/docs/internal/cronjob-tutorial/sample.go	Updates the cronjob sample code template to include security contexts
hack/docs/internal/multiversion-tutorial/generate_multiversion.go	Adds new function to inject webhook conversion e2e test and test cleanup
docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go	Adds webhook conversion test and resource cleanup in AfterEach hook
docs/book/src/multiversion-tutorial/testdata/project/config/samples/batch_v2_cronjob.yaml	Adds security contexts to the v2 CronJob sample
docs/book/src/multiversion-tutorial/testdata/project/config/samples/batch_v1_cronjob.yaml	Adds security contexts to the v1 CronJob sample
docs/book/src/cronjob-tutorial/testdata/project/config/samples/batch_v1_cronjob.yaml	Adds security contexts to the cronjob tutorial sample

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-10-30T21:33:11Z

docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go

+			_, err := utils.Run(cmd)
+			Expect(err).NotTo(HaveOccurred(), "Failed to create v1 CronJob")
+
+		By("waiting for the v1 CronJob to be created")


Inconsistent indentation: this By statement uses tabs instead of the expected tab+spaces pattern. It should be indented with three tabs to align with the surrounding code within the It block.

Suggested change

By("waiting for the v1 CronJob to be created")

By("waiting for the v1 CronJob to be created")

Copilot · 2025-10-30T21:33:11Z

docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go

+			cmd = exec.Command("kubectl", "get", "cronjob.v1.batch.tutorial.kubebuilder.io", "cronjob-sample",
+				"-n", namespace, "-o", "jsonpath={.spec.schedule}")
+			v1Schedule, err := utils.Run(cmd)
+			Expect(err).NotTo(HaveOccurred(), "Failed to get v1 CronJob schedule")
+			Expect(strings.TrimSpace(v1Schedule)).To(Equal("*/1 * * * *"),
+				"v1 schedule should be in cron format")


Inconsistent indentation: lines 371-376 use an extra level of indentation. The code following the By statement should be indented with three tabs, not three tabs plus spaces.

Suggested change

cmd = exec.Command("kubectl", "get", "cronjob.v1.batch.tutorial.kubebuilder.io", "cronjob-sample",

"-n", namespace, "-o", "jsonpath={.spec.schedule}")

v1Schedule, err := utils.Run(cmd)

Expect(err).NotTo(HaveOccurred(), "Failed to get v1 CronJob schedule")

Expect(strings.TrimSpace(v1Schedule)).To(Equal("*/1 * * * *"),

"v1 schedule should be in cron format")

cmd = exec.Command("kubectl", "get", "cronjob.v1.batch.tutorial.kubebuilder.io", "cronjob-sample",

"-n", namespace, "-o", "jsonpath={.spec.schedule}")

v1Schedule, err := utils.Run(cmd)

Expect(err).NotTo(HaveOccurred(), "Failed to get v1 CronJob schedule")

Expect(strings.TrimSpace(v1Schedule)).To(Equal("*/1 * * * *"),

"v1 schedule should be in cron format")

Copilot · 2025-10-30T21:33:11Z

hack/docs/internal/multiversion-tutorial/generate_multiversion.go

+			_, err := utils.Run(cmd)
+			Expect(err).NotTo(HaveOccurred(), "Failed to create v1 CronJob")
+
+		By("waiting for the v1 CronJob to be created")


Inconsistent indentation in the generated test template: this By statement should be indented with three tabs to align with the surrounding code within the It block.

Suggested change

By("waiting for the v1 CronJob to be created")

By("waiting for the v1 CronJob to be created")

Copilot · 2025-10-30T21:33:12Z

hack/docs/internal/multiversion-tutorial/generate_multiversion.go

+			cmd = exec.Command("kubectl", "get", "cronjob.v1.batch.tutorial.kubebuilder.io", "cronjob-sample",
+				"-n", namespace, "-o", "jsonpath={.spec.schedule}")
+			v1Schedule, err := utils.Run(cmd)
+			Expect(err).NotTo(HaveOccurred(), "Failed to get v1 CronJob schedule")
+			Expect(strings.TrimSpace(v1Schedule)).To(Equal("*/1 * * * *"),
+				"v1 schedule should be in cron format")


Inconsistent indentation in the generated test template: lines 826-831 use an extra level of indentation. The code following the By statement should be indented with three tabs, matching the pattern used in other By blocks.

Suggested change

cmd = exec.Command("kubectl", "get", "cronjob.v1.batch.tutorial.kubebuilder.io", "cronjob-sample",

"-n", namespace, "-o", "jsonpath={.spec.schedule}")

v1Schedule, err := utils.Run(cmd)

Expect(err).NotTo(HaveOccurred(), "Failed to get v1 CronJob schedule")

Expect(strings.TrimSpace(v1Schedule)).To(Equal("*/1 * * * *"),

"v1 schedule should be in cron format")

cmd = exec.Command("kubectl", "get", "cronjob.v1.batch.tutorial.kubebuilder.io", "cronjob-sample",

"-n", namespace, "-o", "jsonpath={.spec.schedule}")

v1Schedule, err := utils.Run(cmd)

Expect(err).NotTo(HaveOccurred(), "Failed to get v1 CronJob schedule")

Expect(strings.TrimSpace(v1Schedule)).To(Equal("*/1 * * * *"),

"v1 schedule should be in cron format")

camilamacedo86

/lgtm

I think we can fix the spaces in a follow up.
Thank you 🥇

k8s-ci-robot · 2025-11-02T09:13:14Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86, wazery

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [camilamacedo86]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k8s-ci-robot · 2025-11-02T09:55:40Z

@wazery: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-kubebuilder-e2e-k8s-1-34-1	`1361e7e`	link	true	`/test pull-kubebuilder-e2e-k8s-1-34-1`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

camilamacedo86 · 2025-11-02T10:34:21Z

/test pull-kubebuilder-e2e-k8s-1-32-0

k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 1, 2025

k8s-ci-robot requested review from Kavinjsir and camilamacedo86 September 1, 2025 19:40

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 1, 2025

wazery force-pushed the w-webhook-conversion-e2e-test branch 2 times, most recently from 2fda561 to 681bf43 Compare September 1, 2025 19:56

wazery marked this pull request as ready for review September 1, 2025 22:16

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 1, 2025

camilamacedo86 requested changes Sep 2, 2025

View reviewed changes

docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go Show resolved Hide resolved

wazery force-pushed the w-webhook-conversion-e2e-test branch from 681bf43 to d65d418 Compare September 2, 2025 13:19

k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 2, 2025

wazery force-pushed the w-webhook-conversion-e2e-test branch 2 times, most recently from effbdb8 to 6d31a62 Compare September 2, 2025 13:42

wazery requested a review from camilamacedo86 September 2, 2025 13:42

wazery force-pushed the w-webhook-conversion-e2e-test branch 2 times, most recently from 9fab9f8 to 6d8d9f7 Compare September 2, 2025 15:35

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 2, 2025

camilamacedo86 reviewed Sep 5, 2025

View reviewed changes

docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go Outdated Show resolved Hide resolved

camilamacedo86 reviewed Sep 5, 2025

View reviewed changes

docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go Outdated Show resolved Hide resolved

wazery force-pushed the w-webhook-conversion-e2e-test branch 3 times, most recently from e79777c to 941df82 Compare September 9, 2025 12:03

wazery requested a review from camilamacedo86 September 9, 2025 12:09

vitorfloriano mentioned this pull request Sep 12, 2025

WIP 🌱 fix: E2E test for conversion webhook #4475

Closed

wazery force-pushed the w-webhook-conversion-e2e-test branch from 1361e7e to 2891ee8 Compare October 26, 2025 21:14

wazery force-pushed the w-webhook-conversion-e2e-test branch from 2891ee8 to 5921329 Compare October 27, 2025 12:56

wazery force-pushed the w-webhook-conversion-e2e-test branch from 5921329 to e7a133f Compare October 27, 2025 19:00

wazery requested a review from camilamacedo86 October 27, 2025 19:37

camilamacedo86 reviewed Oct 27, 2025

View reviewed changes

feat: add e2e test to validate webhook conversion between versions

a305b10

wazery force-pushed the w-webhook-conversion-e2e-test branch from e7a133f to a305b10 Compare October 27, 2025 20:08

wazery requested a review from camilamacedo86 October 27, 2025 20:15

camilamacedo86 closed this Oct 29, 2025

camilamacedo86 reopened this Oct 29, 2025

camilamacedo86 closed this Oct 30, 2025

camilamacedo86 reopened this Oct 30, 2025

camilamacedo86 requested a review from Copilot October 30, 2025 21:23

Copilot AI reviewed Oct 30, 2025

View reviewed changes

camilamacedo86 approved these changes Nov 2, 2025

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 2, 2025

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 2, 2025

k8s-ci-robot merged commit 78fbec7 into kubernetes-sigs:master Nov 2, 2025
70 of 76 checks passed

	By("waiting for the v1 CronJob to be created")
	By("waiting for the v1 CronJob to be created")

📖 add e2e test to validate webhook conversion between versions in the tutorials #5069

📖 add e2e test to validate webhook conversion between versions in the tutorials #5069

Conversation

wazery commented Sep 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented Sep 1, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

camilamacedo86 commented Sep 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

camilamacedo86 commented Oct 27, 2025

Uh oh!

k8s-ci-robot commented Oct 27, 2025

Uh oh!

wazery commented Oct 27, 2025

Uh oh!

k8s-ci-robot commented Oct 27, 2025

Uh oh!

wazery commented Oct 27, 2025

Uh oh!

camilamacedo86 commented Oct 27, 2025

Uh oh!

k8s-ci-robot commented Oct 27, 2025

Uh oh!

camilamacedo86 commented Oct 27, 2025

Uh oh!

k8s-ci-robot commented Oct 27, 2025

Uh oh!

camilamacedo86 Oct 27, 2025

Choose a reason for hiding this comment

Uh oh!

wazery Oct 27, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

camilamacedo86 left a comment

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented Nov 2, 2025

Uh oh!

k8s-ci-robot commented Nov 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

camilamacedo86 commented Nov 2, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

wazery commented Sep 1, 2025 •

edited

Loading

camilamacedo86 commented Sep 13, 2025 •

edited

Loading

k8s-ci-robot commented Nov 2, 2025 •

edited

Loading