Skip to content

Commit 81fd465

Browse files
authored
Merge pull request #5782 from emissary-ingress/flynn/v4-sync
Sync #5777 from master
2 parents d541135 + ff0fd67 commit 81fd465

File tree

7 files changed

+938
-6
lines changed

7 files changed

+938
-6
lines changed

DevDocumentation/DEVELOPING.md renamed to .github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ curl localhost:8877/ambassador/v0/diag/?loglevel=debug
811811
```
812812

813813
Note: This affects diagd and Envoy, but NOT the AES `amb-sidecar`.
814-
See the AES `DEVELOPING.md` for how to do that.
814+
See the AES `CONTRIBUTING.md` for how to do that.
815815

816816
### Can I build from a docker container instead of on my local computer?
817817

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ A few sentences describing what testing you've done, e.g., manual tests, automat
4646
- We should lean on the bulk of code being covered by unit tests, but...
4747
- ... an end-to-end test should cover the integration points
4848

49-
- [ ] **I updated `DEVELOPING.md` with any any special dev tricks I had to use to work on this code efficiently.**
49+
- [ ] **I updated `CONTRIBUTING.md` with any special dev tricks I had to use to work on this code efficiently.**
5050

5151
- [ ] **The changes in this PR have been reviewed for security concerns and adherence to security best practices.**

Community/MEETING_SCHEDULE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
The Emissary-ingress Contributors Meeting is held on the first Wednesday of every month at 3:30pm Eastern. The focus of this meeting is discussion of technical issues related to development of Emissary-ingress.
66

7-
New contributors are always welcome! Check out our [contributor's guide](../DevDocumentation/DEVELOPING.md) to learn how you can help make Emissary-ingress better.
7+
New contributors are always welcome! Check out our [contributor's guide](../DevDocumentation/CONTRIBUTING.md) to learn how you can help make Emissary-ingress better.
88

99
**Zoom Meeting Link**: [https://ambassadorlabs.zoom.us/j/86139262248?pwd=bzZlcU96WjAxN2E1RFZFZXJXZ1FwQT09](https://ambassadorlabs.zoom.us/j/86139262248?pwd=bzZlcU96WjAxN2E1RFZFZXJXZ1FwQT09)
1010
- Meeting ID: 861 3926 2248

DevDocumentation/BUILDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Building Ambassador
22
===================
33

4-
The content in this document has been moved to [DEVELOPING.md].
4+
The content in this document has been moved to [CONTRIBUTING.md].

DevDocumentation/CONTRIBUTING.md

Lines changed: 929 additions & 0 deletions
Large diffs are not rendered by default.

DevDocumentation/SECURITY_RELEASE_PROCESS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ These steps should be completed within the 1-7 days of Disclosure.
111111
[CVSS](https://www.first.org/cvss/specification-document) using the [CVSS
112112
Calculator](https://www.first.org/cvss/calculator/3.0). The Fix Lead makes the final call on the
113113
calculated CVSS; it is better to move quickly than to spend time making the CVSS perfect.
114-
- The Fix Team will work per the usual [Emissary Development Process](DEVELOPING.md), including
114+
- The Fix Team will work per the usual [Emissary Development Process](CONTRIBUTING.md), including
115115
fix branches, PRs, reviews, etc.
116116
- The Fix Team will notify the Fix Lead that work on the fix branch is complete once the fix is
117117
present in the relevant release branch(es) in the private security repo.

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Emissary-ingress
66
[![Docker Repository][badge-docker-img]][badge-docker-link]
77
[![Join Slack][badge-slack-img]][badge-slack-link]
88
[![Core Infrastructure Initiative: Best Practices][badge-cii-img]][badge-cii-link]
9+
[![Artifact HUB][badge-artifacthub-img]][badge-artifacthub-link]
910

1011
[badge-version-img]: https://img.shields.io/docker/v/emissaryingress/emissary?sort=semver
1112
[badge-version-link]: https://github.com/emissary-ingress/emissary/releases
@@ -15,6 +16,8 @@ Emissary-ingress
1516
[badge-slack-link]: https://communityinviter.com/apps/cloud-native/cncf
1617
[badge-cii-img]: https://bestpractices.coreinfrastructure.org/projects/1852/badge
1718
[badge-cii-link]: https://bestpractices.coreinfrastructure.org/projects/1852
19+
[badge-artifacthub-img]: https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/emissary-ingress
20+
[badge-artifacthub-link]: https://artifacthub.io/packages/helm/datawire/emissary-ingress
1821

1922
<!-- Links are (mostly) at the end of this document, for legibility. -->
2023

@@ -87,7 +90,7 @@ The best way to join the community is to join the [CNCF Slack](https://community
8790

8891
Check out the [`DevDocumentation/`](DevDocumentation/) directory for
8992
information on the technicals of Emissary, most notably the
90-
[`DEVELOPING.md`](DevDocumentation/DEVELOPING.md) contributor's guide.
93+
[`CONTRIBUTING.md`](DevDocumentation/CONTRIBUTING.md) contributor's guide.
9194

9295
If you're interested in contributing, here are some ways:
9396
* Write a blog post for [our blog](https://blog.getambassador.io)

0 commit comments

Comments
 (0)