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

Bug 1868653: Convert Pipeline StartedBy Label to Annotation #6639

Conversation

andrewballantyne
Copy link
Contributor

Fixes:
https://issues.redhat.com/browse/ODC-4862

Analysis / Root cause:
StartedBy was added in 4.5, it was added as a label. Labels have limitations, it was unclear the full usage of the name and it was incorrectly assigned to a label, whereas we need to support a full range of characters beyond what labels can have.

Solution Description:
Annotations do not have this limitation, moving the started by content from labels to annnotations.

Screen shots / Gifs for design review:

kube:admin
image

Email username:
Screen Shot 2020-09-15 at 7 06 47 PM

Trigger:
image

Unit test coverage report:
No change

Test setup:

  • Setup a Pipeline
  • Start said Pipeline, notice the started by information that is your user
    • Try kube:admin
    • Try creating a user with an email address
  • Setup a trigger and invoke it to see it still shows the trigger details

Browser conformance:

  • Chrome
  • Firefox
  • Safari
  • Edge

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high 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. labels Sep 15, 2020
@openshift-ci-robot
Copy link
Contributor

@andrewballantyne: This pull request references Bugzilla bug 1868653, 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 1868653: Convert Pipeline StartedBy Label to Annotation

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 component/dev-console Related to dev-console approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 15, 2020
@rottencandy
Copy link
Contributor

If I create a PipelineRun using the cli, it's page crashes
err0

@andrewballantyne
Copy link
Contributor Author

If I create a PipelineRun using the cli, it's page crashes
err0

Good catch, I did not try CLI and it makes sense that annotations are optional... thanks!

Copy link
Contributor

@rottencandy rottencandy 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-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andrewballantyne, rottencandy

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-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 23, 2020
@andrewballantyne
Copy link
Contributor Author

/retest

@openshift-merge-robot openshift-merge-robot merged commit 93422d1 into openshift:master Sep 23, 2020
@openshift-ci-robot
Copy link
Contributor

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

Bugzilla bug 1868653 has been moved to the MODIFIED state.

In response to this:

Bug 1868653: Convert Pipeline StartedBy Label to Annotation

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.

@andrewballantyne
Copy link
Contributor Author

/cherry-pick release-4.5

@openshift-cherrypick-robot

@andrewballantyne: #6639 failed to apply on top of branch "release-4.5":

Applying: Convert Pipeline StartedBy Label to Annotation
Using index info to reconstruct a base tree...
M	frontend/packages/dev-console/src/components/pipelineruns/PipelineRunDetailsPage.tsx
M	frontend/packages/dev-console/src/components/pipelineruns/triggered-by/hooks.ts
M	frontend/packages/dev-console/src/components/pipelines/PipelineDetailsPage.tsx
M	frontend/packages/dev-console/src/components/pipelines/modals/common/__tests__/utils.spec.ts
M	frontend/packages/dev-console/src/components/pipelines/modals/common/utils.ts
M	frontend/packages/dev-console/src/components/pipelines/modals/start-pipeline/StartPipelineModal.tsx
M	frontend/packages/dev-console/src/components/pipelines/modals/triggers/submit-utils.ts
M	frontend/packages/dev-console/src/utils/pipeline-actions.tsx
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/dev-console/src/utils/pipeline-actions.tsx
Auto-merging frontend/packages/dev-console/src/components/pipelines/modals/triggers/submit-utils.ts
CONFLICT (content): Merge conflict in frontend/packages/dev-console/src/components/pipelines/modals/triggers/submit-utils.ts
Auto-merging frontend/packages/dev-console/src/components/pipelines/modals/start-pipeline/StartPipelineModal.tsx
Auto-merging frontend/packages/dev-console/src/components/pipelines/modals/common/utils.ts
CONFLICT (content): Merge conflict in frontend/packages/dev-console/src/components/pipelines/modals/common/utils.ts
Auto-merging frontend/packages/dev-console/src/components/pipelines/modals/common/__tests__/utils.spec.ts
CONFLICT (content): Merge conflict in frontend/packages/dev-console/src/components/pipelines/modals/common/__tests__/utils.spec.ts
Auto-merging frontend/packages/dev-console/src/components/pipelines/PipelineDetailsPage.tsx
Auto-merging frontend/packages/dev-console/src/components/pipelineruns/triggered-by/hooks.ts
Auto-merging frontend/packages/dev-console/src/components/pipelineruns/PipelineRunDetailsPage.tsx
CONFLICT (content): Merge conflict in frontend/packages/dev-console/src/components/pipelineruns/PipelineRunDetailsPage.tsx
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Convert Pipeline StartedBy Label to Annotation
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.5

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.

@andrewballantyne
Copy link
Contributor Author

Cherry Pick will have to be done manually with the addition of this change: #6744 for 4.5

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. bugzilla/severity-high Referenced Bugzilla bug's severity is high 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. component/dev-console Related to dev-console 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

6 participants