Replace k8s.io/apimachinery/pkg/util/clock with k8s.io/utils/clock and bump k8s.io to 1.28 #793

MartinForReal · 2023-08-17T06:59:22Z

Replace k8s.io/apimachinery/pkg/util/clock with k8s.io/utils/clock
bump k8s.io to 1.28

MartinForReal · 2023-08-18T05:44:38Z

/retest

MartinForReal · 2023-08-18T12:44:13Z

/test pull-npd-e2e-node

MartinForReal · 2023-08-19T01:56:01Z

/retest-required

vteratipally · 2023-08-23T20:21:56Z

/test pull-npd-e2e-node

vteratipally · 2023-08-24T23:20:05Z

/test pull-npd-e2e-node

MartinForReal · 2023-08-29T09:34:20Z

e2e error is related to kubernetes/kubernetes#120231

MartinForReal · 2023-08-29T10:12:26Z

/test pull-npd-e2e-node

MartinForReal · 2023-08-29T11:15:22Z

/test pull-npd-e2e-node

hakman · 2023-08-29T18:42:02Z

/test pull-npd-e2e-node

hakman · 2023-08-29T18:45:56Z

/test pull-npd-e2e-node

hakman · 2023-08-30T00:03:17Z

/test pull-npd-e2e-node

pkg/exporters/k8sexporter/condition/manager_test.go

MartinForReal · 2023-08-31T02:45:54Z

/test pull-npd-e2e-node

MartinForReal · 2023-08-31T05:05:30Z

@hakman Thanks for the fix! I've also updated the pr. PTAL. Thanks!

hakman

@MartinForReal I don't mind picking up the changes in this PR, but maybe keep the commit as cherry-pick (not very important though).

The commit message mentions k7s, which is a typo. In general, this is just a dependencies upgrade and maybe a separate commit to deal with the ticker change.

I don't think the changes you added for RealClock and FakeClock are needed:
https://github.com/kubernetes/utils/blob/3b25d923346b3814e0898684c97390092f31a61e/clock/clock.go#L82C1-L83C1

var _ = WithTicker(RealClock{})

// RealClock really calls time.Now()
type RealClock struct{}
...

MartinForReal · 2023-08-31T05:59:18Z

@hakman Thanks for reviewing the pr!

pkg/exporters/k8sexporter/k8s_exporter.go

hakman · 2023-09-01T03:20:03Z

/lgtm

hakman · 2023-09-01T03:23:03Z

go.mod

-	k8s.io/component-base v0.17.2
+	k8s.io/api v0.28.1
+	k8s.io/apimachinery v0.28.1
+	k8s.io/client-go v9.0.0+incompatible


Shouldn't this also v0.28.1?

Suggested change

k8s.io/client-go v9.0.0+incompatible

k8s.io/client-go v0.28.1

This is one is replaced with v0.28.1. please see the last line. It is related to cadvisor. I will try to upgrade that part in following pr.

Ah, ok. Thanks for the explanation.

Pretty strange to depend on cadvisor just for a log tailing lib 😄

It has not changed for a long time..

hakman · 2023-09-05T14:18:01Z

/cc @vteratipally

mmiranda96

Sorry for the delay! Some small comments, but overall good. Thanks!
/lgtm

pkg/systemlogmonitor/logwatchers/filelog/translator.go

pkg/util/helpers_linux.go

pkg/util/helpers_windows.go

pkg/util/metrics/fakes.go

pkg/util/metrics/fakes_test.go

pkg/util/metrics/helpers.go

pkg/util/metrics/metric.go

pkg/util/metrics/metric_float64.go

pkg/util/metrics/metric_int64.go

mmiranda96 · 2023-09-06T20:42:36Z

Please ignore my previous comments, everything looks great!

vteratipally · 2023-09-07T15:09:21Z

sorry for the delay,

/lgtm
/approve

k8s-ci-robot · 2023-09-07T15:09:44Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MartinForReal, mmiranda96, vteratipally

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

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 added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 17, 2023

k8s-ci-robot requested review from dchen1107 and mmiranda96 August 17, 2023 06:59

k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Aug 17, 2023

MartinForReal force-pushed the master branch 3 times, most recently from 7fe24a2 to ef90641 Compare August 18, 2023 05:06

MartinForReal force-pushed the master branch 2 times, most recently from d5b07af to 703904c Compare August 18, 2023 07:40

MartinForReal changed the title ~~Replace k8s.io/apimachinery/pkg/util/clock with k8s.io/utils/clock and bump k8s.io to 1.24~~ Replace k8s.io/apimachinery/pkg/util/clock with k8s.io/utils/clock and bump k8s.io to 1.28 Aug 18, 2023

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

MartinForReal force-pushed the master branch 2 times, most recently from b87c7e3 to 2210c50 Compare August 28, 2023 16:18

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

hakman suggested changes Aug 30, 2023

View reviewed changes

pkg/exporters/k8sexporter/condition/manager_test.go Outdated Show resolved Hide resolved

MartinForReal force-pushed the master branch from 8d91e38 to 45582e1 Compare August 30, 2023 01:57

hakman mentioned this pull request Aug 30, 2023

