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

Black Lives Matter announcement #21505

Merged
merged 1 commit into from
Jun 5, 2020

Conversation

justaugustus
Copy link
Member

@justaugustus justaugustus commented Jun 4, 2020

Verbiage for Black Lives Matter announcement, discussed with @kubernetes/steering-committee earlier today.

Signed-off-by: Stephen Augustus saugustus@vmware.com

/assign @zacharysarah
Special thanks to @celestehorgan for working on the announcement support! 💕
/hold for SC review
ref: https://kubernetes.slack.com/archives/CPNFRNLTS/p1591214537073500

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 4, 2020
@k8s-ci-robot k8s-ci-robot added the sig/docs Categorizes an issue or PR as relevant to SIG Docs. label Jun 4, 2020
@jimangel
Copy link
Member

jimangel commented Jun 4, 2020

@justaugustus you'll want to toggle announcement true

@justaugustus
Copy link
Member Author

🤦

Copy link
Member

@onlydole onlydole left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️❤️❤️
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 4, 2020
config.toml Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 4, 2020
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 4, 2020
@zacharysarah
Copy link
Contributor

/hold for a quick edit

@onlydole
Copy link
Member

onlydole commented Jun 4, 2020

Great catch, @celestehorgan!
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 4, 2020
@netlify
Copy link

netlify bot commented Jun 4, 2020

Deploy preview for kubernetes-io-master-staging ready!

Built with commit d4cfe6c

https://deploy-preview-21505--kubernetes-io-master-staging.netlify.app

Copy link
Contributor

@celestehorgan celestehorgan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👏

config.toml Outdated
announcement_message_full = "Long homepage announcement <br/><br/> Quisque efficitur feugiat neque non accumsan. Sed sed massa pharetra, suscipit mauris ut, viverra felis. Sed id ullamcorper sapien. Vivamus lobortis elementum nunc nec molestie. Ut eleifend tellus diam, in tincidunt purus ullamcorper nec. Morbi quam elit, laoreet at cursus vitae, efficitur condimentum felis. Nam ac felis sed lorem dapibus semper. Integer eu pretium justo. Nunc porta pulvinar ornare. " #appears on homepage. Use md formatting for links and <br/> for line breaks.
announcement_message_compact = "One line compact announcement" #appears on subpages
announcement_title = "Black Lives Matter."
announcement_message_full = "We stand in solidarity with the Black community.<br/>Racism is unacceptable, is in conflict with the [core values of the Kubernetes project](https://git.k8s.io/community/values.md), and is NOT tolerated in our community.<br/>#BlackLivesMatter" #appears on homepage. Use md formatting for links and <br/> for line breaks.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
announcement_message_full = "We stand in solidarity with the Black community.<br/>Racism is unacceptable, is in conflict with the [core values of the Kubernetes project](https://git.k8s.io/community/values.md), and is NOT tolerated in our community.<br/>#BlackLivesMatter" #appears on homepage. Use md formatting for links and <br/> for line breaks.
announcement_message_full = "We stand in solidarity with the Black community.<br/>Racism is unacceptable, conflicts with the [core values of the Kubernetes project](https://git.k8s.io/community/values.md), and is NOT tolerated in our community.<br/>#BlackLivesMatter" #appears on homepage. Use md formatting for links and <br/> for line breaks.

Copy link
Contributor

@celestehorgan celestehorgan Jun 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @zacharysarah, I tried removing all the "is"-es but this seemed better

Another way to word this might be "Racism is unacceptable and conflicts with the core values of the k8s project. We do not tolerate it in our community."

config.toml Outdated
announcement_message_compact = "One line compact announcement" #appears on subpages
announcement_title = "Black Lives Matter."
announcement_message_full = "We stand in solidarity with the Black community.<br/>Racism is unacceptable, is in conflict with the [core values of the Kubernetes project](https://git.k8s.io/community/values.md), and is NOT tolerated in our community.<br/>#BlackLivesMatter" #appears on homepage. Use md formatting for links and <br/> for line breaks.
announcement_message_compact = "We stand in solidarity with the Black community.<br/>Racism is unacceptable, is in conflict with the [core values of the Kubernetes project](https://git.k8s.io/community/values.md), and is NOT tolerated in our community.<br/>#BlackLivesMatter" #appears on subpages
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
announcement_message_compact = "We stand in solidarity with the Black community.<br/>Racism is unacceptable, is in conflict with the [core values of the Kubernetes project](https://git.k8s.io/community/values.md), and is NOT tolerated in our community.<br/>#BlackLivesMatter" #appears on subpages
announcement_message_compact = "We stand in solidarity with the Black community.<br/>Racism is unacceptable, conflicts with the [core values of the Kubernetes project](https://git.k8s.io/community/values.md), and is NOT tolerated in our community.<br/>#BlackLivesMatter" #appears on subpages

