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.

Sign up for GitHub

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

Jump to bottom

Removed curator5 references from 5.1 CSV #1006

Merged
merged 1 commit into from
May 10, 2021
Merged

Removed curator5 references from 5.1 CSV #1006

merged 1 commit into from
May 10, 2021

Conversation

vimalk78
Copy link
Contributor

@vimalk78 vimalk78 commented May 4, 2021

Description

Curator is removed in 5.1
Removed remaining references of curator5 from CSV

/assign @jcantrill

Links

@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 4, 2021
jcantrill
jcantrill reviewed May 4, 2021
View reviewed changes
manifests/5.1/cluster-logging.v5.1.0.clusterserviceversion.yaml Outdated
@@ -403,19 +401,6 @@ spec:
path: collection.logs.fluentd.nodeSelector
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:nodeSelector'
- description: Resource requirements for the Curator pods
Copy link
Contributor

Choose a reason for hiding this comment

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

@alanconway I think this has to remain for compatibility reasons but is just no longer honored. Maybe we just need to update the main "curation" note

alanconway
alanconway reviewed May 4, 2021
View reviewed changes
Copy link
Contributor

@alanconway alanconway left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 4, 2021
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alanconway, vimalk78

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:
  • OWNERS [alanconway,vimalk78]

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

@openshift-bot
Copy link
Contributor

/retest

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

@jcantrill
Copy link
Contributor

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 4, 2021
@vimalk78
Copy link
Contributor Author

vimalk78 commented May 5, 2021

/cherry-pick release-5.1

@openshift-cherrypick-robot
Copy link

@vimalk78: once the present PR merges, I will cherry-pick it on top of release-5.1 in a new PR and assign it to you.

In response to this:

/cherry-pick release-5.1

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.

@alanconway alanconway removed their assignment May 5, 2021
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 6, 2021
@openshift-ci openshift-ci bot removed lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 7, 2021
@vimalk78
Copy link
Contributor Author

vimalk78 commented May 7, 2021

/retest

@alanconway
Copy link
Contributor

I'd really like to get rid of al the version numbers in our repo. The version of code is determined by the git branch and commit, having a redundant version number in file and directory names causes a bunch of useless thrashing when the version changes. I just wasted a day on the loki work because a mistake in renaing from 4.7 caused stale code to get deployed in my tests, which was very perplexing.

@rolfedh rolfedh mentioned this pull request May 7, 2021
Merged
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 9, 2021
@vimalk78 vimalk78 changed the base branch from master to release-5.1 May 10, 2021 07:30
@vimalk78 vimalk78 changed the title Removed curator5 references from CSV Removed curator5 references from 5.1 CSV May 10, 2021
@vimalk78
Copy link
Contributor Author

/refresh

@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 10, 2021
igor-karpukhin
igor-karpukhin approved these changes May 10, 2021
View reviewed changes
Copy link
Contributor

@igor-karpukhin igor-karpukhin 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 May 10, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 10, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alanconway, igor-karpukhin, vimalk78

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:
  • OWNERS [alanconway,vimalk78]

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

@rolfedh
Copy link
Contributor

rolfedh commented May 10, 2021

Please hold off on merging this PR until we've completed this conversation with Christian: https://coreos.slack.com/archives/GGUR75P60/p1620636639219100

@jcantrill
Copy link
Contributor

/hold cancel

This is a cleanup of another PR that merged months ago and will unblock cpaas. We can revert this and the other if needed

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 10, 2021
@openshift-merge-robot openshift-merge-robot merged commit 93aeed0 into openshift:release-5.1 May 10, 2021
@openshift-cherrypick-robot
Copy link

@vimalk78: base branch (release-5.1) needs to differ from target branch (release-5.1)

In response to this:

/cherry-pick release-5.1

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
Reviewers

@alanconway alanconway alanconway left review comments

@jcantrill jcantrill jcantrill left review comments

@igor-karpukhin igor-karpukhin igor-karpukhin approved these changes

@eranra eranra Awaiting requested review from eranra

@syedriko syedriko Awaiting requested review from syedriko

Assignees

@igor-karpukhin igor-karpukhin

@jcantrill jcantrill

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@vimalk78 @openshift-ci-robot @openshift-bot @jcantrill @openshift-cherrypick-robot @alanconway @rolfedh @igor-karpukhin @openshift-merge-robot