Skip to content

Commit ecececd

Browse files
authored
Update documentation according to internal requirements (#445)
1 parent 189982e commit ecececd

File tree

4 files changed

+102
-28
lines changed

4 files changed

+102
-28
lines changed

CONTRIBUTING.md

Lines changed: 58 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,70 @@
1-
# Contributing to the OCI Cloud Controller Manager
1+
# Contributing to this repository
22

3-
*Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.*
3+
We welcome your contributions! There are multiple ways to contribute.
44

5-
## Guidelines to raise a PR
5+
## Opening issues
66

7-
### Contributor Agreement
7+
For bugs or enhancement requests, please file a GitHub issue unless it's
8+
security related. When filing a bug remember that the better written the bug is,
9+
the more likely it is to be fixed. If you think you've found a security
10+
vulnerability, do not raise a GitHub issue and follow the instructions in our
11+
[security policy](./SECURITY.md).
812

9-
Pull requests can be made under
10-
[The Oracle Contributor Agreement](https://www.oracle.com/technetwork/community/oca-486395.html)
11-
(OCA).
12-
For pull requests to be accepted, the bottom of
13-
your commit message must have the following line using your name and
14-
e-mail address as it appears in the OCA Signatories list.
15-
```
13+
## Contributing code
14+
15+
We welcome your code contributions. Before submitting code via a pull request,
16+
you will need to have signed the [Oracle Contributor Agreement][OCA] (OCA) and
17+
your commits need to include the following line using the name and e-mail
18+
address you used to sign the OCA:
19+
20+
```text
1621
Signed-off-by: Your Name <you@example.org>
1722
```
18-
This can be automatically added to pull requests by committing with:
19-
```
23+
24+
This can be automatically added to pull requests by committing with `--sign-off`
25+
or `-s`, e.g.
26+
27+
```text
2028
git commit --signoff
2129
```
22-
**Only pull requests from committers that can be verified as having
23-
signed the OCA can be accepted.**
30+
31+
Only pull requests from committers that can be verified as having signed the OCA
32+
can be accepted.
33+
34+
## Pull request process
35+
36+
1. Ensure there is an issue created to track and discuss the fix or enhancement
37+
you intend to submit.
38+
1. Fork this repository.
39+
1. Create a branch in your fork to implement the changes. We recommend using
40+
the issue number as part of your branch name, e.g. `1234-fixes`.
41+
1. Ensure that any documentation is updated with the changes that are required
42+
by your change.
43+
1. Ensure that any samples are updated if the base image has been changed.
44+
1. Submit the pull request. *Do not leave the pull request blank*. Explain exactly
45+
what your changes are meant to do and provide simple steps on how to validate.
46+
your changes. Ensure that you reference the issue you created as well.
47+
1. We will assign the pull request to 2-3 people for review before it is merged.
2448

2549
### Commit Message
26-
* The commits message should prefix "External-ccm:"
27-
* All commits should be squashed to a single commit before merging
2850

29-
### Best Practices
51+
* The commits message should prefix "External-ccm:".
52+
* All commits should be squashed to a single commit before merging.
53+
54+
### Best Practices:
55+
3056
* Follow the development guidelines [here](docs/development.md)
31-
* govet, golint, gofmt should pass on the PR
32-
* make targets "build" and "test" should be successful on the PR
33-
* E2E should be run on a self managed test cluster, you will have to create a test cluster with the image generated from your changes. Please follow E2E guide [here](test/e2e/cloud-provider-oci/README.md)
34-
* E2E tests should pass on 3 versions of kubernetes currently supported by the repo
57+
* `govet`, `golint`, `gofmt` should pass on the PR
58+
* Make targets "build" and "test" should be successful on the PR
59+
* E2E should be run on a self managed test cluster, you will have to create a test
60+
cluster with the image generated from your changes.
61+
Please follow E2E guide [here](test/e2e/cloud-provider-oci/README.md)
62+
* E2E tests should pass on 3 versions of kubernetes currently supported by the repo.
63+
64+
## Code of conduct
65+
66+
Follow the [Golden Rule](https://en.wikipedia.org/wiki/Golden_Rule). If you'd
67+
like more specific guidelines, see the [Contributor Covenant Code of Conduct][COC].
68+
69+
[OCA]: https://oca.opensource.oracle.com
70+
[COC]: https://www.contributor-covenant.org/version/1/4/code-of-conduct/

LICENSE renamed to LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,4 +199,4 @@
199199
distributed under the License is distributed on an "AS IS" BASIS,
200200
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201201
See the License for the specific language governing permissions and
202-
limitations under the License.
202+
limitations under the License.

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ If you think you've found a bug, please [raise an issue][3].
164164

165165
## Contributing
166166

167-
`oci-cloud-controller-manager` is an open source project. See [CONTRIBUTING](CONTRIBUTING.md) for
168-
details.
167+
This project welcomes contributions from the community. Before submitting a pull request, please [review our contribution guide](./CONTRIBUTING.md)
169168

170-
Oracle gratefully acknowledges the contributions to this project that have been made
171-
by the community.
169+
## Security
170+
171+
Please consult the [security guide](./SECURITY.md) for our responsible security vulnerability disclosure process
172172

173173
## Upcoming Releases
174174

@@ -178,7 +178,7 @@ by the community.
178178

179179
## License
180180

181-
Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
181+
Copyright (c) 2017, 2023 Oracle and/or its affiliates. All rights reserved.
182182

183183
`oci-cloud-controller-manager` is licensed under the Apache License 2.0.
184184

SECURITY.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Reporting security vulnerabilities
2+
3+
Oracle values the independent security research community and believes that
4+
responsible disclosure of security vulnerabilities helps us ensure the security
5+
and privacy of all our users.
6+
7+
Please do NOT raise a GitHub Issue to report a security vulnerability. If you
8+
believe you have found a security vulnerability, please submit a report to
9+
[secalert_us@oracle.com][1] preferably with a proof of concept. Please review
10+
some additional information on [how to report security vulnerabilities to Oracle][2].
11+
We encourage people who contact Oracle Security to use email encryption using
12+
[our encryption key][3].
13+
14+
We ask that you do not use other channels or contact the project maintainers
15+
directly.
16+
17+
Non-vulnerability related security issues including ideas for new or improved
18+
security features are welcome on GitHub Issues.
19+
20+
## Security updates, alerts and bulletins
21+
22+
Security updates will be released on a regular cadence. Many of our projects
23+
will typically release security fixes in conjunction with the
24+
Oracle Critical Patch Update program. Additional
25+
information, including past advisories, is available on our [security alerts][4]
26+
page.
27+
28+
## Security-related information
29+
30+
We will provide security related information such as a threat model, considerations
31+
for secure use, or any known security issues in our documentation. Please note
32+
that labs and sample code are intended to demonstrate a concept and may not be
33+
sufficiently hardened for production use.
34+
35+
[1]: mailto:secalert_us@oracle.com
36+
[2]: https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html
37+
[3]: https://www.oracle.com/security-alerts/encryptionkey.html
38+
[4]: https://www.oracle.com/security-alerts/

0 commit comments

Comments
 (0)