Bump k8s dependencies to v1.28 #798

Closed

MartinForReal force-pushed the master branch from 45582e1 to bf91352 Compare August 31, 2023 05:03

hakman suggested changes Aug 31, 2023

View reviewed changes

MartinForReal force-pushed the master branch from bf91352 to f3ae279 Compare August 31, 2023 05:55

hakman reviewed Aug 31, 2023

View reviewed changes

pkg/exporters/k8sexporter/k8s_exporter.go Outdated Show resolved Hide resolved

MartinForReal added 2 commits August 31, 2023 06:27

replace k8s.io/apimachinery/pkg/util/clock with k8s.io/utils/clock

adbe770

bump k8s.io deps to v0.28.1

469ba76

MartinForReal force-pushed the master branch from f3ae279 to 469ba76 Compare August 31, 2023 06:31

k8s-ci-robot assigned hakman Sep 1, 2023

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

hakman suggested changes Sep 1, 2023

View reviewed changes

k8s-ci-robot requested a review from vteratipally September 5, 2023 14:18

mmiranda96 approved these changes Sep 6, 2023

View reviewed changes

k8s-ci-robot assigned mmiranda96 Sep 6, 2023

k8s-ci-robot assigned vteratipally Sep 7, 2023

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 7, 2023

k8s-ci-robot merged commit 9ff6b0b into kubernetes:master Sep 7, 2023

This was referenced Sep 7, 2023

Bump k8s dependecies to v1.25 #761

Closed

node-problem-detector's version of client-go does not reload client certificates #694

Closed

MartinForReal mentioned this pull request Dec 22, 2023

Add MartinForReal as a reviewer #775

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace k8s.io/apimachinery/pkg/util/clock with k8s.io/utils/clock and bump k8s.io to 1.28 #793

Replace k8s.io/apimachinery/pkg/util/clock with k8s.io/utils/clock and bump k8s.io to 1.28 #793

MartinForReal commented Aug 17, 2023 •

edited

Loading

MartinForReal commented Aug 18, 2023

MartinForReal commented Aug 18, 2023

MartinForReal commented Aug 19, 2023

vteratipally commented Aug 23, 2023

vteratipally commented Aug 24, 2023

MartinForReal commented Aug 29, 2023 •

edited

Loading

MartinForReal commented Aug 29, 2023

MartinForReal commented Aug 29, 2023

hakman commented Aug 29, 2023

hakman commented Aug 29, 2023

hakman commented Aug 30, 2023

MartinForReal commented Aug 31, 2023

MartinForReal commented Aug 31, 2023

hakman left a comment •

edited

Loading

MartinForReal commented Aug 31, 2023

hakman commented Sep 1, 2023

hakman Sep 1, 2023

MartinForReal Sep 1, 2023

hakman Sep 1, 2023

hakman Sep 1, 2023

MartinForReal Sep 1, 2023

hakman commented Sep 5, 2023

mmiranda96 left a comment

mmiranda96 commented Sep 6, 2023

vteratipally commented Sep 7, 2023

k8s-ci-robot commented Sep 7, 2023

	k8s.io/client-go v9.0.0+incompatible
	k8s.io/client-go v0.28.1

Replace k8s.io/apimachinery/pkg/util/clock with k8s.io/utils/clock and bump k8s.io to 1.28 #793

Replace k8s.io/apimachinery/pkg/util/clock with k8s.io/utils/clock and bump k8s.io to 1.28 #793

Conversation

MartinForReal commented Aug 17, 2023 • edited Loading

MartinForReal commented Aug 18, 2023

MartinForReal commented Aug 18, 2023

/test pull-npd-e2e-node

MartinForReal commented Aug 19, 2023

vteratipally commented Aug 23, 2023

vteratipally commented Aug 24, 2023

MartinForReal commented Aug 29, 2023 • edited Loading

MartinForReal commented Aug 29, 2023

/test pull-npd-e2e-node

MartinForReal commented Aug 29, 2023

/test pull-npd-e2e-node

hakman commented Aug 29, 2023

hakman commented Aug 29, 2023

hakman commented Aug 30, 2023

MartinForReal commented Aug 31, 2023

/test pull-npd-e2e-node

MartinForReal commented Aug 31, 2023

hakman left a comment • edited Loading

Choose a reason for hiding this comment

MartinForReal commented Aug 31, 2023

hakman commented Sep 1, 2023

hakman Sep 1, 2023

Choose a reason for hiding this comment

MartinForReal Sep 1, 2023

Choose a reason for hiding this comment

hakman Sep 1, 2023

Choose a reason for hiding this comment

hakman Sep 1, 2023

Choose a reason for hiding this comment

MartinForReal Sep 1, 2023

Choose a reason for hiding this comment

hakman commented Sep 5, 2023

mmiranda96 left a comment

Choose a reason for hiding this comment

mmiranda96 commented Sep 6, 2023

vteratipally commented Sep 7, 2023

k8s-ci-robot commented Sep 7, 2023

MartinForReal commented Aug 17, 2023 •

edited

Loading

MartinForReal commented Aug 29, 2023 •

edited

Loading

hakman left a comment •

edited

Loading