Add i18n items for the PipelineRun role #2669

LinuxSuRen · 2021-11-26T02:37:46Z

What type of PR is this?

/area devops
/cc @kubesphere/sig-devops
/cherrypick release-3.2

What this PR does / why we need it:

A new CRD PipelineRun is introduced in v3.2. We need the i18n items for that.

Which issue(s) this PR fixes:

related issue kubesphere/ks-devops#383

Special notes for reviewers:

Does this PR introduced a user-facing change?

None

Additional documentation, usage docs, etc.:

None

JohnNiang

Hi @LinuxSuRen , could you tell us exactly where to use them?

LinuxSuRen · 2021-12-01T05:35:36Z

Hi @LinuxSuRen , could you tell us exactly where to use them?

You will see it when you try to create a new role, and set the permission of DevOps for it.

/cc @kubesphere/sig-console

JohnNiang

/lgtm
/cc @kubesphere/sig-docs

ks-ci-bot · 2021-12-01T05:37:40Z

LGTM label has been added.

Git tree hash: d4ffa46b953d0717265950963cfe7f191bdce1e4

weili520

👍

xuliwenwenwen · 2021-12-01T10:20:58Z

/lgtm

patrickluoyu · 2021-12-02T01:32:05Z

locales/en/role.js

@@ -55,6 +55,12 @@ module.exports = {
  'Network Policies View': 'Network Policy Viewing',
  'Nodes View': 'Node Viewing',

+  PIPELINES_MANAGEMENT: 'Pipeline Management',
+  PIPELINES_VIEW: 'Pipeline Viewing',
+  PIPELINERUNS_MANAGEMENT: 'PipelineRun Management',


Pipeline Run Record Management

patrickluoyu · 2021-12-02T01:32:24Z

locales/en/role.js

+  PIPELINES_MANAGEMENT: 'Pipeline Management',
+  PIPELINES_VIEW: 'Pipeline Viewing',
+  PIPELINERUNS_MANAGEMENT: 'PipelineRun Management',
+  PIPELINERUNS_VIEW: 'PipelineRun Viewing',


Pipeline Run Record Viewing

patrickluoyu · 2021-12-02T01:34:03Z

locales/en/role.js

+    'Create, edit, and delete DevOps project pipelines.',
+  PIPELINES_VIEW_DESC: 'View DevOps project pipelines and download artifacts.',
+  PIPELINERUNS_MANAGEMENT_DESC:
+    'Create, edit, and delete DevOps project pipelineruns.',


View, edit, and delete pipeline run records in the DevOps project.

patrickluoyu · 2021-12-02T01:34:37Z

locales/en/role.js

+  PIPELINES_VIEW_DESC: 'View DevOps project pipelines and download artifacts.',
+  PIPELINERUNS_MANAGEMENT_DESC:
+    'Create, edit, and delete DevOps project pipelineruns.',
+  PIPELINERUNS_VIEW_DESC: 'View DevOps project pipelineruns.',


View pipeline run records in the DevOps project.

patrickluoyu · 2021-12-02T01:36:12Z

The wording needs to be optimized. Please see the comments. Thanks!

LinuxSuRen · 2021-12-05T02:54:47Z

hi @Patrick-LuoYu @harrisonliu5 , sorry for the deply.

LinuxSuRen · 2021-12-06T00:55:36Z

/cherry-pick release-3.2

ks-ci-bot · 2021-12-06T00:55:39Z

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

In response to this:

/cherry-pick release-3.2

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.

harrisonliu5 · 2021-12-06T01:12:53Z

/approve

ks-ci-bot · 2021-12-06T01:13:03Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: harrisonliu5, JohnNiang, LinuxSuRen

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

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

LinuxSuRen · 2021-12-06T01:17:57Z

/lgtm

ks-ci-bot · 2021-12-06T01:17:59Z

@LinuxSuRen: you cannot LGTM your own PR.

In response to this:

/lgtm

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.

Felixnoo · 2021-12-06T01:25:23Z

/lgtm
/cc @Patrick-LuoYu

ks-ci-bot · 2021-12-06T01:25:29Z

LGTM label has been added.

Git tree hash: f464d2f267024acc5c068d80e96ece68fd898d5a

patrickluoyu · 2021-12-06T01:25:41Z

/lgtm

ks-ci-bot · 2021-12-06T01:26:35Z

@LinuxSuRen: #2669 failed to apply on top of branch "release-3.2":

Applying: Add i18n items for pipelinerun role
Using index info to reconstruct a base tree...
M	locales/en/role.js
Falling back to patching base and 3-way merge...
Auto-merging locales/en/role.js
CONFLICT (content): Merge conflict in locales/en/role.js
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add i18n items for pipelinerun role
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-3.2

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.

ks-ci-bot · 2021-12-06T01:26:37Z

@LinuxSuRen: new issue created for failed cherrypick: #2749

In response to this:

/cherry-pick release-3.2

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.

Add i18n items for pipelinerun role

6902c63

ks-ci-bot added release-note-none area/devops size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 26, 2021

JohnNiang reviewed Nov 28, 2021

View reviewed changes

ks-ci-bot added the needs-rebase label Dec 1, 2021

Merge branch 'master' into add-role-pipelinerun

9c99eaf

ks-ci-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed needs-rebase size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 1, 2021

ks-ci-bot requested a review from a team December 1, 2021 05:35

JohnNiang approved these changes Dec 1, 2021

View reviewed changes

ks-ci-bot assigned JohnNiang Dec 1, 2021

ks-ci-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 1, 2021

weili520 reviewed Dec 1, 2021

View reviewed changes

ks-ci-bot assigned xuliwenwenwen Dec 1, 2021

patrickluoyu reviewed Dec 2, 2021

View reviewed changes

harrisonliu5 removed the lgtm Indicates that a PR is ready to be merged. label Dec 2, 2021

Fix the expression

da2b5e3

ks-ci-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 6, 2021

ks-ci-bot requested a review from patrickluoyu December 6, 2021 01:25

ks-ci-bot assigned Felixnoo Dec 6, 2021

ks-ci-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 6, 2021

ks-ci-bot assigned patrickluoyu Dec 6, 2021

ks-ci-bot merged commit 183dde4 into kubesphere:master Dec 6, 2021

ks-ci-bot mentioned this pull request Dec 6, 2021

[release-3.2] Add i18n items for the PipelineRun role #2749

Closed

LinuxSuRen deleted the add-role-pipelinerun branch December 6, 2021 01:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add i18n items for the PipelineRun role #2669

Add i18n items for the PipelineRun role #2669

LinuxSuRen commented Nov 26, 2021 •

edited

Loading

JohnNiang left a comment

LinuxSuRen commented Dec 1, 2021

JohnNiang left a comment

ks-ci-bot commented Dec 1, 2021

weili520 left a comment

xuliwenwenwen commented Dec 1, 2021

patrickluoyu Dec 2, 2021

patrickluoyu Dec 2, 2021

patrickluoyu Dec 2, 2021 •

edited

Loading

patrickluoyu Dec 2, 2021

patrickluoyu commented Dec 2, 2021

LinuxSuRen commented Dec 5, 2021

LinuxSuRen commented Dec 6, 2021

ks-ci-bot commented Dec 6, 2021

harrisonliu5 commented Dec 6, 2021

ks-ci-bot commented Dec 6, 2021

LinuxSuRen commented Dec 6, 2021

ks-ci-bot commented Dec 6, 2021

Felixnoo commented Dec 6, 2021

ks-ci-bot commented Dec 6, 2021

patrickluoyu commented Dec 6, 2021

ks-ci-bot commented Dec 6, 2021

ks-ci-bot commented Dec 6, 2021

Add i18n items for the PipelineRun role #2669

Add i18n items for the PipelineRun role #2669

Conversation

LinuxSuRen commented Nov 26, 2021 • edited Loading

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for reviewers:

Does this PR introduced a user-facing change?

Additional documentation, usage docs, etc.:

JohnNiang left a comment

Choose a reason for hiding this comment

LinuxSuRen commented Dec 1, 2021

JohnNiang left a comment

Choose a reason for hiding this comment

ks-ci-bot commented Dec 1, 2021

weili520 left a comment

Choose a reason for hiding this comment

xuliwenwenwen commented Dec 1, 2021

patrickluoyu Dec 2, 2021

Choose a reason for hiding this comment

patrickluoyu Dec 2, 2021

Choose a reason for hiding this comment

patrickluoyu Dec 2, 2021 • edited Loading

Choose a reason for hiding this comment

patrickluoyu Dec 2, 2021

Choose a reason for hiding this comment

patrickluoyu commented Dec 2, 2021

LinuxSuRen commented Dec 5, 2021

LinuxSuRen commented Dec 6, 2021

ks-ci-bot commented Dec 6, 2021

harrisonliu5 commented Dec 6, 2021

ks-ci-bot commented Dec 6, 2021

LinuxSuRen commented Dec 6, 2021

ks-ci-bot commented Dec 6, 2021

Felixnoo commented Dec 6, 2021

ks-ci-bot commented Dec 6, 2021

patrickluoyu commented Dec 6, 2021

ks-ci-bot commented Dec 6, 2021

ks-ci-bot commented Dec 6, 2021

LinuxSuRen commented Nov 26, 2021 •

edited

Loading

patrickluoyu Dec 2, 2021 •

edited

Loading