Skip to content

Commit

Permalink
Merge branch 'master' into leecalcote-patch-3
Browse files Browse the repository at this point in the history
  • Loading branch information
vishalvivekm authored Sep 22, 2024
2 parents 3dfb242 + bf8d566 commit dd07a73
Show file tree
Hide file tree
Showing 8 changed files with 193 additions and 6 deletions.
26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE/ci.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: 🛠 Continuous Integration / DevOps
about: Improve or update workflows or other automation
title: '[CI]'
labels: 'area/ci, framework/hugo'
assignees: ''
---
#### Current Behavior
<!-- A brief description of what the problem is. (e.g. I need to be able to...) -->

#### Desired Behavior
<!-- A brief description of what you expected to happen. -->

#### Implementation
<!-- Specifics on the approach to fulfilling the feature request. -->

#### Acceptance Tests
<!-- Stipulations of functional behavior or non-functional items that must be in-place in order for the issue to be closed. -->

---

#### Contributor Guide and Resources
- 📚 [Instructions for contributing to documentation](https://github.com/layer5io/docs/blob/master/CONTRIBUTING.md)
- Layer5 documentation [site](https://docs.layer5.io) and [source](https://github.com/layer5io/docs/)
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) 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)
23 changes: 23 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Description**

This PR fixes #

**Notes for Reviewers**


