bump k8s & cluster api dependency #4569

hzxuzhonghu · 2023-10-11T09:22:12Z

What type of PR is this?

What this PR does / why we need it:

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 #4505

Special notes for your reviewer:

Checklist:

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

Release note:

NONE

hzxuzhonghu · 2023-10-12T02:14:03Z

assign @vincepri

dlipovetsky · 2023-10-12T05:26:54Z

This PR is increments the k8s.io packages and their dependencies.

But it also increments github.com/aws/aws-sdk-go. Can you move that to its own PR?

Can sigs.k8s.io/kustomize/api also be moved it its own PR?

hzxuzhonghu · 2023-10-12T06:39:09Z

sure, BTW, what does make generate do? I run it and generated a new dir cluster-api-provider-aws, which is not included in this repo

hzxuzhonghu · 2023-10-13T02:36:05Z

what do i need to do, since the conflict occurs too frequently

hzxuzhonghu · 2023-10-13T07:27:40Z

ping @dlipovetsky

This PR is increments the k8s.io packages and their dependencies.

But it also increments github.com/aws/aws-sdk-go. Can you move that to its own PR?

Can sigs.k8s.io/kustomize/api also be moved it its own PR?

I reverted aws-sdk-go, but the kustomize is related to k8s version, and it is automatically need to update as well

richardcase · 2023-10-26T10:34:19Z

We normally bump the k8s/controller-runtime/capi dependencies at the same time. So bumping the k8s packages to v0.28.2 without the others isn't the process we follow.

However, CAPI main has been bumped and we could think about changing this PR to cover #4591. wdyt @hzxuzhonghu ?

hzxuzhonghu · 2023-10-31T01:00:43Z

Sorry, I donot have bandwidth recently, anyone could take it over.

k8s-ci-robot · 2023-11-17T11:20:00Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign killianmuldoon for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

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

hzxuzhonghu · 2023-11-17T11:21:40Z

@richardcase ptal

richardcase

Overall this looks good, thanks @hzxuzhonghu.

Just some minor comments.

richardcase · 2023-11-21T10:17:11Z

go.mod

-	k8s.io/cli-runtime v0.27.3
-	k8s.io/client-go v0.27.3
-	k8s.io/component-base v0.27.3
+	k8s.io/api v0.28.3


We could probably change this to 0.28.4 now but lets do that afterwards.

controllers/awsmachine_controller.go

pkg/cloud/scope/machine.go

richardcase · 2023-11-21T15:20:06Z

/lgtm

For final approval:

@Ankitasw @dlipovetsky @vincepri

Ankitasw · 2023-11-21T15:39:41Z

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

richardcase · 2023-11-21T20:23:17Z

Due to the test failures:

/remove-lgtm

richardcase · 2023-11-21T20:24:16Z

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

k8s-ci-robot · 2023-11-21T21:41:15Z

@hzxuzhonghu: 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	`6baa23b`	link	false	`/test pull-cluster-api-provider-aws-e2e`

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.

hzxuzhonghu · 2023-11-22T01:19:51Z

does this mean cluster-api 1.16 is broken for aws?

  Expected
      <[]*v1beta1.MachinePool | len:0, cap:0>: []
  not to be empty
  In [It] at: /home/prow/go/pkg/mod/sigs.k8s.io/cluster-api/[email protected]/framework/cluster_topology_helpers.go:88 @ 11/21/23 20:50:19.951
  Full Stack Trace
    sigs.k8s.io/cluster-api/test/framework.UpgradeClusterTopologyAndWaitForUpgrade({_, _}, {{0x37f5f48, 0xc00073cfc0}, 0xc000bbcea0, 0xc000bd1900, {0xc000bb7bc9, 0x7}, {0xc000bb7bc0, 0x6}, ...})
    	/home/prow/go/pkg/mod/sigs.k8s.io/cluster-api/[email protected]/framework/cluster_topology_helpers.go:88 +0x40d
    sigs.k8s.io/cluster-api/test/e2e.ClusterUpgradeConformanceSpec.func2()
    	/home/prow/go/pkg/mod/sigs.k8s.io/cluster-api/[email protected]/e2e/cluster_upgrade.go:157 +0x9f0

Ankitasw · 2023-11-22T05:30:30Z

does this mean cluster-api 1.16 is broken for aws?

You might have to check the controller logs to know what is wrong

hzxuzhonghu · 2023-11-22T11:10:10Z

You might have to check the controller logs to know what is wrong

Where is the log?

hzxuzhonghu · 2023-11-23T11:46:11Z

maybe related kubernetes-sigs/cluster-api#9502

I am not familiar with that, can you guide me how to fix it @richardcase @Ankitasw

richardcase · 2023-11-25T08:06:19Z

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

Running again and then will investigate

k8s-ci-robot · 2023-11-28T23:39:40Z

PR needs rebase.

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.

nrb · 2024-01-11T17:09:41Z

go.mod

-	sigs.k8s.io/cluster-api/test v1.5.3
-	sigs.k8s.io/controller-runtime v0.15.1
-	sigs.k8s.io/kustomize/api v0.13.4
+	sigs.k8s.io/cluster-api v1.6.0-beta.1


@hzxuzhonghu Are you able to pick this up again and update to the GA v1.6.0 release?

Sorry, i think i met some problems #4569 (comment)

Does 1.6.0 fix it

nrb · 2024-01-18T16:30:56Z

