From 3518a1599e1935a73e59af3c0a35a0140b23b669 Mon Sep 17 00:00:00 2001
From: Jan Larwig <jan@larwig.com>
Date: Wed, 8 Oct 2025 21:48:25 +0200
Subject: [PATCH 1/2] doc: cncf onboarding of oauth2-proxy

Added sections for Code of Conduct, License, and Trademarks in README.

Signed-off-by: Jan Larwig <jan@larwig.com>
---
 README.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/README.md b/README.md
index d25ff22..e84d65d 100644
--- a/README.md
+++ b/README.md
@@ -39,3 +39,23 @@ Note:
 We utilize cosign to sign and verify artifacts with the KEYLESS mode. To learn
 more about how keyless signing is done, visit the official documentation about 
 [Keyless Signatures](https://docs.sigstore.dev/cosign/signing/overview/#the-signing-witnessing-and-verifying-process).
+
+
+## Code of Conduct
+Participation in the OAuth2-Proxy project is governed by the [CNCF Code of Conduct](https://github.com/oauth2-proxy/oauth2-proxy/tree/master/CODE_OF_CONDUCT.md).
+
+## License
+
+OAuth2-Proxy is distributed under [The MIT License](https://github.com/oauth2-proxy/oauth2-proxy/tree/master/LICENSE).
+
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Foauth2-proxy%2Foauth2-proxy.svg?type=large&issueType=license)](https://app.fossa.com/projects/git%2Bgithub.com%2Foauth2-proxy%2Foauth2-proxy?ref=badge_large&issueType=license)
+
+The OAuth2-Proxy helm chart is distributed under [Apache License 2.0](https://github.com/oauth2-proxy/manifests/tree/main/LICENSE).
+
+## Trademarks
+
+OAuth2-Proxy is a [Cloud Native Computing Foundation](https://cncf.io) Sandbox project.
+
+![CNCF](https://www.cncf.io/wp-content/uploads/2023/04/cncf-main-site-logo.svg)
+
+The Linux Foundation® (TLF) has registered trademarks and uses trademarks. For a list of TLF trademarks, see [Trademark Usage](https://www.linuxfoundation.org/legal/trademark-usage).

From aad6e4cd02119f28cd8b80d7a718b3b60473c379 Mon Sep 17 00:00:00 2001
From: Jan Larwig <jan@larwig.com>
Date: Wed, 8 Oct 2025 21:56:10 +0200
Subject: [PATCH 2/2] doc: add pull request template

Signed-off-by: Jan Larwig <jan@larwig.com>
---
 .github/PULL_REQUEST_TEMPLATE.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..3d1d54c
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,15 @@
+<!--- Provide a general summary of your changes in the Title above -->
+## Description
+
+<!--- Describe your changes in detail -->
+
+## Checklist:
+
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+
+- [ ] I have bumped the version in the Chart.yaml according to [Semantic Versioning](https://semver.org).
+- [ ] I have updated the documentation/CHANGELOG at the bottom of the Chart.yaml
+- [ ] I have [signed off](https://github.com/apps/dco) all my commits.
+- [ ] (Optional) I have updated the Chart.lock for dependency updates
+- [ ] (Optional) I have implemented helm tests for new feature flags