Merge pull request #785 from dholbach/cncf-slack

Link to CNCF Slack

CONTRIBUTING.md

@@ -29,7 +29,7 @@ you can sign your commit automatically with `git commit -s`.
 
 The project uses Slack: To join the conversation, simply join the
 [CNCF](https://slack.cncf.io/) Slack workspace and use the
-[#flux](https://cloud-native.slack.com/messages/flux/) channel.
+[#flagger](https://cloud-native.slack.com/messages/flagger/) channel.
 
 The developers use a mailing list to discuss development as well.
 Simply subscribe to [flux-dev on cncf.io](https://lists.cncf.io/g/cncf-flux-dev)

MAINTAINERS

@@ -1,6 +1,6 @@
 The maintainers are generally available in Slack at
-https://weave-community.slack.com/messages/flagger/ (obtain an invitation
-at https://slack.weave.works/).
+https://cloud-native.slack.com/messages/flagger/ (obtain an invitation
+at https://slack.cncf.io/).
 
 Stefan Prodan, Weaveworks <stefan@weave.works> (Slack: @stefan Twitter: @stefanprodan)
 Takeshi Yoneda, DMM.com <cz.rk.t0415y.g@gmail.com> (Slack: @mathetake Twitter: @mathetake)

README.md

@@ -243,10 +243,10 @@ When submitting bug reports please include as much details as possible:
 If you have any questions about Flagger and progressive delivery:
 
 * Read the Flagger [docs](https://docs.flagger.app).
-* Invite yourself to the [Weave community slack](https://slack.weave.works/)
- and join the [#flagger](https://weave-community.slack.com/messages/flagger/) channel.
-* Join the [Weave User Group](https://www.meetup.com/pro/Weave/) and get invited to online talks,
- hands-on training and meetups in your area.
+* Invite yourself to the [CNCF community slack](https://slack.cncf.io/)
+ and join the [#flagger](https://cloud-native.slack.com/messages/flagger/) channel.
+* Check out the [Flux talks section](https://fluxcd.io/community/#talks) and to see a list of online talks,
+ hands-on training and meetups.
 * File an [issue](https://github.com/fluxcd/flagger/issues/new).
 
 Your feedback is always welcome!