**[Signed commits](https://github.com/layer5io/meshery/blob/master/CONTRIBUTING.md#signing-off-on-commits-developer-certificate-of-origin)**
- [ ] Yes, I signed my commits.


<!--
Thank you for contributing to Meshery!
Contributing Conventions:
1. Include descriptive PR titles with [<component-name>] prepended.
2. Build and test your changes before submitting a PR.
3. Sign your commits
By following the community's contribution conventions upfront, the review process will
be accelerated and your PR merged more quickly.
-->
10 changes: 5 additions & 5 deletions .github/label-commenter-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ comment:
# header: "Please note the following requirement:"
footer: "\
---\n\n
> &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; Be sure to [join the community](https://slack.meshery.io), if you haven't yet and please leave a :star: [star on the project](../stargazers) :smile:
> &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; &nbsp; &#9; Be sure to [join the community](https://slack.layer5.io), if you haven't yet and please leave a :star: [star on the project](../stargazers) :smile:
"

labels:
Expand All @@ -17,19 +17,19 @@ labels:
body: Checking in... it has been awhile since we&#39;ve heard from you on this issue. Are you still working on it? Please let us know and please don&#39;t hesitate to contact a [MeshMate](https://layer5.io/community/meshmates/) or any other [community member](https://layer5.io/community/members) for assistance.
action: open
pr:
body: Checking in... it has been awhile since we&#39;ve heard from you on this issue. Are you still working on it? Please let us know and please don&#39;t hesitate to contact a [MeshMate](https://layer5.io/community/meshmates/) or any other [community member](https://layer5.io/community/members) for assistance.
body: Checking in... it has been awhile since we&#39;ve heard from you on this pull request. Are you still working on it? Please let us know and please don&#39;t hesitate to contact a [MeshMate](https://layer5.io/community/meshmates/) or any other [community member](https://layer5.io/community/members) for assistance.
action: open
- name: issue/dco
labeled:
issue:
body: "🚨 Alert! Git Police! We couldn’t help but notice that one or more of your commits is missing a sign-off. _A what?_ A commit sign-off (your email address).\n\n
To amend the commits in this PR with your signoff using the instructions provided in the DCO check. \n\n
To configure your dev environment to automatically signoff on your commits in the future, see [these instructions](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#signing-off-on-commits-developer-certificate-of-origin)."
To amend the commits in the raised PR with your signoff using the instructions provided in the DCO check. \n\n
To configure your dev environment to automatically signoff on your commits in the future, see [these instructions](https://github.com/layer5io/layer5/blob/master/CONTRIBUTING.md#signing-off-on-commits)."
action: open
pr:
body: "🚨 Alert! Git Police! We couldn’t help but notice that one or more of your commits is missing a sign-off. _A what?_ A commit sign-off (your email address).\n\n
To amend the commits in this PR with your signoff using the instructions provided in the DCO check. \n\n
To configure your dev environment to automatically signoff on your commits in the future, see [these instructions](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#signing-off-on-commits-developer-certificate-of-origin)."
To configure your dev environment to automatically signoff on your commits in the future, see [these instructions](https://github.com/layer5io/layer5/blob/master/CONTRIBUTING.md#signing-off-on-commits)."
action: open
- name: component/ui
labeled:
Expand Down
30 changes: 30 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
area/docs:
- changed-files:
- any-glob-to-any-file:
- "readme.md"
- "contributing.md"
- "docs/**/*"
area/cypress-action:
- changed-files:
- any-glob-to-any-file:
- "cypress-action/**/*"
area/node-action:
- changed-files:
- any-glob-to-any-file:
- "node-action/**/*"
area/playright-action:
- changed-files:
- any-glob-to-any-file:
- "playright-action/**/*"
area/ci:
- changed-files:
- any-glob-to-any-file:
- ".github/**/*"
playground:
- changed-files:
- any-glob-to-any-file:
- "install/playground/**/*"
opa:
- changed-files:
- any-glob-to-any-file:
- "*.rego"
28 changes: 28 additions & 0 deletions .github/workflows/label-commenter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Label Commenter

on:
issues:
types:
- labeled

pull_request_target:
types:
- labeled

permissions:
contents: read
issues: write
pull-requests: write

jobs:
comment:
runs-on: ubuntu-22.04
steps:
- name: Checkout repo 🛎️
uses: actions/checkout@master
with:
ref: master # Set your default branch
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Label Commenter
uses: peaceiris/[email protected]
14 changes: 14 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: "Pull Request Labeler"
on:
- pull_request_target

jobs:
triage:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-22.04
steps:
- uses: actions/labeler@v5
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
64 changes: 64 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# Security Policy
We are very grateful to the security researchers and users that report
back Layer5 project security vulnerabilities. We investigate every report thoroughly.

## Reporting a vulnerability
To make a report, send an email to the private
[[email protected]](mailto:[email protected])
mailing list with the vulnerability details. For normal product bugs
unrelated to latent security vulnerabilities, please head to
the appropriate repository and submit a [new issue](../../issues/new/choose).

### When to report a security vulnerability?

Send us a report whenever you:

- Think Layer5 projects have a potential security vulnerability.
- Are unsure whether or how a vulnerability affects Layer5 projects.
- Think a vulnerability is present in another project that Layer5 projects
depend on (Docker for example).

### When not to report a security vulnerability?

Don't send a vulnerability report if:

- You need help tuning Layer5 project components for security.
- You need help applying security related updates.
- Your issue is not security related.

## Evaluation

The Layer5 team acknowledges and analyzes each vulnerability report within 10 working days.

Any vulnerability information you share with the Layer5 team stays
within the Layer5 project. We don't disseminate the information to other
projects. We only share the information as needed to fix the issue.

We keep the reporter updated as the status of the security issue is addressed.

## Fixing the issue

Once a security vulnerability has been fully characterized, a fix is developed by the Layer5 team.
The development and testing for the fix happens in a private GitHub repository in order to prevent
premature disclosure of the vulnerability.

## Early disclosure

The Layer5 team maintains a mailing list for private early disclosure of security vulnerabilities.
The list is used to provide actionable information to close Layer5 partners. The list is not intended
for individuals to find out about security issues.

## Public disclosure

On the day chosen for public disclosure, a sequence of activities takes place as quickly as possible:

- Changes are merged from the private GitHub repository holding the fix into the appropriate set of public
branches.
- Layer5 team ensures all necessary binaries are promptly built and published.
- Once the binaries are available, an announcement is sent out on the following channels:
- The [Layer5 blog](https://layer5.io/blog/)
- The [Layer5 Twitter feed](https://twitter.com/layer5io)
- The #announcements channel on Slack

As much as possible this announcement will be actionable, and include any mitigating steps customers can take prior to
upgrading to a fixed version.
4 changes: 3 additions & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,5 +152,7 @@ runs:
repository: ${{github.repository}}
number: ${{ inputs.prNumber }}
id: meshmap-snapshot
message: '[<img src="${{env.RESOURCE_URL}}">](https://meshery.layer5.io/catalog/content/catalog/${{ env.APPLICATION_ID }}) _[Understanding Meshery Relationships](https://docs.layer5.io/meshmap/concepts/relationships/)_'
message: '[<img src="${{env.RESOURCE_URL}}">](${{env.RESOURCE_URL}})
[View the design on Meshery Playground](https://playground.meshery.io/extension/meshmap?mode=design&design=${{ env.APPLICATION_ID }}) ,
_[Interpreting Meshery Designs](https://meshery.layer5.io/academy/learning-paths/mastering-meshery/introduction-to-meshery?chapter=interpreting-meshery-designs)_'
append: false

0 comments on commit dd07a73

Please sign in to comment.