WINC-962: Pick up openshift/kubernetes 1.26 rebase updates #1395

mansikulkarni96 · 2023-01-30T12:37:29Z

[services] Replace deprecated klog flags with kube-log-runner
[submodule][kubelet] Update to 149fe52
[vendor] Use 1.26 k8s and OpenShift libraries
[manifests] Set v1.26 as minimum k8s version

openshift-ci-robot · 2023-01-30T12:37:33Z

@mansikulkarni96: This pull request references WINC-962 which is a valid jira issue.

In response to this:

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.

openshift-ci · 2023-01-30T12:37:35Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

openshift-ci-robot · 2023-01-30T12:39:48Z

@mansikulkarni96: This pull request references WINC-962 which is a valid jira issue.

In response to this:

Manually update k8s libraries to 1.26
Ran commands:

go get -u github.com/openshift/api@6ba31fa438f20d6c822ef47ad3d771309cb5216b
go get -u github.com/openshift/client-go@72f107311084c1dabe65d31aa68d232e33950dc1
go mod tidy && go mod vendor

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.

sebsoto · 2023-02-07T14:36:44Z

pkg/services/services.go

+	kubeLogCmd := fmt.Sprintf("%s -log-file=%s -redirect-stderr=false ",
+		windows.KubeLogRunnerPath, windows.KubeletLog)
+
+	kubeletServiceCmd := kubeLogCmd + windows.KubeletPath


Please add windows.KubeletPath as part of the Sprintf, no reason for it to be separate

Does this need to be done for kube-proxy as well?

@sebsoto yes it needs to be, I am contemplating on whether to add it in this PR or add it as part of kube-proxy bump when the new sdn branch is created. kube-log-runner only has the functionality to direct the logs to a file. For kube-proxy, we have been redirecting to a log-dir for a long time now. Is it acceptable to move them only to info and error files?

Would doing this for kube-proxy have effect on how we collect log files (e.g. must-gather changes)?

If kube-proxy does not require this change we can leave it as is.

@aravindhp It will once we update to the 1.26 SDN branch.
@saifshaikh48 yes we will need to update the file info here

@aravindhp It will once we update to the 1.26 SDN branch.

We should definitely take care of this as part of that update

saifshaikh48

LGTM aside from a comment

saifshaikh48 · 2023-02-07T15:53:12Z

pkg/windows/windows.go

