Bug 1961064: Fix documentation link to network policies #8869

jotak · 2021-05-07T09:43:34Z

Also fix missing space in english text

The link was outdated, leading to 404. (I'm not sure since which version it changed)

spadgett · 2021-05-07T13:26:23Z

frontend/public/components/network-policy.jsx

@@ -199,7 +199,7 @@ const Details_ = ({ obj: np, flags }) => {
        <SectionHeading text={t('network-policy~Ingress rules')} />
        <p className="co-m-pane__explanation">
          {t(
-            'network-policy~Pods accept all traffic by default. They can be isolated via NetworkPolicies which specify a whitelist of ingress rules. When a Pod is selected by a NetworkPolicy, it will reject all traffic not explicitly allowed via a NetworkPolicy. See more details in:',
+            'network-policy~Pods accept all traffic by default. They can be isolated via NetworkPolicies which specify a whitelist of ingress rules. When a Pod is selected by a NetworkPolicy, it will reject all traffic not explicitly allowed via a NetworkPolicy. See more details in: ',


This should actually be using the Trans component so that the link is part of the message and can be translated.

https://react.i18next.com/latest/trans-component

Here's an example:

https://github.com/kdoberst/console/blob/48c7c0a23723bdf2b7fe66283558d16f2d889e58/frontend/public/components/monitoring/receiver-forms/routing-labels-editor.tsx#L97-L105

Sure I'll look into it

rebeccaalpert · 2021-05-07T15:27:39Z

In general, you shouldn't modify the ja, ko, or zh files. The changes will get overwritten when we get translations back from the translation team. The change you made shouldn't affect the translation though, so not a huge deal for me. :)

jotak · 2021-05-10T12:07:52Z

@spadgett I believe the test failures are unrelated to this code change

jotak · 2021-05-11T07:30:11Z

/retest

spadgett · 2021-05-11T14:19:22Z

frontend/public/locales/ja/network-policy.json

@@ -9,7 +9,7 @@
  "NS selector": "NS セレクター",
  "NetworkPolicy details": "ネットワークポリシーの詳細",
  "Ingress rules": "Ingress ルール",
-  "Pods accept all traffic by default. They can be isolated via NetworkPolicies which specify a whitelist of ingress rules. When a Pod is selected by a NetworkPolicy, it will reject all traffic not explicitly allowed via a NetworkPolicy. See more details in:": "Pod はデフォルトですべてのトラフィックを受け入れます。これらは、ingress ルールのホワイトリストを指定するネットワークポリシー経由で分離できます。Pod がネットワークポリシーによって選択されると、ネットワークポリシーで明示的に許可されていないすべてのトラフィックが拒否されます。詳細については、以下を参照してください。",
+  "Pods accept all traffic by default. They can be isolated via NetworkPolicies which specify a whitelist of ingress rules. When a Pod is selected by a NetworkPolicy, it will reject all traffic not explicitly allowed via a NetworkPolicy. See more details in: ": "Pod はデフォルトですべてのトラフィックを受け入れます。これらは、ingress ルールのホワイトリストを指定するネットワークポリシー経由で分離できます。Pod がネットワークポリシーによって選択されると、ネットワークポリシーで明示的に許可されていないすべてのトラフィックが拒否されます。詳細については、以下を参照してください。",


There shouldn't be changes in the ja/ko/zh files, only en. The other files will be updated when we get translations back.

Also fix missing space in english text i18n network-policy with link: use Trans

spadgett

/lgtm
/hold

@jotak Thanks, do you mind opening a Bugzilla bug for this? We'll need it to merge and backport if the link is broken in previous versions.

jotak · 2021-05-17T07:13:03Z

BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1961064

openshift-ci · 2021-05-17T07:15:37Z

@jotak: This pull request references Bugzilla bug 1961064, which is invalid:

expected the bug to target the "4.8.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1961064: Fix documentation link to network policies

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.

jhadvig · 2021-05-17T07:16:29Z

/bugzilla refresh

openshift-ci · 2021-05-17T07:16:36Z

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

Requesting review from QA contact:
/cc @yapei

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.

jhadvig · 2021-05-17T07:35:06Z

/hold cancel
/cherry-pick release-4.7

openshift-cherrypick-robot · 2021-05-17T07:35:06Z

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

In response to this:

/hold cancel
/cherry-pick release-4.7

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 · 2021-05-17T07:37:59Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhadvig, jotak, spadgett

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:

~~frontend/OWNERS~~ [jhadvig,spadgett]

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

openshift-ci · 2021-05-17T09:22:25Z

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

openshift/console#8869

Bugzilla bug 1961064 has been moved to the MODIFIED state.

In response to this:

Bug 1961064: Fix documentation link to network policies

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-cherrypick-robot · 2021-05-17T09:23:13Z

@jhadvig: #8869 failed to apply on top of branch "release-4.7":

Applying: Fix documentation link to network policies
Using index info to reconstruct a base tree...
M	frontend/public/components/network-policy.jsx
M	frontend/public/locales/en/public.json
Falling back to patching base and 3-way merge...
Auto-merging frontend/public/locales/en/public.json
CONFLICT (content): Merge conflict in frontend/public/locales/en/public.json
Auto-merging frontend/public/components/network-policy.jsx
CONFLICT (content): Merge conflict in frontend/public/components/network-policy.jsx
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix documentation link to network policies
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:

/hold cancel
/cherry-pick release-4.7

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 bot requested review from rhamilto and TheRealJon May 7, 2021 09:43

openshift-ci bot added component/core Related to console core functionality kind/i18n Indicates issue or PR relates to internationalization or has content that needs to be translated labels May 7, 2021

jotak force-pushed the fix-doc-link branch from d365f07 to f09a5d1 Compare May 7, 2021 12:18

spadgett reviewed May 7, 2021

View reviewed changes

openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 9, 2021

jotak force-pushed the fix-doc-link branch from f09a5d1 to 4248363 Compare May 10, 2021 07:17

openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 10, 2021

spadgett reviewed May 11, 2021

View reviewed changes

Fix documentation link to network policies

f9f6a90

Also fix missing space in english text i18n network-policy with link: use Trans

jotak force-pushed the fix-doc-link branch from 2ee66e0 to f9f6a90 Compare May 12, 2021 06:07

spadgett approved these changes May 12, 2021

View reviewed changes

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 12, 2021

openshift-ci bot assigned spadgett May 12, 2021

openshift-ci bot 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 May 12, 2021

jhadvig changed the title ~~Fix documentation link to network policies~~ Bug 1961064: Fix documentation link to network policies May 17, 2021

openshift-ci bot added bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels May 17, 2021

openshift-ci bot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. and removed bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. labels May 17, 2021

openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label May 17, 2021

openshift-ci bot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label May 17, 2021

openshift-ci bot requested a review from yapei May 17, 2021 07:16

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 17, 2021

jhadvig approved these changes May 17, 2021

View reviewed changes

openshift-merge-robot merged commit 23438a6 into openshift:master May 17, 2021

jotak mentioned this pull request May 18, 2021

[release-4.7] Bug 1963025: Fix documentation link to network policies #8953

Merged

spadgett added this to the v4.8 milestone May 18, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1961064: Fix documentation link to network policies #8869

Bug 1961064: Fix documentation link to network policies #8869

jotak commented May 7, 2021

spadgett May 7, 2021

jotak May 7, 2021

jotak May 10, 2021

rebeccaalpert commented May 7, 2021

jotak commented May 10, 2021

jotak commented May 11, 2021

spadgett May 11, 2021

jotak May 12, 2021

spadgett left a comment

jotak commented May 17, 2021

openshift-ci bot commented May 17, 2021

jhadvig commented May 17, 2021

openshift-ci bot commented May 17, 2021

jhadvig commented May 17, 2021

openshift-cherrypick-robot commented May 17, 2021

openshift-ci bot commented May 17, 2021

openshift-ci bot commented May 17, 2021

openshift-cherrypick-robot commented May 17, 2021

Bug 1961064: Fix documentation link to network policies #8869

Bug 1961064: Fix documentation link to network policies #8869

Conversation

jotak commented May 7, 2021

spadgett May 7, 2021

Choose a reason for hiding this comment

jotak May 7, 2021

Choose a reason for hiding this comment

jotak May 10, 2021

Choose a reason for hiding this comment

rebeccaalpert commented May 7, 2021

jotak commented May 10, 2021

jotak commented May 11, 2021

spadgett May 11, 2021

Choose a reason for hiding this comment

jotak May 12, 2021

Choose a reason for hiding this comment

spadgett left a comment

Choose a reason for hiding this comment

jotak commented May 17, 2021

openshift-ci bot commented May 17, 2021

jhadvig commented May 17, 2021

openshift-ci bot commented May 17, 2021

jhadvig commented May 17, 2021

openshift-cherrypick-robot commented May 17, 2021

openshift-ci bot commented May 17, 2021

openshift-ci bot commented May 17, 2021

openshift-cherrypick-robot commented May 17, 2021