Bump Kubernetes to v1.24.0 and fix AWSMachinePool minsize #3468

sedefsavas · 2022-05-12T14:13:34Z

What this PR does / why we need it:
Bumping cluster-api version to v1.1.5 and Kubernetes version we use in e2e tests to v1.24.0.

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

Special notes for your reviewer:

Checklist:

squashed commits
includes documentation
adds unit tests
adds or updates e2e tests

k8s-ci-robot · 2022-05-12T14:13:42Z

@sedefsavas: This issue is currently awaiting triage.

If CAPA/CAPI contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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 · 2022-05-12T18:57:04Z

go.mod

 	golang.org/x/text v0.3.7
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.23.5
+	k8s.io/api v0.24.0


I think those k8s.io/* versions all have to stay the same (or at least stay on v0.23.x)

Thanks! finally reverted those properly.

sedefsavas · 2022-05-13T09:26:59Z

/test ?

k8s-ci-robot · 2022-05-13T09:27:00Z

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

/test pull-cluster-api-provider-aws-build
/test pull-cluster-api-provider-aws-test
/test pull-cluster-api-provider-aws-verify

The following commands are available to trigger optional jobs:

/test pull-cluster-api-provider-aws-apidiff-main
/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-blocking
/test pull-cluster-api-provider-aws-e2e-conformance
/test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts
/test pull-cluster-api-provider-aws-e2e-eks

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

pull-cluster-api-provider-aws-apidiff-main
pull-cluster-api-provider-aws-build
pull-cluster-api-provider-aws-test
pull-cluster-api-provider-aws-verify

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.

sedefsavas · 2022-05-13T09:27:47Z

/test pull-cluster-api-provider-aws-e2e

sedefsavas · 2022-05-13T09:44:35Z

/test pull-cluster-api-provider-aws-e2e-blocking

sbueringer · 2022-05-13T10:06:05Z

test/e2e/data/e2e_conf.yaml

-  KUBERNETES_VERSION: "v1.23.3"
-  KUBERNETES_VERSION_UPGRADE_TO: "v1.23.3"
-  KUBERNETES_VERSION_UPGRADE_FROM: "v1.22.4"
+  KUBERNETES_VERSION_MANAGEMENT: "v1.24.0"


I think we have to keep this version on v1.23.3 for now.

The problem is that only kind v0.13 is compatible with kindest/node:v1.24.0+ and we didn't bump the kind version yet.

I think this should be okay for now given that we mostly want to verify that CAPI is able to manage v1.24 clusters vs kind being able to create v1.24 bootstrap clusters.

xref: the CI failure during kind create cluster: https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api-provider-aws/3468/pull-cluster-api-provider-aws-e2e/1525045134981337088

(cc @fabriziopandini)

With the latest v1.1.x release we should now be able to use v1.24 as mgmt cluster. with kind

sedefsavas · 2022-05-13T11:43:08Z

/test pull-cluster-api-provider-aws-e2e-blocking

sedefsavas · 2022-05-13T12:57:55Z

/test pull-cluster-api-provider-aws-e2e

Ankitasw · 2022-06-14T08:42:31Z

@sedefsavas any leads on this PR?

sedefsavas · 2022-07-27T21:48:43Z

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-eks
/test pull-cluster-api-provider-aws-e2e-conformance
/test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts

sedefsavas · 2022-07-27T21:53:39Z

Reason of the machinepool failure was e2e-config was using an old nightly image as the latest of 1.1.x capi version.
After all the e2e tests pass, this is good to go.

mweibel · 2022-07-28T05:29:36Z

ah that makes sense! I did wonder whether this needs updating but wasn't sure.
Also explains why it worked locally - I had CAPI running locally of course.

Thanks for fixing!

sedefsavas · 2022-07-28T10:20:36Z

/test pull-cluster-api-provider-aws-e2e

k8s-ci-robot · 2022-07-28T10:30:34Z

@sedefsavas: 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-cluster-api-provider-aws-e2e-blocking	2d885d5b23d3323e8079cd146b16ae0017041a7c	link	false	`/test pull-cluster-api-provider-aws-e2e-blocking`

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/test-infra repository. I understand the commands that are listed here.

sedefsavas · 2022-07-28T10:55:34Z

/test pull-cluster-api-provider-aws-e2e

sedefsavas · 2022-07-28T13:30:42Z

/assign @richardcase

EKS tests passed in the previous run.

sedefsavas · 2022-07-28T13:50:22Z

/hold cancel

richardcase · 2022-07-29T12:52:19Z

This all looks ok to me

/lgtm

sedefsavas · 2022-07-29T13:14:57Z

/approve

Ups there is a pull-cluster-api-provider-aws-build-release-1-5 job running, there must be a bug in the release-1.5 jobs.

k8s-ci-robot · 2022-07-29T13:15:14Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sedefsavas

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~~ [sedefsavas]

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

k8s-infra-cherrypick-robot · 2022-07-29T13:29:54Z

@sedefsavas: #3468 failed to apply on top of branch "release-1.5":

Applying: Bump CAPI to v1.1.5 and e2e test Kubernetes versions to v1.24.0
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	pkg/cloud/scope/machine_test.go
M	test/e2e/data/e2e_eks_conf.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/data/e2e_eks_conf.yaml
Auto-merging pkg/cloud/scope/machine_test.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump CAPI to v1.1.5 and e2e test Kubernetes versions to v1.24.0
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.5

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 added needs-priority needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels May 12, 2022

k8s-ci-robot requested review from Ankitasw and pydctw May 12, 2022 14:13

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 12, 2022

sedefsavas force-pushed the 1.24 branch from c6738b3 to badc1fa Compare May 12, 2022 14:42

sbueringer reviewed May 12, 2022

View reviewed changes

sedefsavas force-pushed the 1.24 branch 5 times, most recently from c75e375 to 32f46ea Compare May 13, 2022 09:18

sbueringer reviewed May 13, 2022

View reviewed changes

sedefsavas force-pushed the 1.24 branch from 32f46ea to d37c781 Compare May 13, 2022 11:40

sedefsavas mentioned this pull request Jun 6, 2022

[WIP] Bump kind to v1.14.0 and cluster-api to v1.1.4 #3506

Closed

4 tasks

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 6, 2022

sedefsavas force-pushed the 1.24 branch from 1b63453 to 30631b0 Compare June 27, 2022 21:27

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 27, 2022

sedefsavas force-pushed the 1.24 branch from 30631b0 to 55fd605 Compare June 27, 2022 21:31

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 27, 2022

sedefsavas force-pushed the 1.24 branch from 0b109b4 to 7ca5c24 Compare July 27, 2022 21:34

k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed do-not-merge/contains-merge-commits labels Jul 27, 2022

sedefsavas and others added 3 commits July 27, 2022 14:38

Bump CAPI to v1.1.5 and e2e test Kubernetes versions to v1.24.0

139df76

Drop v1alpha3 to v1beta1 upgrade tests

c4ee898

fix: allows AWSMachinePoolSpec.minSize to be 0

7b51921

sedefsavas force-pushed the 1.24 branch from 7ca5c24 to 9c99416 Compare July 27, 2022 21:38

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 27, 2022

sedefsavas force-pushed the 1.24 branch from 9c99416 to 59059b3 Compare July 27, 2022 21:48

sedefsavas force-pushed the 1.24 branch from 59059b3 to 7e12a3a Compare July 28, 2022 10:18

Set cluster api version to 1.1.5 in e2e config

b581910

sedefsavas force-pushed the 1.24 branch from 7e12a3a to b581910 Compare July 28, 2022 10:54

k8s-ci-robot assigned richardcase Jul 28, 2022

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 28, 2022

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

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 29, 2022

k8s-ci-robot merged commit d6dcb17 into kubernetes-sigs:main Jul 29, 2022

k8s-ci-robot added this to the v1.x milestone Jul 29, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump Kubernetes to v1.24.0 and fix AWSMachinePool minsize #3468

Bump Kubernetes to v1.24.0 and fix AWSMachinePool minsize #3468

sedefsavas commented May 12, 2022 •

edited

Loading

k8s-ci-robot commented May 12, 2022

sbueringer May 12, 2022 •

edited

Loading

sedefsavas May 12, 2022

sedefsavas commented May 13, 2022

k8s-ci-robot commented May 13, 2022

sedefsavas commented May 13, 2022

sedefsavas commented May 13, 2022

sbueringer May 13, 2022 •

edited

Loading

sedefsavas May 13, 2022

sbueringer Jun 7, 2022 •

edited

Loading

sedefsavas commented May 13, 2022

sedefsavas commented May 13, 2022

Ankitasw commented Jun 14, 2022

sedefsavas commented Jul 27, 2022

sedefsavas commented Jul 27, 2022

mweibel commented Jul 28, 2022 •

edited

Loading

sedefsavas commented Jul 28, 2022

k8s-ci-robot commented Jul 28, 2022 •

edited

Loading

sedefsavas commented Jul 28, 2022

sedefsavas commented Jul 28, 2022

sedefsavas commented Jul 28, 2022

richardcase commented Jul 29, 2022

sedefsavas commented Jul 29, 2022

k8s-ci-robot commented Jul 29, 2022

k8s-infra-cherrypick-robot commented Jul 29, 2022

Bump Kubernetes to v1.24.0 and fix AWSMachinePool minsize #3468

Bump Kubernetes to v1.24.0 and fix AWSMachinePool minsize #3468

Conversation

sedefsavas commented May 12, 2022 • edited Loading

k8s-ci-robot commented May 12, 2022

sbueringer May 12, 2022 • edited Loading

Choose a reason for hiding this comment

sedefsavas May 12, 2022

Choose a reason for hiding this comment

sedefsavas commented May 13, 2022

k8s-ci-robot commented May 13, 2022

sedefsavas commented May 13, 2022

sedefsavas commented May 13, 2022

sbueringer May 13, 2022 • edited Loading

Choose a reason for hiding this comment

sedefsavas May 13, 2022

Choose a reason for hiding this comment

sbueringer Jun 7, 2022 • edited Loading

Choose a reason for hiding this comment

sedefsavas commented May 13, 2022

sedefsavas commented May 13, 2022

Ankitasw commented Jun 14, 2022

sedefsavas commented Jul 27, 2022

sedefsavas commented Jul 27, 2022

mweibel commented Jul 28, 2022 • edited Loading

sedefsavas commented Jul 28, 2022

k8s-ci-robot commented Jul 28, 2022 • edited Loading

sedefsavas commented Jul 28, 2022

sedefsavas commented Jul 28, 2022

sedefsavas commented Jul 28, 2022

richardcase commented Jul 29, 2022

sedefsavas commented Jul 29, 2022

k8s-ci-robot commented Jul 29, 2022

k8s-infra-cherrypick-robot commented Jul 29, 2022

sedefsavas commented May 12, 2022 •

edited

Loading

sbueringer May 12, 2022 •

edited

Loading

sbueringer May 13, 2022 •

edited

Loading

sbueringer Jun 7, 2022 •

edited

Loading

mweibel commented Jul 28, 2022 •

edited

Loading

k8s-ci-robot commented Jul 28, 2022 •

edited

Loading