This is superceded by #4739

/close

k8s-ci-robot · 2024-01-18T16:31:01Z

@nrb: Closed this PR.

In response to this:

This is superceded by #4739

/close

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 requested review from dlipovetsky and Skarlso October 11, 2023 09:22

hzxuzhonghu force-pushed the nump branch from ed0409c to 08397fd Compare October 12, 2023 02:13

k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 12, 2023

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

hzxuzhonghu force-pushed the nump branch from 6c7ba82 to e87d898 Compare October 13, 2023 07:25

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

hzxuzhonghu force-pushed the nump branch from 768c130 to ab98224 Compare October 13, 2023 07:28

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

hzxuzhonghu force-pushed the nump branch from ab98224 to 5aabc3a Compare November 17, 2023 11:19

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

hzxuzhonghu force-pushed the nump branch from c9f9af3 to 12c25bd Compare November 17, 2023 12:28

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

hzxuzhonghu force-pushed the nump branch from 33c7714 to af86a73 Compare November 21, 2023 08:32

richardcase reviewed Nov 21, 2023

View reviewed changes

hzxuzhonghu added 2 commits November 21, 2023 19:37

bump dependency

32676c3

gix verify

8fcd0e5

hzxuzhonghu force-pushed the nump branch from 7821733 to 8fcd0e5 Compare November 21, 2023 11:38

bump k8s to 1.28.4

6baa23b

k8s-ci-robot assigned richardcase Nov 21, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 21, 2023

Ankitasw added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Nov 21, 2023

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 21, 2023

Skarlso removed their request for review November 24, 2023 12:25

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

nrb reviewed Jan 11, 2024

View reviewed changes

nrb mentioned this pull request Jan 11, 2024

🌱 Bump the dependencies group with 9 updates #4729

Closed

damdo mentioned this pull request Jan 15, 2024

✨ Bump CAPI to v1.6.x #4739

Merged

k8s-ci-robot closed this Jan 18, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bump k8s & cluster api dependency #4569

bump k8s & cluster api dependency #4569

hzxuzhonghu commented Oct 11, 2023 •

edited

Loading

hzxuzhonghu commented Oct 12, 2023

dlipovetsky commented Oct 12, 2023

hzxuzhonghu commented Oct 12, 2023

hzxuzhonghu commented Oct 13, 2023

hzxuzhonghu commented Oct 13, 2023 •

edited

Loading

richardcase commented Oct 26, 2023 •

edited

Loading

hzxuzhonghu commented Oct 31, 2023

k8s-ci-robot commented Nov 17, 2023

hzxuzhonghu commented Nov 17, 2023

richardcase left a comment

richardcase Nov 21, 2023

hzxuzhonghu Nov 21, 2023

hzxuzhonghu Nov 21, 2023

richardcase commented Nov 21, 2023

Ankitasw commented Nov 21, 2023

richardcase commented Nov 21, 2023

richardcase commented Nov 21, 2023

k8s-ci-robot commented Nov 21, 2023

hzxuzhonghu commented Nov 22, 2023

Ankitasw commented Nov 22, 2023

hzxuzhonghu commented Nov 22, 2023

hzxuzhonghu commented Nov 23, 2023

richardcase commented Nov 25, 2023

k8s-ci-robot commented Nov 28, 2023

nrb Jan 11, 2024

hzxuzhonghu Jan 12, 2024

nrb commented Jan 18, 2024

k8s-ci-robot commented Jan 18, 2024

bump k8s & cluster api dependency #4569

bump k8s & cluster api dependency #4569

Conversation

hzxuzhonghu commented Oct 11, 2023 • edited Loading

hzxuzhonghu commented Oct 12, 2023

dlipovetsky commented Oct 12, 2023

hzxuzhonghu commented Oct 12, 2023

hzxuzhonghu commented Oct 13, 2023

hzxuzhonghu commented Oct 13, 2023 • edited Loading

richardcase commented Oct 26, 2023 • edited Loading

hzxuzhonghu commented Oct 31, 2023

k8s-ci-robot commented Nov 17, 2023

hzxuzhonghu commented Nov 17, 2023

richardcase left a comment

Choose a reason for hiding this comment

richardcase Nov 21, 2023

Choose a reason for hiding this comment

hzxuzhonghu Nov 21, 2023

Choose a reason for hiding this comment

hzxuzhonghu Nov 21, 2023

Choose a reason for hiding this comment

richardcase commented Nov 21, 2023

Ankitasw commented Nov 21, 2023

richardcase commented Nov 21, 2023

richardcase commented Nov 21, 2023

k8s-ci-robot commented Nov 21, 2023

hzxuzhonghu commented Nov 22, 2023

Ankitasw commented Nov 22, 2023

hzxuzhonghu commented Nov 22, 2023

hzxuzhonghu commented Nov 23, 2023

richardcase commented Nov 25, 2023

k8s-ci-robot commented Nov 28, 2023

nrb Jan 11, 2024

Choose a reason for hiding this comment

hzxuzhonghu Jan 12, 2024

Choose a reason for hiding this comment

nrb commented Jan 18, 2024

k8s-ci-robot commented Jan 18, 2024

hzxuzhonghu commented Oct 11, 2023 •

edited

Loading

hzxuzhonghu commented Oct 13, 2023 •

edited

Loading

richardcase commented Oct 26, 2023 •

edited

Loading