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

Update e2e test images, fix test timeouts #651

Merged
merged 1 commit into from
Oct 25, 2024

Conversation

dereknola
Copy link
Contributor

Changes

  • Update the out of date images used for E2E testing.
  • Remove incorrectly named and deprecated flags

Linked Issues

#646

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 22, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @dereknola. Thanks for your PR.

I'm waiting for a kubernetes 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.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 22, 2024
@k8s-ci-robot k8s-ci-robot requested review from bowei and MrHohn October 22, 2024 20:10
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 22, 2024
@dereknola
Copy link
Contributor Author

@DamianSawicki Can you approve this for "testing". Hopefully this should help resolve the prow test failures.

@DamianSawicki
Copy link
Collaborator

/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 Oct 22, 2024
Copy link
Collaborator

@DamianSawicki DamianSawicki left a comment

Choose a reason for hiding this comment

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

pull-kubernetes-dns-test succeeded! 🎉🎉🎉 Thanks so much @dereknola for fixing it and thereby unblocking other PRs!

Btw. how did you know that bumping hyperkube and etcd images would help?

test/e2e/sidecar/Dockerfile.e2e Outdated Show resolved Hide resolved
test/e2e/cluster/manifests/addon-manager.json Show resolved Hide resolved
pkg/e2e/options.go Show resolved Hide resolved
pkg/e2e/dns/dns.go Show resolved Hide resolved
@dereknola
Copy link
Contributor Author

dereknola commented Oct 23, 2024

Btw. how did you know that bumping hyperkube and etcd images would help?

I didn't, but it was the starting point for trying to fix stuff. Those images are horribly out of date, so bumping to latest versions would bring this repo in line with the rest of the K8s packages. I figured there might be some compatibility issues affecting the tests.

@dereknola
Copy link
Contributor Author

dereknola commented Oct 23, 2024

@DamianSawicki I have bumped the related images as much as possible and left TODOs in areas that need future work.

@@ -13,11 +13,11 @@
# limitations under the License.
#
# Builds the docker container for the e2e test.
FROM registry.k8s.io/kube-dnsmasq-amd64:1.14.11
FROM alpine:3.20
Copy link
Contributor Author

@dereknola dereknola Oct 23, 2024

Choose a reason for hiding this comment

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

The original image of kube-dnsmasq-amd64:1.4.1 was just alpine with dnsmasq added. Since that image is no longer built, replicating it with normal alpine works just fine.

All this image does is exec the side-car binary and watches dnsmasq

@DamianSawicki
Copy link
Collaborator

@DamianSawicki I have bumped the related images as much as possible and left TODOs in areas that need future work.

Yeah, let's leave it to separate PRs. Thanks again for fixing the CI for kubernetes/dns!

/lgtm
/assign @bowei

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 24, 2024
@DamianSawicki
Copy link
Collaborator

DamianSawicki commented Oct 25, 2024

One more thing, please squash all these commits before merging with master (doesn't need to be done in advance, can be done during merging via the Squash and merge button).

EDIT: as @kl52752 pointed out to me on priv, PRs in this repo used to always auto-merge, so there won't be time to use the button Squash and merge, hence please squash in advance.

@kl52752
Copy link
Collaborator

kl52752 commented Oct 25, 2024

Thank you for your commit @dereknola :)
Please squash your commits and we can merge this PR.

Update side-e2e base image and k8s-dns-dnsmasq images to maximum allowed

Signed-off-by: Derek Nola <[email protected]>
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 25, 2024
@DamianSawicki
Copy link
Collaborator

Thanks for squashing! I checked that the squashed version is identical to the previous one. Please approve @kl52752 or @bowei.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 25, 2024
@kl52752
Copy link
Collaborator

kl52752 commented Oct 25, 2024

/approve
/Lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: DamianSawicki, dereknola, kl52752

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 Oct 25, 2024
@k8s-ci-robot k8s-ci-robot merged commit c0fa2d1 into kubernetes:master Oct 25, 2024
3 checks passed
@DamianSawicki
Copy link
Collaborator

EDIT: as @kl52752 pointed out to me on priv, PRs in this repo used to always auto-merge, so there won't be time to use the button Squash and merge, hence please squash in advance.

I guess it's the @k8s-ci-robot that is merging PRs in this repo, and not the native github auto-merge feature. It seems we can prevent it from doing so with the hold command (https://prow.k8s.io/command-help?repo=kubernetes%2Fdns) and then we could manually merge with Squash and merge in the future.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants