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

⚠️ Use Kubernetes 1.26 in Quick Start docs and CAPD. #7799

Merged
merged 1 commit into from
Jan 3, 2023
Merged

⚠️ Use Kubernetes 1.26 in Quick Start docs and CAPD. #7799

merged 1 commit into from
Jan 3, 2023

Conversation

aniruddha2000
Copy link
Contributor

@aniruddha2000 aniruddha2000 commented Dec 22, 2022 •
edited
Loading

Signed-off-by: Aniruddha Basak [email protected]

What this PR does / why we need it:

Updates the Quick Start guide to use Kubernetes 1.26.
Part of #7671

cc @kubernetes-sigs/cluster-api-release-team

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 22, 2022
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 22, 2022
ykakarap
ykakarap reviewed Dec 23, 2022
View reviewed changes
Copy link
Contributor

@ykakarap ykakarap left a comment

Choose a reason for hiding this comment

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

Did a first pass review. Looks good.
Will verify quick-start and report back.

alexander-demicev
alexander-demicev reviewed Dec 23, 2022
View reviewed changes
Copy link
Contributor

@alexander-demicev alexander-demicev left a comment

Choose a reason for hiding this comment

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

seems fine to me

@sbueringer
Copy link
Member

Thx! one nit + "Will verify quick-start and report back." from @ykakarap

@nawazkh
Copy link
Member

nawazkh commented Dec 27, 2022

looks good to me!

@cpanato
Copy link
Member

cpanato commented Dec 29, 2022

/lgtm

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

LGTM label has been added.

Git tree hash: 00569e85b8f25732ffafe581593d68d7eccd27c2

@hackeramitkumar
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 1, 2023
@fabriziopandini
Copy link
Member

/lgtm

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

LGTM label has been added.

Git tree hash: 944f9cae50e7a34e1a10c7fe3959b04b9d1fe2c6

@sbueringer
Copy link
Member

@aniruddha2000 Can you please rebase?

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 2, 2023
sbueringer
sbueringer reviewed Jan 2, 2023
View reviewed changes
Copy link
Member

@sbueringer sbueringer left a comment

Choose a reason for hiding this comment

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

Rebase + last nits otherwise I think we can merge

test/e2e/config/docker.yaml Show resolved Hide resolved
@sbueringer sbueringer mentioned this pull request Jan 2, 2023
Closed
13 tasks
@sbueringer
Copy link
Member

/cherry-pick release-1.3

@k8s-infra-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-1.3

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

/cherry-pick release-1.2

@k8s-infra-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-1.2

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.

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 2, 2023
@sbueringer
Copy link
Member

Changes look good.

@aniruddha2000 Can you please rebase the PR?
Then let's run all tests and we should be ready for merge

@aniruddha2000
Copy link
Contributor Author

Sure!

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 2, 2023
@sbueringer
Copy link
Member

/test ?

@k8s-ci-robot

This comment was marked as outdated.

Sign in to view
@sbueringer
Copy link
Member

sbueringer commented Jan 2, 2023 •
edited
Loading

Thx!

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-25-latest-main

/lgtm

Will approve after successful tests.

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

LGTM label has been added.

Git tree hash: d634f28f7c2bd91e6a56b4e0b0b77ad9b89fc2cb

@sbueringer
Copy link
Member

/retest

@sbueringer
Copy link
Member

/approve

Thank you! 🎉

@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 Jan 3, 2023
@k8s-ci-robot k8s-ci-robot merged commit d1514c3 into kubernetes-sigs:main Jan 3, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.4 milestone Jan 3, 2023
@k8s-infra-cherrypick-robot
Copy link

@sbueringer: #7799 failed to apply on top of branch "release-1.3":

