Bug 1872309: Rename "cluster_monitoring_operator" -> "cluster-monitoring-operator" #910

wking · 2020-08-17T22:57:46Z

The regular expression for the component portion is [a-z0-9\-]+ or [a-zA-Z0-9]+(-[a-zA-Z0-9]+)*?). Either way, it cannot include underscores, so manifests like 0000_50_cluster_monitoring_operator_01-namespace.yaml end up in the cluster component. With this change, they will end up in the cluster-monitoring-operator component.

Generated with:

$ rename cluster_monitoring_operator cluster-monitoring-operator manifests/*.yaml
$ sed -i 's/cluster_monitoring_operator/cluster-monitoring-operator/g' Documentation/data-collection.md Makefile README.md hack/build-jsonnet.sh hack/build-jsonnet.sh hack/local-cmo.sh hack/telemeter_query.go

wking · 2020-08-17T23:09:33Z

And I've filed openshift/cluster-version-operator#439 to remove the oversimplified regexp from the CVO's docs.

wking · 2020-08-17T23:28:03Z

The outgoing, underscore form landed in 9fd35c2 (#388, new in 4.2), so we could backport this to any of our not-yet-end-of-life release streams if folks wanted to. Personally, I doubt it needs backporting at all, since the only risk of the old naming is that a separate operator made the same mistake and set cluster as their component and 50 or 90 as their runlevel. And even then, the outcome would be that the two operators' manifests would be interleaved in a single manifest block, instead of applied in separate, parallel manifests blocks.

s-urbaniak · 2020-08-19T08:06:45Z

this generally lgtm, but i assume we need a BZ for this as we are in QA phase?!

s-urbaniak · 2020-08-19T08:09:51Z

Does this impact down/upgrades in any way? I don't believe so but just want to make sure we are not running in any edge case.

wking · 2020-08-19T13:34:19Z

this generally lgtm, but i assume we need a BZ for this as we are in QA phase?!

I asked about that a few weeks ago, but nobody has landed a bug requirement for master yet (see Tide saying Not mergeable. Needs approved, lgtm labels. here. Still, I can file a bug if you like. But...

Does this impact down/upgrades in any way?

There's no relationship between manifest filenames between releases, so this rename has about the same pact there as the earlier #388. The only impacts I can see now are the unlikely overlap-fix from my previous comment. And I haven't audited a recent release, but I would be very surprised if we had an overlap like that today. This is just cosmetic, and a guard against low-risk, future overlap.

simonpasquier · 2020-08-20T08:27:11Z

/lgtm

s-urbaniak · 2020-08-20T08:47:53Z

@wking according to tide this needs now a bugzilla 🤷‍♂️

simonpasquier · 2020-08-25T13:29:26Z

/retitle Bug 1872309: Rename "cluster_monitoring_operator" -> "cluster-monitoring-operator"

openshift-ci-robot · 2020-08-25T13:29:49Z

@wking: This pull request references Bugzilla bug 1872309, 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.6.0) matches configured target release for branch (4.6.0)
bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1872309: Rename "cluster_monitoring_operator" -> "cluster-monitoring-operator"

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.

simonpasquier · 2020-08-25T14:31:39Z

/bugzilla refresh

openshift-ci-robot · 2020-08-25T14:31:44Z

@simonpasquier: This pull request references Bugzilla bug 1872309, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.6.0) matches configured target release for branch (4.6.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

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-bot · 2020-08-25T19:37:38Z

/retest

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

openshift-bot · 2020-08-25T21:34:37Z

/retest

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

openshift-bot · 2020-08-25T23:05:46Z

/retest

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

openshift-bot · 2020-08-25T23:18:45Z

/retest

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

openshift-bot · 2020-08-26T00:11:15Z

/retest

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

openshift-bot · 2020-08-26T00:40:29Z

/retest

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

openshift-bot · 2020-08-26T01:02:37Z

/retest

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

openshift-bot · 2020-08-26T13:49:39Z

/retest

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

openshift-bot · 2020-08-26T14:02:35Z

/retest

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

openshift-bot · 2020-08-26T14:15:37Z

/retest

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

openshift-bot · 2020-08-26T14:28:36Z

/retest

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

wking · 2020-08-26T14:35:08Z

hold

GitHub claims a conflict.

openshift-bot · 2020-08-26T15:07:40Z

/retest

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

openshift-bot · 2020-08-26T15:33:38Z

/retest

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

openshift-bot · 2020-08-26T15:46:41Z

/retest

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

openshift-bot · 2020-08-26T15:59:39Z

/retest

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

openshift-bot · 2020-08-26T16:12:43Z

/retest

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

openshift-bot · 2020-08-26T16:51:39Z

/retest

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

openshift-bot · 2020-08-26T17:18:07Z

/retest

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

openshift-bot · 2020-08-26T17:30:36Z

/retest

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

openshift-bot · 2020-08-26T17:43:36Z

/retest

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

openshift-bot · 2020-08-26T17:56:31Z

/retest

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

openshift-bot · 2020-08-26T18:09:47Z

/retest

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

…g-operator" The regular expression for the component portion is [1]: [a-z0-9\-]+ or [2]: [a-zA-Z0-9]+(-[a-zA-Z0-9]+)*?) Either way, it cannot include underscores, so manifests like 0000_50_cluster_monitoring_operator_01-namespace.yaml end up in the 'cluster' component. With this change, they will end up in the 'cluster-monitoring-operator' component. The outgoing, underscore form landed in 9fd35c2 (manifests: prefix manifests used by CVO with a 0000_xx_NAME prefix, 2019-06-25, openshift#388). Generated with: $ rename cluster_monitoring_operator cluster-monitoring-operator manifests/*.yaml $ sed -i 's/cluster_monitoring_operator/cluster-monitoring-operator/g' Documentation/data-collection.md Makefile README.md hack/build-jsonnet.sh hack/build-jsonnet.sh hack/local-cmo.sh hack/telemeter_query.go [1]: https://github.com/openshift/cluster-version-operator/blob/71aef74480d199fe96a590f2f1e4e8056a9cb687/docs/dev/operators.md#what-is-the-order-that-resources-get-createdupdated-in [2]: https://github.com/openshift/cluster-version-operator/blob/71aef74480d199fe96a590f2f1e4e8056a9cb687/pkg/payload/task_graph.go#L21

wking · 2020-08-26T18:18:27Z

Oops, looks like I fumbled the hold above. Anyway, rebased onto master with with 886d998 -> f11007b

simonpasquier · 2020-08-27T08:21:54Z

/lgtm

openshift-ci-robot · 2020-08-27T08:22:15Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: simonpasquier, wking

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~~ [simonpasquier]

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

openshift-bot · 2020-08-27T09:45:22Z

/retest

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

openshift-bot · 2020-08-27T11:42:30Z

/retest

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

openshift-bot · 2020-08-27T13:00:24Z

/retest

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

openshift-bot · 2020-08-27T14:44:30Z

/retest

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

openshift-ci-robot · 2020-08-27T16:22:00Z

@wking: All pull requests linked via external trackers have merged:

openshift/cluster-monitoring-operator#910

Bugzilla bug 1872309 has been moved to the MODIFIED state.

In response to this:

Bug 1872309: Rename "cluster_monitoring_operator" -> "cluster-monitoring-operator"

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 requested review from brancz and simonpasquier August 17, 2020 22:58

wking force-pushed the cluster-version-manifest-component-name branch from 96583b1 to 2f2559e Compare August 17, 2020 22:58

wking force-pushed the cluster-version-manifest-component-name branch from 2f2559e to 886d998 Compare August 17, 2020 23:23

openshift-ci-robot assigned simonpasquier Aug 20, 2020

openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 20, 2020

openshift-ci-robot changed the title ~~manifests: Rename "cluster_monitoring_operator" -> "cluster-monitoring-operator"~~ Bug 1872309: Rename "cluster_monitoring_operator" -> "cluster-monitoring-operator" Aug 25, 2020

openshift-ci-robot added bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Aug 25, 2020

openshift-ci-robot added bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. and removed bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. labels Aug 25, 2020

wking force-pushed the cluster-version-manifest-component-name branch from 886d998 to f11007b Compare August 26, 2020 18:17

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Aug 26, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 27, 2020

openshift-merge-robot merged commit 170f91f into openshift:master Aug 27, 2020

wking deleted the cluster-version-manifest-component-name branch August 27, 2020 22:16

Bug 1872309: Rename "cluster_monitoring_operator" -> "cluster-monitoring-operator" #910

Bug 1872309: Rename "cluster_monitoring_operator" -> "cluster-monitoring-operator" #910

Conversation

wking commented Aug 17, 2020

wking commented Aug 17, 2020

wking commented Aug 17, 2020

s-urbaniak commented Aug 19, 2020

s-urbaniak commented Aug 19, 2020

wking commented Aug 19, 2020

simonpasquier commented Aug 20, 2020

s-urbaniak commented Aug 20, 2020

simonpasquier commented Aug 25, 2020

openshift-ci-robot commented Aug 25, 2020

simonpasquier commented Aug 25, 2020

openshift-ci-robot commented Aug 25, 2020

openshift-bot commented Aug 25, 2020

openshift-bot commented Aug 25, 2020

openshift-bot commented Aug 25, 2020

openshift-bot commented Aug 25, 2020

openshift-bot commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

wking commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

openshift-bot commented Aug 26, 2020

wking commented Aug 26, 2020

simonpasquier commented Aug 27, 2020

openshift-ci-robot commented Aug 27, 2020

openshift-bot commented Aug 27, 2020

openshift-bot commented Aug 27, 2020

openshift-bot commented Aug 27, 2020

openshift-bot commented Aug 27, 2020

openshift-ci-robot commented Aug 27, 2020