diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 7c495f3..fd1ddf9 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -37,4 +37,4 @@ assignees: '' - πŸ“š [Instructions for contributing to documentation](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#documentation-contribution-flow) - Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs) - 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9) -- πŸ™‹πŸΎπŸ™‹πŸΌ Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io) +- πŸ™‹πŸΎπŸ™‹πŸΌ Questions: [Discussion Forum](https://meshery.io/community#discussion-forums) and [Community Slack](http://slack.meshery5.io) diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md index e4e95c1..53949e8 100644 --- a/.github/ISSUE_TEMPLATE/documentation.md +++ b/.github/ISSUE_TEMPLATE/documentation.md @@ -19,4 +19,4 @@ assignees: '' - Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs) - πŸ›  [Meshery Build & Release Strategy](https://docs.meshery.io/project/build-and-release) - 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9) -- πŸ™‹πŸΎπŸ™‹πŸΌ Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io) +- πŸ™‹πŸΎπŸ™‹πŸΌ Questions: [Discussion Forum](https://meshery.io/community#discussion-forums) and [Community Slack](http://slack.meshery5.io) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 668a6f3..10f9a57 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -29,4 +29,4 @@ assignees: '' - πŸ“š [Instructions for contributing to documentation](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#documentation-contribution-flow) - Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs) - 🎨 Wireframes and [designs for Meshery UI](https://www.figma.com/file/SMP3zxOjZztdOLtgN4dS2W/Meshery-UI) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9) -- πŸ™‹πŸΎπŸ™‹πŸΌ Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io) +- πŸ™‹πŸΎπŸ™‹πŸΌ Questions: [Discussion Forum](https://meshery.io/community#discussion-forums) and [Community Slack](http://slack.meshery5.io) diff --git a/.github/config.yml b/.github/config.yml index 50d1335..e0a5200 100644 --- a/.github/config.yml +++ b/.github/config.yml @@ -3,14 +3,13 @@ # Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome # Comment to be posted to on first time issues newIssueWelcomeComment: > - Thanks for opening this issue. A contributor will be by to give feedback soon. In the meantime, please review the [Layer5 Community Welcome Guide](https://docs.google.com/document/d/17OPtDE_rdnPQxmk2Kauhm3GwXF1R5dZ3Cj8qZLKdo5E/edit?usp=sharing) and sure to join the [community Slack](http://slack.layer5.io/). + Thanks for opening this issue. A contributor will be by to give feedback soon. In the meantime, please review the [Contributors' Welcome Guide](https://docs.meshery.io/project/community), engage in the [discussion forum](https://meshery.io/community#community-forums), and be sure to join the [community Slack](https://slack.meshery.io/). # Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome # Comment to be posted to on PRs from first time contributors in your repository newPRWelcomeComment: > - Yay, your first pull request! :thumbsup: A contributor will be by to give feedback soon. In the meantime, please review the [Layer5 Community Welcome Guide](https://docs.google.com/document/d/17OPtDE_rdnPQxmk2Kauhm3GwXF1R5dZ3Cj8qZLKdo5E/edit?usp=sharing) and sure to join the [community Slack](http://slack.layer5.io/). - - Be sure to double-check that you have signed your commits. Here are instructions for [making signing an implicit activity while peforming a commit](../CONTRIBUTING.md#signing-off-on-commits-developer-certificate-of-origin). + Yay, your first pull request! :thumbsup: A contributor will be by to give feedback soon. In the meantime, you can find updates in the [#github-notifications](https://mesheryio.slack.com/archives/CLVT4TSG4) channel in the [community Slack](https://slack.meshery.io). + Be sure to double-check that you have signed your commits. Here are instructions for [making signing an implicit activity while performing a commit](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#signing-off-on-commits-developer-certificate-of-origin). #------------------------------------------------------------------------------- # Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge # Comment to be posted to on pull requests merged by a first time user @@ -33,7 +32,7 @@ requestInfoReplyComment: > # *OPTIONAL* Add a list of people whose Issues/PRs will not be commented on # keys must be GitHub usernames #requestInfoUserstoExclude: -# - layer5io/maintainers +# - meshery/maintainers #------------------------------------------------------------------------------- # Configuration for sentiment-bot - https://github.com/behaviorbot/sentiment-bot @@ -43,4 +42,4 @@ sentimentBotToxicityThreshold: .9 # *Required* Comment to reply with sentimentBotReplyComment: > - Please be sure to review the code of conduct and be respectful of other users. // @layer5io/maintainers + Please be sure to review the code of conduct and be respectful of other users. // @meshery/maintainers diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 123ff62..085fa29 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,5 +1,5 @@ -# Layer5 Community Code of Conduct +# Meshery Community Code of Conduct -The Layer5 community follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). +The Meshery community follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting community@layer5.io. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting community@meshery.io. diff --git a/CONTRIBUTING-gitflow.md b/CONTRIBUTING-gitflow.md index 35afde8..c1c2388 100644 --- a/CONTRIBUTING-gitflow.md +++ b/CONTRIBUTING-gitflow.md @@ -10,7 +10,7 @@ While this isn't an absolutely necessary step, if you plan on doing anything mor ## Add 'upstream' repo to list of remotes ``` -git remote add upstream https://github.com/layer5io/meshery.git +git remote add upstream https://github.com/meshery/meshery.git ``` ("meshery" is used as the example repo. Be sure to reference the _actual_ repo you're contributing to e.g. "meshery-linkerd"). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9506726..4e0018a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ # Contributing -You want to contribute to the project? Yay! We want you to! Visit our centralized instructions for [contributing](https://github.com/layer5io/meshery/blob/master/CONTRIBUTING.md#contributing). +You want to contribute to the project? Yay! We want you to! Visit our centralized instructions for [contributing](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#contributing). diff --git a/LICENSE b/LICENSE index c58233a..69020cd 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2019, 2020 Layer5, Inc. + Copyright Meshery Authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index 2264e44..24c8e80 100644 --- a/README.md +++ b/README.md @@ -10,15 +10,15 @@ # Meshery Adapter for NGINX Service Mesh
-[![Docker Pulls](https://img.shields.io/docker/pulls/layer5/meshery-nginx-sm.svg)](https://hub.docker.com/r/layer5/meshery-nginx-sm) -[![Go Report Card](https://goreportcard.com/badge/github.com/layer5io/meshery-nginx-sm)](https://goreportcard.com/report/github.com/layer5io/meshery-nginx-sm) +[![Docker Pulls](https://img.shields.io/docker/pulls/meshery/meshery-nginx-sm.svg)](https://hub.docker.com/r/meshery/meshery-nginx-sm) +[![Go Report Card](https://goreportcard.com/badge/github.com/meshery/meshery-nginx-sm)](https://goreportcard.com/report/github.com/meshery/meshery-nginx-sm) [![Build Status](https://img.shields.io/github/actions/workflow/status/meshery/meshery-nginx-sm/multi-platform.yml?branch=master)](https://github.com/meshery/meshery-nginx-sm/actions) [![GitHub](https://img.shields.io/github/license/meshery/meshery-nginx-sm.svg)](https://github.com/meshery/meshery-nginx-sm/blob/master/LICENSE) -[![GitHub issues by-label](https://img.shields.io/github/issues/layer5io/meshery-nginx-sm/help%20wanted.svg)](https://github.com/layer5io/meshery-nginx-sm/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) -[![Website](https://img.shields.io/website/https/layer5.io/meshery.svg)](https://meshery.io) +[![GitHub issues by-label](https://img.shields.io/github/issues/meshery/meshery-nginx-sm/help%20wanted.svg)](https://github.com/meshery/meshery-nginx-sm/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) +[![Website](https://img.shields.io/website/https/meshery.io/meshery.svg)](https://meshery.io) [![Twitter Follow](https://img.shields.io/twitter/follow/mesheryio.svg?label=Follow&style=social)](https://twitter.com/intent/follow?screen_name=mesheryio) -[![Discuss Users](https://img.shields.io/discourse/users?server=https%3A%2F%2Fdiscuss.layer5.io)](https://meshery.io/community#discussion-forums) -[![Slack](https://img.shields.io/badge/Slack-@layer5.svg?logo=slack)](http://slack.meshery.io) +[![Discuss Users](https://img.shields.io/discourse/users?server=http%3A%2F%2Fdiscuss.meshery.io)](https://meshery.io/community#discussion-forums) +[![Slack](https://img.shields.io/badge/Slack-@meshery.svg?logo=slack)](http://slack.meshery.io) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3564/badge)](https://bestpractices.coreinfrastructure.org/projects/3564)
@@ -42,7 +42,7 @@ NGINX Service Mesh (NSM), a fully integrated lightweight service mesh that lever

Community and Contributing

-Our projects are community-built and welcome collaboration. πŸ‘ Be sure to see the Contributor Journey Map for a tour of resources available to you and jump into our Slack! Contributors are expected to adhere to the CNCF Code of Conduct. +Our projects are community-built and welcome collaboration. πŸ‘ Be sure to see the Contributor Journey Map for a tour of resources available to you and jump into our Slack! Contributors are expected to adhere to the CNCF Code of Conduct. @@ -56,11 +56,11 @@ Our projects are community-built and welcome collaboration. πŸ‘ Be sure to see

βœ”οΈ Join any or all of the weekly meetings on the community calendar.
βœ”οΈ Watch community meeting recordings.
-βœ”οΈ To access the Community Drive, fill Community Member Form.
+βœ”οΈ To access the Community Drive, fill Community Member Form.
βœ”οΈ Discuss in the Community Forum.

-Not sure where to start? Grab an open issue with the help-wanted label. +Not sure where to start? Grab an open issue with the help-wanted label.

**License** diff --git a/go.mod b/go.mod index 7d65388..70a8639 100644 --- a/go.mod +++ b/go.mod @@ -11,9 +11,9 @@ replace ( require ( github.com/google/uuid v1.6.0 - github.com/layer5io/meshery-adapter-library v0.6.7 - github.com/layer5io/meshkit v0.6.49 - github.com/layer5io/service-mesh-performance v0.3.4 + github.com/meshery/meshery-adapter-library v0.6.7 + github.com/meshery/meshkit v0.6.49 + github.com/service-mesh-performance/service-mesh-performance v0.3.4 gopkg.in/yaml.v2 v2.4.0 k8s.io/apimachinery v0.26.2 ) diff --git a/go.sum b/go.sum index fcb5730..c2f0334 100644 --- a/go.sum +++ b/go.sum @@ -594,13 +594,13 @@ github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6Fm github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334/go.mod h1:UmrVd7x+bNVKrpmKgTtfRiTKHZeNPcMjQproJ0vGwhE= github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210317075357-06b4f88b3e34 h1:QaViadDOBCMDUwYx78kfRvHMkzRVnh/GOhm3s2gxoP4= github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210317075357-06b4f88b3e34/go.mod h1:BQPLwdJt7v7y0fXIejI4whR9zMyX07Wjt5xrbgEmHLw= -github.com/layer5io/meshery-adapter-library v0.6.7 h1:d0NpqTwF4djt0SWKpIGjEl6BTFK9Li32ynYx5BS5A8E= -github.com/layer5io/meshery-adapter-library v0.6.7/go.mod h1:7vsze4Cd0pzKtbD+BARNa/vt+GYSzmkhKA6unmAD0qc= -github.com/layer5io/meshkit v0.6.49 h1:EENHaGl8ea12y0iztbRdoMTyVaAlRfAfVnEjgXZLQyg= -github.com/layer5io/meshkit v0.6.49/go.mod h1:+aWaWv+5rTC4fovas6Bv8dQkVsb0GLqJRW3KToAxqAE= -github.com/layer5io/service-mesh-performance v0.3.2-0.20210122142912-a94e0658b021/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ= -github.com/layer5io/service-mesh-performance v0.3.4 h1:aw/elsx0wkry7SyiQRIj31wW7TPCP4YfhINdNOLXVg8= -github.com/layer5io/service-mesh-performance v0.3.4/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ= +github.com/meshery/meshery-adapter-library v0.6.7 h1:d0NpqTwF4djt0SWKpIGjEl6BTFK9Li32ynYx5BS5A8E= +github.com/meshery/meshery-adapter-library v0.6.7/go.mod h1:7vsze4Cd0pzKtbD+BARNa/vt+GYSzmkhKA6unmAD0qc= +github.com/meshery/meshkit v0.6.49 h1:EENHaGl8ea12y0iztbRdoMTyVaAlRfAfVnEjgXZLQyg= +github.com/meshery/meshkit v0.6.49/go.mod h1:+aWaWv+5rTC4fovas6Bv8dQkVsb0GLqJRW3KToAxqAE= +github.com/service-mesh-performance/service-mesh-performance v0.3.2-0.20210122142912-a94e0658b021/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ= +github.com/service-mesh-performance/service-mesh-performance v0.3.4 h1:aw/elsx0wkry7SyiQRIj31wW7TPCP4YfhINdNOLXVg8= +github.com/service-mesh-performance/service-mesh-performance v0.3.4/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= diff --git a/internal/config/error.go b/internal/config/error.go index 3cab48e..2a5101c 100644 --- a/internal/config/error.go +++ b/internal/config/error.go @@ -1,4 +1,4 @@ -// Copyright 2020 Layer5, Inc. +// Copyright Meshery Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License.