Applying: Use Kubernetes 1.26 in Quick Start docs and CAPD.
Using index info to reconstruct a base tree...
M	.github/ISSUE_TEMPLATE/kubernetes_bump.md
M	Tiltfile
M	docs/book/src/developer/tilt.md
M	docs/book/src/user/quick-start.md
M	test/e2e/clusterctl_upgrade_test.go
M	test/e2e/config/docker.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/config/docker.yaml
Auto-merging test/e2e/clusterctl_upgrade_test.go
CONFLICT (content): Merge conflict in test/e2e/clusterctl_upgrade_test.go
Auto-merging docs/book/src/user/quick-start.md
Auto-merging docs/book/src/developer/tilt.md
Auto-merging Tiltfile
CONFLICT (content): Merge conflict in Tiltfile
Auto-merging .github/ISSUE_TEMPLATE/kubernetes_bump.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use Kubernetes 1.26 in Quick Start docs and CAPD.
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.3

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.

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: #7799 failed to apply on top of branch "release-1.2":

Applying: Use Kubernetes 1.26 in Quick Start docs and CAPD.
Using index info to reconstruct a base tree...
A	.github/ISSUE_TEMPLATE/kubernetes_bump.md
M	Tiltfile
M	docs/book/src/developer/tilt.md
M	docs/book/src/user/quick-start.md
M	test/e2e/clusterctl_upgrade_test.go
M	test/e2e/config/docker.yaml
M	test/framework/bootstrap/kind_provider.go
M	test/infrastructure/docker/Dockerfile
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
M	test/infrastructure/docker/internal/docker/machine.go
Falling back to patching base and 3-way merge...
Auto-merging test/infrastructure/docker/internal/docker/machine.go
CONFLICT (content): Merge conflict in test/infrastructure/docker/internal/docker/machine.go
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/infrastructure/docker/Dockerfile
CONFLICT (content): Merge conflict in test/infrastructure/docker/Dockerfile
Auto-merging test/framework/bootstrap/kind_provider.go
CONFLICT (content): Merge conflict in test/framework/bootstrap/kind_provider.go
Auto-merging test/e2e/config/docker.yaml
CONFLICT (content): Merge conflict in test/e2e/config/docker.yaml
Auto-merging test/e2e/clusterctl_upgrade_test.go
CONFLICT (content): Merge conflict in test/e2e/clusterctl_upgrade_test.go
Auto-merging docs/book/src/user/quick-start.md
CONFLICT (content): Merge conflict in docs/book/src/user/quick-start.md
Auto-merging docs/book/src/developer/tilt.md
CONFLICT (content): Merge conflict in docs/book/src/developer/tilt.md
Auto-merging Tiltfile
CONFLICT (content): Merge conflict in Tiltfile
CONFLICT (modify/delete): .github/ISSUE_TEMPLATE/kubernetes_bump.md deleted in HEAD and modified in Use Kubernetes 1.26 in Quick Start docs and CAPD.. Version Use Kubernetes 1.26 in Quick Start docs and CAPD. of .github/ISSUE_TEMPLATE/kubernetes_bump.md left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use Kubernetes 1.26 in Quick Start docs and CAPD.
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.2

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

@aniruddha2000 Can you please open manual cherry-picks for release-1.3 and release-1.2?

@sbueringer sbueringer mentioned this pull request Jan 4, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ykakarap ykakarap ykakarap left review comments

@alexander-demicev alexander-demicev alexander-demicev left review comments

@sbueringer sbueringer sbueringer left review comments

@CecileRobertMichon CecileRobertMichon Awaiting requested review from CecileRobertMichon

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

@cpanato cpanato Awaiting requested review from cpanato

@hackeramitkumar hackeramitkumar Awaiting requested review from hackeramitkumar

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

Assignees

@cpanato cpanato

@sbueringer sbueringer

@fabriziopandini fabriziopandini

@hackeramitkumar hackeramitkumar

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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.
10 participants
@aniruddha2000 @sbueringer @nawazkh @cpanato @k8s-ci-robot @hackeramitkumar @fabriziopandini @k8s-infra-cherrypick-robot @alexander-demicev @ykakarap