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.

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

🌱 Bump Kubernetes in tests to v1.30.0 and claim support for v1.30 #10454

Merged
merged 1 commit into from
Apr 18, 2024
Merged

🌱 Bump Kubernetes in tests to v1.30.0 and claim support for v1.30 #10454

merged 1 commit into from
Apr 18, 2024

Conversation

chrischdi
Copy link
Member

@chrischdi chrischdi commented Apr 17, 2024 •
edited

What this PR does / why we need it:

Requirements:

  • k8s v1.30 GA release

Steps:

  • Modify CAPD to use the new Kubernetes release after it is GA:

  • Update book:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):

Part of #10026

/area testing

/hold due to waiting for v1.30 GA

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. area/testing Issues or PRs related to testing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 17, 2024
@chrischdi chrischdi mentioned this pull request Apr 17, 2024
Closed
13 tasks
@chrischdi chrischdi changed the title [WIP] 🌱 test: Bump kubernetes in test due to v1.30 GA [WIP] 🌱 Bump Kubernetes in tests to v1.30.0 and claim support for v1.30 Apr 17, 2024
@chrischdi
Copy link
Member Author

chrischdi commented Apr 17, 2024 •
edited

/cherry-pick release-1.7

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Apr 17, 2024 •
edited by chrischdi

@chrischdi: once the present PR merges, I will cherry-pick it on top of release-1.7 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.7

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.

@sbueringer
Copy link
Member

/test ?

@k8s-ci-robot
Copy link
Contributor

@sbueringer: The following commands are available to trigger required jobs:

  • /test pull-cluster-api-build-main
  • /test pull-cluster-api-e2e-blocking-main
  • /test pull-cluster-api-e2e-conformance-ci-latest-main
  • /test pull-cluster-api-e2e-conformance-main
  • /test pull-cluster-api-e2e-dualstack-and-ipv6-main
  • /test pull-cluster-api-e2e-main
  • /test pull-cluster-api-e2e-mink8s-main
  • /test pull-cluster-api-e2e-upgrade-1-29-1-30-main
  • /test pull-cluster-api-test-main
  • /test pull-cluster-api-test-mink8s-main
  • /test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-apidiff-main
  • pull-cluster-api-build-main
  • pull-cluster-api-e2e-blocking-main
  • pull-cluster-api-test-main
  • pull-cluster-api-verify-main

In response to this:

/test ?

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.

@sbueringer
Copy link
Member

/test pull-cluster-api-e2e-blocking-main
/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-dualstack-and-ipv6-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-29-1-30-main

@sbueringer
Copy link
Member

Looks like there's a gap for ci latest: https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/10454/pull-cluster-api-e2e-conformance-ci-latest-main/1780809015530360832

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 18, 2024
@chrischdi
Copy link
Member Author

/test pull-cluster-api-e2e-blocking-main
/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-dualstack-and-ipv6-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-29-1-30-main

@chrischdi chrischdi changed the title [WIP] 🌱 Bump Kubernetes in tests to v1.30.0 and claim support for v1.30 🌱 Bump Kubernetes in tests to v1.30.0 and claim support for v1.30 Apr 18, 2024
@k8s-ci-robot 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 Apr 18, 2024
@sbueringer
Copy link
Member

Seems like an unrelated flake

/test pull-cluster-api-e2e-main

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: a6de0466cfa106ce65693a1bf3beacf8b3ca7c4e

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 Apr 18, 2024
@sbueringer
Copy link
Member

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 18, 2024
@k8s-ci-robot k8s-ci-robot merged commit a52ab37 into kubernetes-sigs:main Apr 18, 2024
34 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.8 milestone Apr 18, 2024
@k8s-infra-cherrypick-robot
Copy link

@chrischdi: #10454 failed to apply on top of branch "release-1.7":

Applying: test: Bump kubernetes in test due to v1.30 GA
Using index info to reconstruct a base tree...
M	test/e2e/config/docker.yaml
M	test/infrastructure/docker/examples/machine-pool.yaml
M	test/infrastructure/docker/examples/simple-cluster-ipv6.yaml
M	test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml
M	test/infrastructure/docker/examples/simple-cluster.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/infrastructure/docker/examples/simple-cluster.yaml
CONFLICT (content): Merge conflict in test/infrastructure/docker/examples/simple-cluster.yaml
Auto-merging test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml
CONFLICT (content): Merge conflict in test/infrastructure/docker/examples/simple-cluster-without-kcp.yaml
Auto-merging test/infrastructure/docker/examples/simple-cluster-ipv6.yaml
CONFLICT (content): Merge conflict in test/infrastructure/docker/examples/simple-cluster-ipv6.yaml
Auto-merging test/infrastructure/docker/examples/machine-pool.yaml
CONFLICT (content): Merge conflict in test/infrastructure/docker/examples/machine-pool.yaml
Auto-merging test/e2e/config/docker.yaml
CONFLICT (content): Merge conflict in test/e2e/config/docker.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 test: Bump kubernetes in test due to v1.30 GA
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.7

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.

@chrischdi chrischdi mentioned this pull request Apr 18, 2024
Merged
@sbueringer sbueringer mentioned this pull request May 21, 2024
Open
15 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

@stmcginnis stmcginnis Awaiting requested review from stmcginnis

Assignees

@sbueringer sbueringer

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/testing Issues or PRs related to testing 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.8
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@chrischdi @k8s-infra-cherrypick-robot @sbueringer @k8s-ci-robot