UPSTREAM: 117349: OCPBUGS-19431: Bump lumberjack.v2 v2.0.0 -> v2.2.1

[vrutkovs]

What type of PR is this?

/kind bug

What this PR does / why we need it:

Update lumberjack.v2 dependency. In upstream its a regular dep bump, but it fixes an Openshift bug - termination log file would be created with 0600 permission and stay persistent, as we use lumberjack in cmd/watch-termination.

Which issue(s) this PR fixes:

Fixes OCPBUGS-11856

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

[openshift-ci-robot]

@vrutkovs: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

• 02fd62a|UPSTREAM: : Bump lumberjack.v2 v2.0.0 -> v2.2.1: does not specify an upstream backport in the commit message
• 41fade4|UPSTREAM: : update vendor: does not specify an upstream backport in the commit message

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

[openshift-ci]

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]

@vrutkovs: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

• 02fd62a|UPSTREAM: : Bump lumberjack.v2 v2.0.0 -> v2.2.1: does not specify an upstream backport in the commit message
• 4f81e4b|UPSTREAM: : update vendor: does not specify an upstream backport in the commit message

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

[openshift-ci-robot]

@vrutkovs: This pull request references Jira Issue OCPBUGS-11856, which is invalid:

• expected the bug to target the "4.14.0" version, but it targets "4.13.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

What type of PR is this?

/kind bug

What this PR does / why we need it:

Update lumberjack.v2 dependency so that termination log file would be created with 0600 permission and toml dependency being dropped

Which issue(s) this PR fixes:

Fixes OCPBUGS-11856

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

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.

[vrutkovs]

/jira refresh

[openshift-ci-robot]

@vrutkovs: This pull request references Jira Issue OCPBUGS-11856, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.14.0) matches configured target version for branch (4.14.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (dpunia@redhat.com), skipping review request.

In response to this:

/jira refresh

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-robot]

@vrutkovs: This pull request references Jira Issue OCPBUGS-11856, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.14.0) matches configured target version for branch (4.14.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (dpunia@redhat.com), skipping review request.

In response to this:

What type of PR is this?

/kind bug

What this PR does / why we need it:

Update lumberjack.v2 dependency so that termination log file would be created with 0600 permission and toml dependency being dropped.

This PR doesn't bump this dependency in all subcomponents as we need to have it applied to cmd/watch-termination. In upstream repo this dependency is indirect, so if I understood correctly it doesn't need to be upstreamed

Which issue(s) this PR fixes:

Fixes OCPBUGS-11856

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

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-robot]

@vrutkovs: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

• 15fab5e|UPSTREAM: 117349: Bump lumberjack.v2 v2.0.0 -> v2.2.1: the upstream PR kubernetes/kubernetes#117349 has not yet merged

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

[openshift-ci-robot]

@vrutkovs: This pull request references Jira Issue OCPBUGS-11856, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.14.0) matches configured target version for branch (4.14.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (dpunia@redhat.com), skipping review request.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

What type of PR is this?

/kind bug

What this PR does / why we need it:

Update lumberjack.v2 dependency. In upstream its a regular dep bump, but it fixes an Openshift bug - termination log file would be created with 0600 permission and stay persistent, as we use lumberjack in cmd/watch-termination.

Which issue(s) this PR fixes:

Fixes OCPBUGS-11856

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

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-robot]

@vrutkovs: the contents of this pull request could be automatically validated.

The following commits are valid:

• b9e75d7|UPSTREAM: 117349: Bump lumberjack.v2 v2.0.0 -> v2.2.1: the upstream PR kubernetes/kubernetes#117349 has merged

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

[wangke19]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dgrisonnet, soltysh, tkashem, vrutkovs, wangke19

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:

• DOWNSTREAM_OWNERS [soltysh,tkashem]

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

[p0lyn0mial]

@vrutkovs is this behaviour of lumberjack library documented somewhere ? Since the version of lumberjack differs from upstream how can we ensure that on the "next" bump the version will be increased ? does this pr fix also already existing clusters ?

[p0lyn0mial]

@vrutkovs in more recent releases of the fork we maintain a patch that addresses the issue. If the behaviour of the library is documented and can be trusted then It seems that releases that have the correct version of lumberjack could remove the patch. WDYT?

[vrutkovs]

is this behaviour of lumberjack library documented somewhere ?

Yes - natefinch/lumberjack#120. Oddly enough its not closed upstream

Since the version of lumberjack differs from upstream how can we ensure that on the "next" bump the version will be increased ?

Not sure I understand the question - how can we ensure that micro bump won't overwrite lumberjack version? That should be taken care of during rebase

does this pr fix also already existing clusters ?

Yes, files will be updated on rotation.

It seems that releases that have the correct version of lumberjack could remove the patch

Yes, I think that needs to be done too

[p0lyn0mial]

Since the version of lumberjack differs from upstream how can we ensure that on the "next" bump the version will be increased ?

Not sure I understand the question - how can we ensure that micro bump won't overwrite lumberjack version? That should be taken care of during rebase

Yeah, I think it depends on how we handle minor bumps. If the process is to take the upstream branch and apply our patches, then we can easily skip this PR.

It seems that releases that have the correct version of lumberjack could remove the patch

Yes, I think that needs to be done too

Would you be open to addressing this issue ?

[vrutkovs]

If the process is to take the upstream branch and apply our patches, then we can easily skip this PR.

I think we're safe on that - a merge commit is created - https://github.com/openshift/kubernetes/blob/master/REBASE.openshift.md#updating-with-git-merge, so a revert would be noticed.

Created #1841 to revert the carry in 4.15+

[p0lyn0mial]

is this behaviour of lumberjack library documented somewhere ?

Yes - natefinch/lumberjack#120. Oddly enough its not closed upstream

Also there are no references to PR(s) that changed the behaviour. Do we want to take changes ? I would feel better if this behaviour is documented and tested. How did you arrive at this solution ?

[p0lyn0mial]

@wangke19 hey, did you test the fix on an already existing cluster ? I'm asking because the issue Vadim referenced is still open and it is not clear whether it works. Thanks.

[vrutkovs]

This was fixed in natefinch/lumberjack#83, previous attempt was to merge this in openshift/cluster-kube-apiserver-operator#385

[soltysh]

/label backport-risk-assessed

[openshift-ci-robot]

@vrutkovs: Jira Issue OCPBUGS-19431: All pull requests linked via external trackers have merged:

• openshift/kubernetes#1552

Jira Issue OCPBUGS-19431 has been moved to the MODIFIED state.

In response to this:

What type of PR is this?

/kind bug

What this PR does / why we need it:

Update lumberjack.v2 dependency. In upstream its a regular dep bump, but it fixes an Openshift bug - termination log file would be created with 0600 permission and stay persistent, as we use lumberjack in cmd/watch-termination.

Which issue(s) this PR fixes:

Fixes OCPBUGS-11856

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

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 openshift-eng/jira-lifecycle-plugin repository.

[openshift-bot]

[ART PR BUILD NOTIFIER]

This PR has been included in build openshift-enterprise-pod-container-v4.14.0-202401041534.p0.g5c56cc3.assembly.stream for distgit openshift-enterprise-pod.
All builds following this will include this PR.