Skip to content

Bug 1837967: Gathering Image Pruner configuration#113

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
ricardomaraschini:collect-image-pruner-2
May 21, 2020
Merged

Bug 1837967: Gathering Image Pruner configuration#113
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
ricardomaraschini:collect-image-pruner-2

Conversation

@ricardomaraschini
Copy link
Copy Markdown
Contributor

@ricardomaraschini ricardomaraschini commented May 19, 2020

Adding cluster's Image Registry pruner configuration to gather.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 19, 2020
@ricardomaraschini ricardomaraschini mentioned this pull request May 19, 2020
Closed
@ricardomaraschini ricardomaraschini changed the title WIP - Gathering Image Registry pruner configuration WIP - Gathering Image Pruner configuration May 19, 2020
@ricardomaraschini
Gathering Image Registry pruner configuration
1e221be 
Adding cluster's Image Registry pruner configuration to gather.
@ricardomaraschini
Copy link
Copy Markdown
Contributor Author

ricardomaraschini commented May 19, 2020

/test e2e-aws

1 similar comment
@ricardomaraschini
Copy link
Copy Markdown
Contributor Author

ricardomaraschini commented May 20, 2020

/test e2e-aws

@ricardomaraschini ricardomaraschini changed the title WIP - Gathering Image Pruner configuration WIP - Bug 1837967: Gathering Image Pruner configuration May 20, 2020
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. label May 20, 2020
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented May 20, 2020

@ricardomaraschini: This pull request references Bugzilla bug 1837967, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
Details

In response to this:

WIP - Bug 1837967: Gathering Image Pruner configuration

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 openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label May 20, 2020
@ricardomaraschini
Copy link
Copy Markdown
Contributor Author

ricardomaraschini commented May 20, 2020

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot removed the bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. label May 20, 2020
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented May 20, 2020

@ricardomaraschini: This pull request references Bugzilla bug 1837967, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
Details

In response to this:

/bugzilla 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 openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label May 20, 2020
@ricardomaraschini
Copy link
Copy Markdown
Contributor Author

ricardomaraschini commented May 20, 2020

/test e2e-aws

@ricardomaraschini ricardomaraschini changed the title WIP - Bug 1837967: Gathering Image Pruner configuration Bug 1837967: Gathering Image Pruner configuration May 20, 2020
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 20, 2020
@ricardomaraschini
Copy link
Copy Markdown
Contributor Author

ricardomaraschini commented May 20, 2020

/assign @mfojtik @dmage

@dmage
Copy link
Copy Markdown

dmage commented May 20, 2020

/lgtm

/cc @iNecas @martinkunc
This is a new config for the automated image pruner that was added in 4.4.

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 20, 2020
@martinkunc
Copy link
Copy Markdown
Contributor

martinkunc commented May 21, 2020 •
edited
Loading

Hi Ricardo, can it be merged into 4.4 as well ?
For better maintainability we should try to merge in older versions. There is #101 which should be merged before this will go smoothly. I could do it afterwards, if that would make sense to collect even there.

@martinkunc
Copy link
Copy Markdown
Contributor

martinkunc commented May 21, 2020

/lgtm /approved

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented May 21, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dmage, martinkunc, ricardomaraschini

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 21, 2020
@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented May 21, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

7 similar comments
@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented May 21, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented May 21, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented May 21, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented May 21, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented May 21, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented May 21, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented May 21, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit f37ff99 into openshift:master May 21, 2020
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented May 21, 2020

@ricardomaraschini: All pull requests linked via external trackers have merged: openshift/insights-operator#113. Bugzilla bug 1837967 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1837967: Gathering Image Pruner configuration

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.

@dmage
Copy link
Copy Markdown

dmage commented May 25, 2020

/cherrypick release-4.4

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented May 25, 2020

@dmage: #113 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	docs/gathered-data.md
M	manifests/03-clusterrole.yaml
M	pkg/gather/clusterconfig/clusterconfig.go
M	pkg/gather/clusterconfig/clusterconfig_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/gather/clusterconfig/clusterconfig_test.go
CONFLICT (content): Merge conflict in pkg/gather/clusterconfig/clusterconfig_test.go
Auto-merging pkg/gather/clusterconfig/clusterconfig.go
CONFLICT (content): Merge conflict in pkg/gather/clusterconfig/clusterconfig.go
Auto-merging manifests/03-clusterrole.yaml
CONFLICT (content): Merge conflict in manifests/03-clusterrole.yaml
CONFLICT (modify/delete): docs/gathered-data.md deleted in HEAD and modified in Gathering Image Registry pruner configuration. Version Gathering Image Registry pruner configuration of docs/gathered-data.md left in tree.
Patch failed at 0001 Gathering Image Registry pruner configuration
Details

In response to this:

/cherrypick release-4.4

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.

@ricardomaraschini
Copy link
Copy Markdown
Contributor Author

ricardomaraschini commented May 25, 2020

Hi Ricardo, can it be merged into 4.4 as well ?
For better maintainability we should try to merge in older versions. There is #101 which should be merged before this will go smoothly. I could do it afterwards, if that would make sense to collect even there.

@martinkunc We need this backported to 4.4 as well. As you mentioned we need to wait for #113 to be merged first but that one seems to be closed.

Could you clarify?

@martinkunc
Copy link
Copy Markdown
Contributor

martinkunc commented May 25, 2020

Hi Ricardo, can it be merged into 4.4 as well ?
For better maintainability we should try to merge in older versions. There is #101 which should be merged before this will go smoothly. I could do it afterwards, if that would make sense to collect even there.

@martinkunc We need this backported to 4.4 as well. As you mentioned we need to wait for #113 to be merged first but that one seems to be closed.

Could you clarify?

@ricardomaraschini Sorry, we need to wait for #103 to be merged to 4.4 before this one.

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

Reviewers

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

@tisnik tisnik Awaiting requested review from tisnik

@iNecas iNecas Awaiting requested review from iNecas

@martinkunc martinkunc Awaiting requested review from martinkunc

Assignees

@mfojtik mfojtik

@dmage dmage

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@ricardomaraschini @openshift-ci-robot @dmage @martinkunc @openshift-bot @openshift-cherrypick-robot @mfojtik @openshift-merge-robot