Skip to content

🌱 test: drop handling for old k8s version #2925

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Sep 12, 2022
Merged

🌱 test: drop handling for old k8s version #2925

merged 3 commits into from
Sep 12, 2022

Conversation

Eileen-Yu
Copy link
Contributor

Description:

This PR aims to drop handling of old k8s version in e2e test cases.

Motivation

This aims to resolve #2921

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 11, 2022
@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 11, 2022
@k8s-ci-robot
Copy link
Contributor

Hi @Eileen-Yu. 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/test-infra repository.

camilamacedo86
camilamacedo86 reviewed Sep 11, 2022
View reviewed changes
test/e2e/v3/plugin_cluster_test.go Outdated
Comment on lines 108 to 101
It("should generate a runnable project with v1beta1 CRDs and Webhooks with restricted pods", func() {
// Skip if cluster version < 1.15, when `.spec.preserveUnknownFields` was not a v1beta1 CRD field.
// Skip if cluster version < 1.19, because securityContext.seccompProfile only works from 1.19
// Otherwise, unknown field "seccompProfile" in io.k8s.api.core.v1.PodSecurityContext will be faced
// Skip if cluster version >= 1.22 because pre v1 CRDs and webhooks no longer exist.
if srvVer := kbc.K8sVersion.ServerVersion; srvVer.GetMajorInt() <= 1 && srvVer.GetMinorInt() < 19 ||
srvVer.GetMajorInt() <= 1 && srvVer.GetMinorInt() >= 22 {
Skip(fmt.Sprintf("cluster version %s does not support project defaults "+
"and securityContext.seccompProfile", srvVer.GitVersion))
}

kbc.IsRestricted = true
GenerateV3(kbc, "v1beta1")
// GenerateV3(kbc, "v1beta1")
Run(kbc)
})
Copy link
Member

Choose a reason for hiding this comment

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

We can remove the whole one since it is to do the same done above but with the CRD/Webhooks using the API v1beta1 which is no longer provided since k8s 1.22

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just removed the whole it(...) test case if I'm understanding correctly.

Copy link
Member

Choose a reason for hiding this comment

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

Yes, we can have the whole it(...)

@Eileen-Yu Eileen-Yu force-pushed the test/remove-test-on-old-k8s branch 2 times, most recently from 159098d to 23b5c86 Compare September 11, 2022 00:21
Eileen-Yu
Eileen-Yu commented Sep 11, 2022
View reviewed changes
@Eileen-Yu Eileen-Yu force-pushed the test/remove-test-on-old-k8s branch from 23b5c86 to a9e6b79 Compare September 11, 2022 00:43
@k8s-ci-robot 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 11, 2022
camilamacedo86
camilamacedo86 reviewed Sep 11, 2022
View reviewed changes
test/e2e/v3/plugin_cluster_test.go Outdated
srvVer.GitVersion))
}

GenerateV3ComponentConfig(kbc, "v1")
Copy link
Member

Choose a reason for hiding this comment

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

@Eileen-Yu,

That is great. Just a nit.
See that we no longer need to pass v1 or v1beta1
So, we can clean up the calls as well removing this option as the related code.

Example:

kubebuilder/test/e2e/v3/generate_test.go

Line 133 in ed5d217

func GenerateV3(kbc *utils.TestContext, crdAndWebhookVersion string) {

camilamacedo86
camilamacedo86 reviewed Sep 11, 2022
View reviewed changes
Copy link
Member

@camilamacedo86 camilamacedo86 left a comment

Choose a reason for hiding this comment

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

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 11, 2022
@Eileen-Yu Eileen-Yu force-pushed the test/remove-test-on-old-k8s branch from a9e6b79 to 0d0def5 Compare September 11, 2022 23:22
camilamacedo86
camilamacedo86 reviewed Sep 12, 2022
View reviewed changes
Copy link
Member

@camilamacedo86 camilamacedo86 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

@Eileen-Yu,

That is great work 🥇

@camilamacedo86 camilamacedo86 added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Sep 12, 2022
@camilamacedo86
Copy link
Member

/approved
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 12, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86, Eileen-Yu

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:

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 k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 12, 2022
@k8s-ci-robot k8s-ci-robot merged commit a6251f0 into kubernetes-sigs:master Sep 12, 2022
@Eileen-Yu Eileen-Yu mentioned this pull request Jun 7, 2023
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@camilamacedo86 camilamacedo86 camilamacedo86 approved these changes

@rashmigottipati rashmigottipati Awaiting requested review from rashmigottipati

@varshaprasad96 varshaprasad96 Awaiting requested review from varshaprasad96

Assignees

@camilamacedo86 camilamacedo86

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Clean up the tests and document test policy

3 participants

@Eileen-Yu @k8s-ci-robot @camilamacedo86