Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

must-gather: remove the standard pod template #1255

Merged

Conversation

agarwal-mudit
Copy link
Member

We don't need two pod templates now, removing the standard
pod template and the code around it.

Signed-off-by: Mudit Agarwal muagarwa@redhat.com

We don't need two pod templates now, removing the standard
pod template and the code around it.

Signed-off-by: Mudit Agarwal <muagarwa@redhat.com>
Signed-off-by: Mudit Agarwal <muagarwa@redhat.com>
@openshift-ci openshift-ci bot requested review from crombus and rajatsing July 2, 2021 15:42
Copy link
Contributor

@crombus crombus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 2, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 2, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: crombus

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:

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 Jul 2, 2021
@openshift-merge-robot openshift-merge-robot merged commit e10cee6 into red-hat-storage:master Jul 2, 2021
@agarwal-mudit
Copy link
Member Author

/cherry-pick release-4.8

@openshift-cherrypick-robot

@agarwal-mudit: new pull request created: #1256

In response to this:

/cherry-pick release-4.8

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.

@agarwal-mudit
Copy link
Member Author

/cherry-pick release-4.7

@agarwal-mudit agarwal-mudit deleted the template branch July 16, 2021 02:44
@openshift-cherrypick-robot

@agarwal-mudit: #1255 failed to apply on top of branch "release-4.7":

Applying: must-gather: remove the standard pod template
Using index info to reconstruct a base tree...
M	must-gather/collection-scripts/pre-install.sh
M	must-gather/templates/pod.template.standard
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): must-gather/templates/pod.template.standard deleted in must-gather: remove the standard pod template and modified in HEAD. Version HEAD of must-gather/templates/pod.template.standard left in tree.
Auto-merging must-gather/collection-scripts/pre-install.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 must-gather: remove the standard pod template
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".

In response to this:

/cherry-pick release-4.7

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.

@agarwal-mudit
Copy link
Member Author

/cherry-pick release-4.6

@openshift-cherrypick-robot

@agarwal-mudit: #1255 failed to apply on top of branch "release-4.6":

Applying: must-gather: remove the standard pod template
Using index info to reconstruct a base tree...
A	must-gather/collection-scripts/pre-install.sh
M	must-gather/templates/pod.template.standard
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): must-gather/templates/pod.template.standard deleted in must-gather: remove the standard pod template and modified in HEAD. Version HEAD of must-gather/templates/pod.template.standard left in tree.
CONFLICT (modify/delete): must-gather/collection-scripts/pre-install.sh deleted in HEAD and modified in must-gather: remove the standard pod template. Version must-gather: remove the standard pod template of must-gather/collection-scripts/pre-install.sh left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 must-gather: remove the standard pod template
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".

In response to this:

/cherry-pick release-4.6

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.

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.

None yet

4 participants