Skip to content

[mce-2.5] Remove existing Secret files in (deprovision) Pod#2427

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mce-2.5from
openshift-cherrypick-robot:cherry-pick-2426-to-mce-2.5
Aug 27, 2024
Merged

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

Conversation

@openshift-cherrypick-robot
Copy link

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

This is an automated cherry-pick of #2426

/assign openshift-cherrypick-robot

/cherrypick mce-2.4 mce-2.3

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
@codecov
Copy link

codecov bot commented Aug 26, 2024

Codecov Report

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

Project coverage is 57.92%. Comparing base (f421191) to head (4af190c).
Report is 2 commits behind head on mce-2.5.

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.5    #2427      +/-   ##
===========================================
- Coverage    57.92%   57.92%   -0.01%     
===========================================
  Files          186      186              
  Lines        26077    26079       +2     
===========================================
  Hits         15105    15105              
- Misses        9709     9711       +2     
  Partials      1263     1263              
Files Coverage Δ
contrib/pkg/utils/generic.go 9.44% <0.00%> (-0.16%) ⬇️

@2uasimojo
Copy link
Member

/override ci/prow/security

#2387

/lgtm

@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
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 27, 2024

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

Details

In response to this:

/override ci/prow/security

#2387

/lgtm

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 27, 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 4af190c 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.

@2uasimojo
Copy link
Member

/override "Red Hat Konflux / hive-mce-25-on-pull-request"

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 27, 2024

@2uasimojo: Overrode contexts on behalf of 2uasimojo: Red Hat Konflux / hive-mce-25-on-pull-request

Details

In response to this:

/override "Red Hat Konflux / hive-mce-25-on-pull-request"

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-merge-bot openshift-merge-bot bot merged commit 114a234 into openshift:mce-2.5 Aug 27, 2024
@openshift-cherrypick-robot
Copy link
Author

@openshift-cherrypick-robot: #2427 failed to apply on top of branch "mce-2.4":

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:

This is an automated cherry-pick of #2426

/assign openshift-cherrypick-robot

/cherrypick mce-2.4 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

/cherry-pick mce-2.4

This should work cleanly now that #2400 has merged. Question is, will the bot ignore me cause I already tried it once?

@openshift-cherrypick-robot
Copy link
Author

@2uasimojo: new pull request created: #2431

Details

In response to this:

/cherry-pick mce-2.4

This should work cleanly now that #2400 has merged. Question is, will the bot ignore me cause I already tried it once?

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 2uasimojo mentioned this pull request Aug 28, 2024
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.

2 participants