@@ -177,6 +179,7 @@ func getFilesToTransfer() (map[*payload.FileInfo]string, error) {
 		payload.KubeProxyPath:                  K8sDir,
 		payload.KubeletPath:                    K8sDir,
 		payload.AzureCloudNodeManagerPath:      K8sDir,
+		payload.KubeLogRunnerPath:              K8sDir,


Should we also add this to requiredFiles?
Although I'm seeing that var is quite outdated so maybe it warrants a task of its own to update properly.

We should be updating the variable though with new additions. We can clean it up later if we need to delete any files from there.

saifshaikh48 · 2023-02-07T15:54:33Z

pkg/services/services.go

+	kubeLogCmd := fmt.Sprintf("%s -log-file=%s -redirect-stderr=false ",
+		windows.KubeLogRunnerPath, windows.KubeletLog)
+
+	kubeletServiceCmd := kubeLogCmd + windows.KubeletPath


Would doing this for kube-proxy have effect on how we collect log files (e.g. must-gather changes)?

This commit removes the usage of deprecated klog flags like --log-file and --logstostderr which are no lonegr compatible with the kube-1.26. The suggested alternative for continued logging to a log file is using the kube-log-runner exe Ref: https://github.com/kubernetes/kubernetes/tree/62d9f8ba80f4cc660a88dcc34f56c5c6f7df17ea/staging/src/k8s.io/component-base/logs/kube-log-runner KEP: https://github.com/kubernetes/enhancements/tree/3cb66bd0a1ef973ebcc974f935f0ac5cba9db4b2/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components#user-stories

Update to openshift/kubernetes@149fe52 This commit was generated using hack/update_submodules.sh

aravindhp

LGTM. Just a few questions. I will leave official approval to @sebsoto.

aravindhp · 2023-02-07T16:55:23Z

pkg/windows/windows.go

@@ -177,6 +179,7 @@ func getFilesToTransfer() (map[*payload.FileInfo]string, error) {
 		payload.KubeProxyPath:                  K8sDir,
 		payload.KubeletPath:                    K8sDir,
 		payload.AzureCloudNodeManagerPath:      K8sDir,
+		payload.KubeLogRunnerPath:              K8sDir,


We should be updating the variable though with new additions. We can clean it up later if we need to delete any files from there.

go.mod

pkg/cluster/config_test.go

Manually update to 1.26 libraries Ran commands: go get -u github.com/openshift/api@61d971884921b77ca959fafbc026c8fe5666bdb4 go get -u github.com/openshift/client-go@72f107311084c1dabe65d31aa68d232e33950dc1 go mod tidy && go mod vendor

openshift-ci-robot · 2023-02-07T17:34:22Z

@mansikulkarni96: This pull request references WINC-962 which is a valid jira issue.

In response to this:

[services] Replace deprecated klog flags with kube-log-runner

[submodule][kubelet] Update to 149fe52

[vendor] Use 1.26 k8s and OpenShift libraries

[manifests] Set v1.26 as minimum k8s version

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.

saifshaikh48

/lgtm

sebsoto · 2023-02-07T18:18:32Z

/approve

openshift-ci · 2023-02-07T18:18:54Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mansikulkarni96, sebsoto

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

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

openshift-ci · 2023-02-07T21:20:23Z

@mansikulkarni96: all tests passed!

Full PR test history. Your PR dashboard.

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.

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 30, 2023

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 30, 2023

mansikulkarni96 force-pushed the WINC-962 branch 4 times, most recently from 8c7ab6b to 026397a Compare February 2, 2023 14:48

mansikulkarni96 marked this pull request as ready for review February 2, 2023 14:50

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 2, 2023

openshift-ci bot requested review from aravindhp and sebsoto February 2, 2023 14:55

mansikulkarni96 force-pushed the WINC-962 branch from 3617d92 to 8c276c3 Compare February 6, 2023 17:49

mansikulkarni96 marked this pull request as draft February 6, 2023 18:23

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 6, 2023

mansikulkarni96 force-pushed the WINC-962 branch from 8c276c3 to 408ca3c Compare February 6, 2023 23:13

mansikulkarni96 marked this pull request as ready for review February 7, 2023 00:44

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 7, 2023

mansikulkarni96 force-pushed the WINC-962 branch 3 times, most recently from d6afa21 to 0376618 Compare February 7, 2023 14:25

sebsoto requested changes Feb 7, 2023

View reviewed changes

saifshaikh48 reviewed Feb 7, 2023

View reviewed changes

mansikulkarni96 marked this pull request as draft February 7, 2023 16:51

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 7, 2023

mansikulkarni96 added 2 commits February 7, 2023 11:57

[submodule][kubelet] Update to 149fe52

6114113

Update to openshift/kubernetes@149fe52 This commit was generated using hack/update_submodules.sh

mansikulkarni96 force-pushed the WINC-962 branch from 0376618 to 593bf7a Compare February 7, 2023 16:58

aravindhp reviewed Feb 7, 2023

View reviewed changes

mansikulkarni96 added 2 commits February 7, 2023 12:19

[vendor] Use 1.26 k8s and OpenShift libraries

bde17d8

Manually update to 1.26 libraries Ran commands: go get -u github.com/openshift/api@61d971884921b77ca959fafbc026c8fe5666bdb4 go get -u github.com/openshift/client-go@72f107311084c1dabe65d31aa68d232e33950dc1 go mod tidy && go mod vendor

[manifests] Set v1.26 as minimum k8s version

26fe803

mansikulkarni96 force-pushed the WINC-962 branch from 593bf7a to 26fe803 Compare February 7, 2023 17:20

saifshaikh48 reviewed Feb 7, 2023

View reviewed changes

openshift-ci bot assigned saifshaikh48 Feb 7, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 7, 2023

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 7, 2023

mansikulkarni96 marked this pull request as ready for review February 7, 2023 18:35

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 7, 2023

openshift-ci bot requested review from aravindhp and sebsoto February 7, 2023 18:36

openshift-merge-robot merged commit 2baebfc into openshift:master Feb 7, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WINC-962: Pick up openshift/kubernetes 1.26 rebase updates #1395

WINC-962: Pick up openshift/kubernetes 1.26 rebase updates #1395

mansikulkarni96 commented Jan 30, 2023 •

edited by aravindhp

openshift-ci-robot commented Jan 30, 2023 •

edited by openshift-ci bot

openshift-ci bot commented Jan 30, 2023

openshift-ci-robot commented Jan 30, 2023 •

edited by openshift-ci bot

sebsoto Feb 7, 2023

sebsoto Feb 7, 2023

mansikulkarni96 Feb 7, 2023 •

edited

saifshaikh48 Feb 7, 2023

aravindhp Feb 7, 2023

mansikulkarni96 Feb 7, 2023

aravindhp Feb 7, 2023

saifshaikh48 left a comment

saifshaikh48 Feb 7, 2023

aravindhp Feb 7, 2023

saifshaikh48 Feb 7, 2023

aravindhp left a comment

aravindhp Feb 7, 2023

openshift-ci-robot commented Feb 7, 2023 •

edited by openshift-ci bot

saifshaikh48 left a comment

sebsoto commented Feb 7, 2023

openshift-ci bot commented Feb 7, 2023

openshift-ci bot commented Feb 7, 2023

WINC-962: Pick up openshift/kubernetes 1.26 rebase updates #1395

WINC-962: Pick up openshift/kubernetes 1.26 rebase updates #1395

Conversation

mansikulkarni96 commented Jan 30, 2023 • edited by aravindhp

openshift-ci-robot commented Jan 30, 2023 • edited by openshift-ci bot

openshift-ci bot commented Jan 30, 2023

openshift-ci-robot commented Jan 30, 2023 • edited by openshift-ci bot

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mansikulkarni96 Feb 7, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

saifshaikh48 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aravindhp left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

openshift-ci-robot commented Feb 7, 2023 • edited by openshift-ci bot

saifshaikh48 left a comment

Choose a reason for hiding this comment

sebsoto commented Feb 7, 2023

openshift-ci bot commented Feb 7, 2023

openshift-ci bot commented Feb 7, 2023

mansikulkarni96 commented Jan 30, 2023 •

edited by aravindhp

openshift-ci-robot commented Jan 30, 2023 •

edited by openshift-ci bot

openshift-ci-robot commented Jan 30, 2023 •

edited by openshift-ci bot

mansikulkarni96 Feb 7, 2023 •

edited

openshift-ci-robot commented Feb 7, 2023 •

edited by openshift-ci bot