Skip to content

[mce-2.4] Remove existing Secret files in (deprovision) Pod#2431

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mce-2.4from
openshift-cherrypick-robot:cherry-pick-2427-to-mce-2.4
Aug 28, 2024
Merged

[mce-2.4] Remove existing Secret files in (deprovision) Pod#2431
openshift-merge-bot[bot] merged 1 commit intoopenshift:mce-2.4from
openshift-cherrypick-robot:cherry-pick-2427-to-mce-2.4

Conversation

@openshift-cherrypick-robot
Copy link

@openshift-cherrypick-robot openshift-cherrypick-robot commented Aug 27, 2024

This is an automated cherry-pick of #2427

/assign 2uasimojo

HIVE-2604

For Pods with `restartPolicy: OnFailure`, a failed container may be
rerun in the same Pod, which will reuse the same file system as the
initial run. When we project Secrets (for credentials, certs, etc) to
directories in such containers, those writes can fail the second time
around because the file already exists. Fix by removing the file, if it
exists, before we write it.

Note that at the time of this commit, this only affects deprovision
pods:
- imageset pods don't use ProjectToDir
- provision pods have `restartPolicy: Never`

HIVE-2604
@2uasimojo
Copy link
Member

/lgtm

/cherry-pick mce-2.3

@openshift-cherrypick-robot
Copy link
Author

@2uasimojo: once the present PR merges, I will cherry-pick it on top of mce-2.3 in a new PR and assign it to you.

Details

In response to this:

/lgtm

/cherry-pick mce-2.3

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-sigs/prow repository.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 27, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 2uasimojo, openshift-cherrypick-robot

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 27, 2024
@codecov
Copy link

codecov bot commented Aug 27, 2024

Codecov Report

Attention: Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.

Project coverage is 57.63%. Comparing base (85b9f09) to head (31ba8e6).
Report is 2 commits behind head on mce-2.4.

Files Patch % Lines
contrib/pkg/utils/generic.go 0.00% 2 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           mce-2.4    #2431      +/-   ##
===========================================
- Coverage    57.63%   57.63%   -0.01%     
===========================================
  Files          186      186              
  Lines        25840    25842       +2     
===========================================
  Hits         14893    14893              
- Misses        9701     9703       +2     
  Partials      1246     1246              
Files Coverage Δ
contrib/pkg/utils/generic.go 9.44% <0.00%> (-0.16%) ⬇️

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 85b9f09 and 2 for PR HEAD 31ba8e6 in total

3 similar comments
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 85b9f09 and 2 for PR HEAD 31ba8e6 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 85b9f09 and 2 for PR HEAD 31ba8e6 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 85b9f09 and 2 for PR HEAD 31ba8e6 in total

@2uasimojo
Copy link
Member

/override ci/prow/security

#2387 backport

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 28, 2024

@2uasimojo: Overrode contexts on behalf of 2uasimojo: ci/prow/security

Details

In response to this:

/override ci/prow/security

#2387 backport

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-sigs/prow repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 28, 2024

@openshift-cherrypick-robot: 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
ci/prow/security 31ba8e6 link true /test security

Full PR test history. Your PR dashboard.

Details

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

@openshift-merge-bot openshift-merge-bot bot merged commit cdfcf06 into openshift:mce-2.4 Aug 28, 2024
@openshift-cherrypick-robot
Copy link
Author

@2uasimojo: #2431 failed to apply on top of branch "mce-2.3":

Applying: Remove existing Secret files in (deprovision) Pod
Using index info to reconstruct a base tree...
M	contrib/pkg/utils/generic.go
Falling back to patching base and 3-way merge...
Auto-merging contrib/pkg/utils/generic.go
CONFLICT (content): Merge conflict in contrib/pkg/utils/generic.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Remove existing Secret files in (deprovision) Pod
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".

Details

In response to this:

/lgtm

/cherry-pick mce-2.3

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-sigs/prow repository.

@2uasimojo
Copy link
Member

The cherry-pick should work after #2432 lands.

@2uasimojo
Copy link
Member

/cherry-pick mce-2.3

@openshift-cherrypick-robot
Copy link
Author

@2uasimojo: new pull request created: #2435

Details

In response to this:

/cherry-pick mce-2.3

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-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants