Replace offensive words with alternative ones #2799

Timez-zx · 2021-09-17T08:16:37Z

Replace the terms that require immediate change in word list (master to main, kill to terminate, etc)
Resolve the first expectation of issue #2783

Signed-off-by: Xiao Zhang xzhang2@vmware.com

antoninbas

You need to work on the commit message & PR description:

"word_change" is not a descriptive commit title. Maybe refer to an earlier PR I had to remove offensive terms from the project: Use more inclusive terminology in project #1702
a detailed list of all individual changes is not needed nor helpful. This is what a git diff is for.

The PR should reference the issue, which is #2783 I believe

Finally I believe that you should have a single PR to update the terminology AND add a static checker, as this seems to be what the issue calls for. I don't know if a static checker is super realistic though... at least it will need to provide support for silencing "false positives".

antoninbas · 2021-09-20T21:20:29Z

build/images/scripts/start_ovs

@@ -110,7 +110,7 @@ SLEEP_PID=
 function quit {
    log_info $CONTAINER_NAME "Stopping OVS before quit"
    stop_ovs
-    # kill background sleep process
+    # stop background sleep process


I don't think we should change a term if it makes the sentence inaccurate
Here we should stick with kill (name of the tool we use) or terminate (name of the signal sent to the process), but a stop signal means something else

maybe the comment can be removed altogether

antoninbas · 2021-09-20T21:20:51Z

build/yamls/base/controller.yml

@@ -190,7 +190,7 @@ metadata:
    component: antrea-controller
 spec:
  strategy:
-    # Ensure the existing Pod is killed before the new one is created.
+    # Ensure the existing Pod is stoped before the new one is created.


s/stoped/stopped

antoninbas · 2021-09-20T21:21:00Z

build/yamls/octant/base/deployment.yml

@@ -7,7 +7,7 @@ metadata:
    component: antrea-octant
 spec:
  strategy:
-    # Ensure the existing Pod is killed before the new one is created.
+    # Ensure the existing Pod is stoped before the new one is created.


antoninbas · 2021-09-20T21:21:53Z

docs/egress.md

@@ -30,7 +30,7 @@ the egress IP when leaving that Node.
 You may be interested in using this capability if any of the following apply:

 - A consistent IP address is desired when specific Pods connect to services
-  outside of the cluster, for source tracing in audit logs, or whitelisting
+  outside of the cluster, for source tracing in audit logs, or aproving


it's spelled "approving" but here I think "or for filtering by source IP in external firewall" is a better replacement

antoninbas · 2021-09-20T21:22:12Z

hack/windows/Prepare-ServiceInterface.ps1

@@ -31,7 +31,7 @@ Set-NetIPInterface -ifAlias $INTERFACE_TO_ADD_SERVICE_IP -Forwarding Enabled

 if ($StopKubeProxyOnCreation) {
  # Restart kube-proxy to ensure that the newly created interface can be used.
-  # Kill kube-proxy and the process will be automatically restarted by the kube-proxy Pod.
+  # Stop kube-proxy and the process will be automatically restarted by the kube-proxy Pod.


same comment as at the beginning

tnqn · 2021-09-24T03:31:23Z

@xiaoxiaobaba You may take a look at https://github.com/antrea-io/antrea/blob/main/CONTRIBUTING.md#getting-reviewers for guidelines about making an appropriate PR. You can "Convert to draft" before you believe the PR is good for review.

Timez-zx

The label and description of PR #2799 has been changed and the words used wrongly have also been replaced.

luolanzone · 2021-09-24T06:07:13Z

@xiaoxiaobaba please use your own id to push the commit, otherwise DCO will fail. and you didn't have any title for your commit, I believe you need to review the guide provided by @tnqn to make sure you have the right description.

luolanzone · 2021-09-24T06:09:26Z

docs/egress.md

@@ -30,7 +30,7 @@ the egress IP when leaving that Node.
 You may be interested in using this capability if any of the following apply:

 - A consistent IP address is desired when specific Pods connect to services
-  outside of the cluster, for source tracing in audit logs, or whitelisting
+  outside of the cluster, for source tracing in audit logs, or  for filtering


you have an extra space before for, please remove it.

Timez-zx · 2021-09-24T09:13:08Z

Because the two commit can't merged into one, so i have to close this PR and build a new one with the same name.

tnqn · 2021-09-24T13:19:20Z

Because the two commit can't merged into one, so i have to close this PR and build a new one with the same name.

Two commits can be merged. https://www.atlassian.com/git/tutorials/rewriting-history may be helpful for you.
We'd better to stick to this PR as there have been comments left here.

Besides, the commit message in either PR is still inappropriate.

Timez-zx · 2021-09-27T02:45:12Z

@xiaoxiaobaba You may take a look at https://github.com/antrea-io/antrea/blob/main/CONTRIBUTING.md#getting-reviewers for guidelines about making an appropriate PR. You can "Convert to draft" before you believe the PR is good for review.

I have used “git reset ” to resubmit a new commit under the PR, and the problem have been fixed.

tnqn · 2021-09-27T10:38:31Z

Besides, the commit message in either PR is still inappropriate.

Do not prepend "Title" and "Descripiton" to title and description
Insert an empty line between paragraphs

Timez-zx · 2021-09-29T07:19:28Z

Besides, the commit message in either PR is still inappropriate.

Do not prepend "Title" and "Descripiton" to title and description

Insert an empty line between paragraphs

Done

tnqn

LGTM, but it seems the email you use for this commit is not associated with your github account, which may cause your account don't get the credit.

codecov-commenter · 2021-09-29T10:42:10Z

Codecov Report

Merging #2799 (e2f943f) into main (3a86d2a) will increase coverage by 1.75%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #2799      +/-   ##
==========================================
+ Coverage   60.19%   61.95%   +1.75%     
==========================================
  Files         284      283       -1     
  Lines       23475    23735     +260     
==========================================
+ Hits        14131    14705     +574     
+ Misses       7819     7467     -352     
- Partials     1525     1563      +38

Flag	Coverage Δ
kind-e2e-tests	`49.57% <ø> (+1.91%)`	⬆️
unit-tests	`41.60% <ø> (+0.70%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
...g/controller/networkpolicy/store/appliedtogroup.go	`86.36% <0.00%> (-3.04%)`	⬇️
pkg/flowaggregator/flowaggregator.go	`67.22% <0.00%> (-2.07%)`	⬇️
pkg/agent/metrics/prometheus.go	`24.32% <0.00%> (-1.39%)`	⬇️
pkg/agent/flowexporter/exporter/exporter.go	`80.98% <0.00%> (-1.24%)`	⬇️
pkg/agent/nodeportlocal/k8s/npl_controller.go	`59.31% <0.00%> (-0.35%)`	⬇️
pkg/controller/egress/controller.go	`84.12% <0.00%> (ø)`
pkg/apis/controlplane/helper.go
pkg/agent/openflow/network_policy.go	`83.35% <0.00%> (+0.13%)`	⬆️
pkg/agent/agent.go	`52.16% <0.00%> (+0.39%)`	⬆️
pkg/agent/cniserver/pod_configuration.go	`56.00% <0.00%> (+0.44%)`	⬆️
... and 18 more

Timez-zx · 2021-09-30T01:13:22Z

LGTM, but it seems the email you use for this commit is not associated with your github account, which may cause your account don't get the credit.

@tnqn The primary e-mail in github has been change to the commit one, maybe it can be merged. And thank you very much for your help.

tnqn · 2021-09-30T02:33:41Z

There is a conflicting file, could you rebase then we can merge?

Timez-zx · 2021-09-30T06:09:53Z

There is a conflicting file, could you rebase then we can merge?

I have rebased the branch, the conflicting file has been solved.

Timez-zx · 2021-09-30T06:11:40Z

There is a conflicting file, could you rebase then we can merge?

I have rebased the branch, the conflicting file has been solved.

tnqn · 2021-09-30T06:56:26Z

docs/maintainers/release.md

@@ -71,6 +71,7 @@ release. We use `<TAG>` as a placeholder for the release tag (e.g. `v1.4.0`).
     particular, the following link should work:
     `https://github.com/antrea-io/antrea/releases/download/<TAG>/antrea.yml`.

+<<<<<<< HEAD


The conflict is not resolved

Sorry, this conflict should be fixed now.

Replace the terms that require immediate change in wordlist. Signed-off-by: Xiao Zhang <xzhang2@vmware.com>

tnqn

LGTM

tnqn · 2021-10-13T16:57:13Z

/skip-all

tnqn · 2021-10-14T09:20:09Z

/skip-all

tnqn · 2021-10-14T09:24:04Z

DCO check is missing somehow. I have confirmed the commit is signed off correctly. Merging it.

antoninbas reviewed Sep 20, 2021

View reviewed changes

Timez-zx force-pushed the x-antrea branch from af28095 to 419c60e Compare September 24, 2021 03:14

Timez-zx force-pushed the x-antrea branch from 419c60e to 05a6a79 Compare September 24, 2021 03:34

Timez-zx changed the title ~~word_change~~ Replace offensive with alternative words Sep 24, 2021

Timez-zx changed the title ~~Replace offensive with alternative words~~ Replace offensive words with alternative ones Sep 24, 2021

Timez-zx commented Sep 24, 2021

View reviewed changes

luolanzone requested changes Sep 24, 2021

View reviewed changes

Timez-zx closed this Sep 24, 2021

Timez-zx reopened this Sep 27, 2021

Timez-zx force-pushed the x-antrea branch from 5adf307 to 964c5b9 Compare September 27, 2021 02:42

Timez-zx mentioned this pull request Sep 27, 2021

Replace offensive words with alternative ones #2837

Closed

Timez-zx force-pushed the x-antrea branch from 964c5b9 to 179ee13 Compare September 29, 2021 06:50

tnqn previously approved these changes Sep 29, 2021

View reviewed changes

Timez-zx dismissed tnqn’s stale review via 801dfc1 September 30, 2021 06:04

Timez-zx force-pushed the x-antrea branch from 179ee13 to 801dfc1 Compare September 30, 2021 06:04

tnqn reviewed Sep 30, 2021

View reviewed changes

Timez-zx force-pushed the x-antrea branch 2 times, most recently from 5b95512 to d5ae24a Compare October 12, 2021 03:28

Timez-zx force-pushed the x-antrea branch from d5ae24a to 01a73b5 Compare October 12, 2021 03:32

Replace offensive words

e2f943f

Replace the terms that require immediate change in wordlist. Signed-off-by: Xiao Zhang <xzhang2@vmware.com>

Timez-zx force-pushed the x-antrea branch from d1c8119 to e2f943f Compare October 12, 2021 04:21

tnqn approved these changes Oct 13, 2021

View reviewed changes

tnqn closed this Oct 14, 2021

tnqn reopened this Oct 14, 2021

luolanzone approved these changes Oct 14, 2021

View reviewed changes

tnqn merged commit 2f21fbd into antrea-io:main Oct 14, 2021

Replace offensive words with alternative ones #2799

Replace offensive words with alternative ones #2799

Timez-zx commented Sep 17, 2021 •

edited

antoninbas left a comment

antoninbas Sep 20, 2021

Timez-zx Sep 24, 2021

antoninbas Sep 20, 2021

antoninbas Sep 20, 2021

antoninbas Sep 20, 2021

antoninbas Sep 20, 2021

tnqn commented Sep 24, 2021 •

edited

Timez-zx left a comment

luolanzone commented Sep 24, 2021 •

edited

luolanzone Sep 24, 2021

Timez-zx commented Sep 24, 2021

tnqn commented Sep 24, 2021 •

edited

Timez-zx commented Sep 27, 2021

tnqn commented Sep 27, 2021

Timez-zx commented Sep 29, 2021

tnqn left a comment

codecov-commenter commented Sep 29, 2021 •

edited

Timez-zx commented Sep 30, 2021

tnqn commented Sep 30, 2021

Timez-zx commented Sep 30, 2021

Timez-zx commented Sep 30, 2021

tnqn Sep 30, 2021

Timez-zx Oct 12, 2021

tnqn left a comment

tnqn commented Oct 13, 2021

tnqn commented Oct 14, 2021

tnqn commented Oct 14, 2021

Replace offensive words with alternative ones #2799

Replace offensive words with alternative ones #2799

Conversation

Timez-zx commented Sep 17, 2021 • edited

antoninbas left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tnqn commented Sep 24, 2021 • edited

Timez-zx left a comment

Choose a reason for hiding this comment

luolanzone commented Sep 24, 2021 • edited

Choose a reason for hiding this comment

Timez-zx commented Sep 24, 2021

tnqn commented Sep 24, 2021 • edited

Timez-zx commented Sep 27, 2021

tnqn commented Sep 27, 2021

Timez-zx commented Sep 29, 2021

tnqn left a comment

Choose a reason for hiding this comment

codecov-commenter commented Sep 29, 2021 • edited

Codecov Report

Timez-zx commented Sep 30, 2021

tnqn commented Sep 30, 2021

Timez-zx commented Sep 30, 2021

Timez-zx commented Sep 30, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tnqn left a comment

Choose a reason for hiding this comment

tnqn commented Oct 13, 2021

tnqn commented Oct 14, 2021

tnqn commented Oct 14, 2021

Timez-zx commented Sep 17, 2021 •

edited

tnqn commented Sep 24, 2021 •

edited

luolanzone commented Sep 24, 2021 •

edited

tnqn commented Sep 24, 2021 •

edited

codecov-commenter commented Sep 29, 2021 •

edited