config.toml Outdated
announcement_title = "Announcement title here"
announcement_message_full = "Long homepage announcement <br/><br/> Quisque efficitur feugiat neque non accumsan. Sed sed massa pharetra, suscipit mauris ut, viverra felis. Sed id ullamcorper sapien. Vivamus lobortis elementum nunc nec molestie. Ut eleifend tellus diam, in tincidunt purus ullamcorper nec. Morbi quam elit, laoreet at cursus vitae, efficitur condimentum felis. Nam ac felis sed lorem dapibus semper. Integer eu pretium justo. Nunc porta pulvinar ornare. " #appears on homepage. Use md formatting for links and <br/> for line breaks.
announcement_message_compact = "One line compact announcement" #appears on subpages
announcement_title = "Black Lives Matter."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
announcement_title = "Black Lives Matter."
announcement_title = "Black Lives Matter"

Nit: in general we don't use punctuation at the end of titles

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nit, not a blocker]

@justaugustus If you like the period, can we drop the caps? So:

Black lives matter.

Copy link
Contributor

@zacharysarah zacharysarah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@justaugustus Does this clarify without diluting the power?

config.toml Outdated Show resolved Hide resolved
config.toml Outdated Show resolved Hide resolved
@netlify
Copy link

netlify bot commented Jun 4, 2020

Deploy preview for kubernetes-io-master-staging ready!

Built with commit fac812d

https://deploy-preview-21505--kubernetes-io-master-staging.netlify.app

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 4, 2020
@dims
Copy link
Member

dims commented Jun 5, 2020

+1 from me

@onlydole
Copy link
Member

onlydole commented Jun 5, 2020

+1 on the latest revisions!
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 5, 2020
config.toml Outdated
announcement_title = "Announcement title here"
announcement_message_full = "Long homepage announcement <br/><br/> Quisque efficitur feugiat neque non accumsan. Sed sed massa pharetra, suscipit mauris ut, viverra felis. Sed id ullamcorper sapien. Vivamus lobortis elementum nunc nec molestie. Ut eleifend tellus diam, in tincidunt purus ullamcorper nec. Morbi quam elit, laoreet at cursus vitae, efficitur condimentum felis. Nam ac felis sed lorem dapibus semper. Integer eu pretium justo. Nunc porta pulvinar ornare. " #appears on homepage. Use md formatting for links and <br/> for line breaks.
announcement_message_compact = "One line compact announcement" #appears on subpages
announcement_title = "Black Lives Matter."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
announcement_title = "Black Lives Matter."
announcement_title = "Black lives matter."

Signed-off-by: Stephen Augustus <saugustus@vmware.com>
Co-authored-by: Christoph Blecker <cblecker@gmail.com>
Co-authored-by: Davanum Srinivas <davanum@gmail.com>
Co-authored-by: Derek Carr <decarr@redhat.com>
Co-authored-by: Lachlan Evenson <lachlan.evenson@gmail.com>
Co-authored-by: Nikhita Raghunath <nikhitaraghunath@gmail.com>
Co-authored-by: Paris Pittman <paris.pittman@gmail.com>
Co-authored-by: Aaron Crickenberger <spiffxp@gmail.com>
Co-authored-by: Zach Corleissen <zacharysarah@users.noreply.github.com>
Co-authored-by: Celeste Horgan <celeste@cncf.io>
@celestehorgan
Copy link
Contributor

/lgtm 👯

@spiffxp
Copy link
Member

spiffxp commented Jun 5, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 5, 2020
@derekwaynecarr
Copy link
Member

/lgtm

@jimangel
Copy link
Member

jimangel commented Jun 5, 2020

/lgtm

@justaugustus
Copy link
Member Author

Sh-sh-ship it! :shipit:
/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 5, 2020
@zacharysarah
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zacharysarah

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 5, 2020
@k8s-ci-robot k8s-ci-robot merged commit 042df6c into kubernetes:master Jun 5, 2020
DirectXMan12 added a commit to DirectXMan12/kubebuilder that referenced this pull request Jun 5, 2020
Inclusive is better than exclusive: this is a core principal of
Kubernetes.

There is no community when people are dehumanized, marginalized,
threatened, or otherwise made to feel unwelcome, and without community,
there is no Kubernetes, there is no KubeBuilder.

---

Verbiage and general design taken from the main Kubernetes website
(kubernetes/website#21505).
DirectXMan12 added a commit to DirectXMan12/kubebuilder that referenced this pull request Jun 5, 2020
Inclusive is better than exclusive: this is a core principal of
Kubernetes.

There is no community when people are dehumanized, marginalized,
threatened, and made to feel unwelcome, and without community,
there is no Kubernetes, there is no KubeBuilder.

---

Verbiage and general design taken from the main Kubernetes website
(kubernetes/website#21505).
DirectXMan12 added a commit to DirectXMan12/kubebuilder that referenced this pull request Jun 5, 2020
Inclusive is better than exclusive: this is a core principal of
Kubernetes.

There can be no community when people are systematically dehumanized,
marginalized, threatened, and made to feel unwelcome, and without
community, there is no Kubernetes, there is no KubeBuilder.

---

Verbiage and general design taken from the main Kubernetes website
(kubernetes/website#21505).
DirectXMan12 added a commit to DirectXMan12/kubebuilder that referenced this pull request Jun 5, 2020
Inclusive is better than exclusive: this is a core principal of
Kubernetes.

When people are systematically dehumanized, marginalized, threatened,
and made to feel unwelcome, it's our job to make it clear that such
things will not fly in our community, and must not be allowed to fly in
society.

Without inclusivity, there is no community, and without community, there
is no Kubernetes, there is no KubeBuilder.

---

Verbiage and general design taken from the main Kubernetes website
(kubernetes/website#21505).
DirectXMan12 added a commit to DirectXMan12/kubebuilder that referenced this pull request Jun 5, 2020
Inclusive is better than exclusive: this is a core principal of
Kubernetes.

When people are systematically dehumanized, marginalized, threatened,
and made to feel unwelcome, it's our job to make it clear that such
things will not fly in our community, and must not be allowed to fly in
society.

Without inclusivity, there is no community, and without community, there
is no Kubernetes, there is no KubeBuilder.

---

Verbiage and general design taken from the main Kubernetes website
(kubernetes/website#21505).
DirectXMan12 added a commit to DirectXMan12/kubebuilder that referenced this pull request Jun 5, 2020
Inclusive is better than exclusive: this is a core principal of
Kubernetes.

When people are systematically murdered, dehumanized, marginalized,
threatened, and made to feel unwelcome, it's our job to make it clear
that such things will not fly in our community, and must not be allowed
to fly in society.

Without inclusivity, there is no community, and without community, there
is no Kubernetes, there is no KubeBuilder.

---

Verbiage and general design taken from the main Kubernetes website
(kubernetes/website#21505).
camilamacedo86 pushed a commit to camilamacedo86/kubebuilder that referenced this pull request Jun 5, 2020
Inclusive is better than exclusive: this is a core principal of
Kubernetes.

When people are systematically murdered, dehumanized, marginalized,
threatened, and made to feel unwelcome, it's our job to make it clear
that such things will not fly in our community, and must not be allowed
to fly in society.

Without inclusivity, there is no community, and without community, there
is no Kubernetes, there is no KubeBuilder.

---

Verbiage and general design taken from the main Kubernetes website
(kubernetes/website#21505).
DirectXMan12 added a commit to camilamacedo86/kubebuilder that referenced this pull request Jun 5, 2020
Inclusive is better than exclusive: this is a core principal of
Kubernetes.

When people are systematically murdered, dehumanized, marginalized,
threatened, and made to feel unwelcome, it's our job to make it clear
that such things will not fly in our community, and must not be allowed
to fly in society.

Without inclusivity, there is no community, and without community, there
is no Kubernetes, there is no KubeBuilder.

---

Verbiage and general design taken from the main Kubernetes website
(kubernetes/website#21505).
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants