diff --git a/.gitattributes b/.gitattributes index af3441412..605b35058 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,12 +4,16 @@ /.backportrc.json linguist-generated /.eslintrc.json linguist-generated /.gitattributes linguist-generated +/.github/ISSUE_TEMPLATE/bug.md linguist-generated +/.github/ISSUE_TEMPLATE/config.yml linguist-generated +/.github/ISSUE_TEMPLATE/feature-request.md linguist-generated /.github/pull_request_template.md linguist-generated /.github/workflows/auto-approve.yml linguist-generated /.github/workflows/backport.yml linguist-generated /.github/workflows/build.yml linguist-generated /.github/workflows/pull-request-lint.yml linguist-generated /.github/workflows/release-k8s.26.yml linguist-generated +/.github/workflows/triage.yml linguist-generated /.github/workflows/upgrade-k8s-24-main.yml linguist-generated /.github/workflows/upgrade-k8s-25-main.yml linguist-generated /.github/workflows/upgrade-k8s-26-main.yml linguist-generated @@ -21,8 +25,14 @@ /.projen/files.json linguist-generated /.projen/tasks.json linguist-generated /API.md linguist-generated +/CODE_OF_CONDUCT.md linguist-generated +/DCO linguist-generated +/git-hooks/prepare-commit-msg linguist-generated +/git-hooks/README.md linguist-generated +/git-hooks/setup.sh linguist-generated /LICENSE linguist-generated /package.json linguist-generated +/SECURITY.md linguist-generated /src/api-resource.generated.ts linguist-generated /tsconfig.dev.json linguist-generated /yarn.lock linguist-generated \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md new file mode 100644 index 000000000..6d6e28328 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -0,0 +1,50 @@ +--- +name: "\U0001F41B Bug Report" +about: Report a bug +title: '' +labels: bug, needs-triage +assignees: '' + +--- + + + +### Description of the bug: + + + + + + + +### Reproduction Steps: + + + + + + +### Error Log: + + + + + +### Environment: + + + - **Framework Version**: + - **OS**: + + +### Other: + + + + + +--- + +This is :bug: Bug Report \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..416d54d29 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,13 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". + +blank_issues_enabled: false +contact_links: + - name: Slack Community Support @ cdk.dev + url: https://cdk-dev.slack.com/archives/C0184GCBY4X + about: Please ask and answer questions here. + - name: Slack Community Support @ cncf.io + url: https://cloud-native.slack.com/archives/C02KCDACGTT + about: Please ask and answer questions here. + - name: GitHub Community Support + url: https://github.com/cdk8s-team/cdk8s-plus/discussions + about: Please ask and answer questions here. diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md new file mode 100644 index 000000000..4897c0c88 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature-request.md @@ -0,0 +1,50 @@ +--- +name: "\U0001F680 Feature Request" +about: Request a new feature +title: '' +labels: feature-request, needs-triage +assignees: '' + +--- + + + +### Description of the feature or enhancement: + + + + + + +### Use Case: + + + + + + +### Proposed Solution: + + + + + + +### Other: + + + + + + +* [ ] :wave: I may be able to implement this feature request +* [ ] :warning: This feature might incur a breaking change + +--- + +This is a :rocket: Feature Request \ No newline at end of file diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml new file mode 100644 index 000000000..facb13362 --- /dev/null +++ b/.github/workflows/triage.yml @@ -0,0 +1,18 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". + +name: triage +on: + issues: + types: + - opened +jobs: + assign-to-project: + runs-on: ubuntu-latest + permissions: + issues: write + steps: + - uses: actions/add-to-project@0.4.0 + with: + project-url: https://github.com/orgs/cdk8s-team/projects/12 + github-token: ${{ secrets.PROJEN_GITHUB_TOKEN }} + labeled: needs-triage diff --git a/.gitignore b/.gitignore index ad20e8601..5b4807570 100644 --- a/.gitignore +++ b/.gitignore @@ -53,6 +53,16 @@ junit.xml .jsii tsconfig.json !/API.md +!/CODE_OF_CONDUCT.md +!/DCO +!/git-hooks/prepare-commit-msg +!/git-hooks/README.md +!/git-hooks/setup.sh +!/.github/ISSUE_TEMPLATE/config.yml +!/.github/ISSUE_TEMPLATE/bug.md +!/.github/ISSUE_TEMPLATE/feature-request.md +!/SECURITY.md +!/.github/workflows/triage.yml .vscode/ docs/typescript.md docs/python.md diff --git a/.projen/files.json b/.projen/files.json index 96fec0701..c00e0057a 100644 --- a/.projen/files.json +++ b/.projen/files.json @@ -3,12 +3,16 @@ ".backportrc.json", ".eslintrc.json", ".gitattributes", + ".github/ISSUE_TEMPLATE/bug.md", + ".github/ISSUE_TEMPLATE/config.yml", + ".github/ISSUE_TEMPLATE/feature-request.md", ".github/pull_request_template.md", ".github/workflows/auto-approve.yml", ".github/workflows/backport.yml", ".github/workflows/build.yml", ".github/workflows/pull-request-lint.yml", ".github/workflows/release-k8s.26.yml", + ".github/workflows/triage.yml", ".github/workflows/upgrade-k8s-24-main.yml", ".github/workflows/upgrade-k8s-25-main.yml", ".github/workflows/upgrade-k8s-26-main.yml", @@ -17,7 +21,13 @@ ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", + "CODE_OF_CONDUCT.md", + "DCO", + "git-hooks/prepare-commit-msg", + "git-hooks/README.md", + "git-hooks/setup.sh", "LICENSE", + "SECURITY.md", "src/api-resource.generated.ts", "tsconfig.dev.json" ], diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 5b627cfa6..8b05b376e 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,4 +1,3 @@ -## Code of Conduct -This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct). -For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact -opensource-codeofconduct@amazon.com with any additional questions or comments. +# Code of Conduct + +The cdk8s project follows the [CNCF Community Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). \ No newline at end of file diff --git a/DCO b/DCO index 49b8cb054..d950df0c3 100644 --- a/DCO +++ b/DCO @@ -31,4 +31,4 @@ By making a contribution to this project, I certify that: are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with - this project or the open source license(s) involved. + this project or the open source license(s) involved. \ No newline at end of file diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 000000000..5bb4bf6ee --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,5 @@ +# Reporting a Vulnerability + +If you discover a potential security issue in this project we ask that you notify the cdk8s team directly via email to cncf-cdk8s-security@lists.cncf.io. + +**Please do not create a public GitHub issue.** \ No newline at end of file diff --git a/git-hooks/README.md b/git-hooks/README.md index cecddeaf7..9d5ed7392 100644 --- a/git-hooks/README.md +++ b/git-hooks/README.md @@ -6,4 +6,4 @@ This directory contains git hooks that the core team uses for various tasks. ## Setup -To setup these git hooks, run `./git-hooks/setup.sh` from the root directory of the project. \ No newline at end of file +To setup these git hooks, run `./git-hooks/setup.sh` from the root directory of the project. diff --git a/git-hooks/prepare-commit-msg b/git-hooks/prepare-commit-msg index 3ca518f39..fd7693149 100755 --- a/git-hooks/prepare-commit-msg +++ b/git-hooks/prepare-commit-msg @@ -15,4 +15,4 @@ fi git interpret-trailers --if-exists doNothing --trailer \ "Signed-off-by: $NAME <$EMAIL>" \ - --in-place "$1" \ No newline at end of file + --in-place "$1" diff --git a/git-hooks/setup.sh b/git-hooks/setup.sh index a62242a50..ec64b2ff0 100755 --- a/git-hooks/setup.sh +++ b/git-hooks/setup.sh @@ -7,4 +7,4 @@ hooksdir="$(cd $(dirname $0) && pwd)" git config core.hooksPath ${hooksdir} -echo "Configured core.hooksPath to ${hooksdir}" \ No newline at end of file +echo "Configured core.hooksPath to ${hooksdir}" diff --git a/package.json b/package.json index 54a5799a5..c497eb87f 100644 --- a/package.json +++ b/package.json @@ -47,15 +47,15 @@ "organization": false }, "devDependencies": { - "@cdk8s/projen-common": "^0.0.251", + "@cdk8s/projen-common": "^0.0.257", "@types/jest": "^27", "@types/minimatch": "^3.0.5", "@types/node": "^14", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", - "cdk8s": "2.7.6", - "cdk8s-cli": "^1.2.134", - "constructs": "10.1.256", + "cdk8s": "2.7.8", + "cdk8s-cli": "^1.2.135", + "constructs": "10.1.257", "eslint": "^8", "eslint-import-resolver-node": "^0.3.7", "eslint-import-resolver-typescript": "^2.7.1", @@ -67,7 +67,7 @@ "jsii-docgen": "^3.8.31", "jsii-pacmak": "^1.75.0", "npm-check-updates": "^16", - "projen": "^0.67.61", + "projen": "^0.67.63", "snake-case": "^3.0.4", "standard-version": "^9", "ts-jest": "^27", @@ -75,8 +75,8 @@ "typescript": "^4.9.5" }, "peerDependencies": { - "cdk8s": "^2.7.6", - "constructs": "^10.1.256" + "cdk8s": "^2.7.8", + "constructs": "^10.1.257" }, "dependencies": { "minimatch": "^3.1.2" diff --git a/yarn.lock b/yarn.lock index 45b9641e1..9967d73de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -292,10 +292,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cdk8s/projen-common@^0.0.251": - version "0.0.251" - resolved "https://registry.yarnpkg.com/@cdk8s/projen-common/-/projen-common-0.0.251.tgz#b0bddd0bbf38c3029167d05ab879e38682434fb5" - integrity sha512-Tf717bxiB385r5yuQ6dO0usR1ceebMmE81udvxQ2PwVraKkq1vGVmn6xv+QHraq0yA26P/RB8td3Mi9OB7POxw== +"@cdk8s/projen-common@^0.0.257": + version "0.0.257" + resolved "https://registry.yarnpkg.com/@cdk8s/projen-common/-/projen-common-0.0.257.tgz#6fbf2f3fcc83cdabf01786445063ef928b6adb3b" + integrity sha512-JiyvN8tg+MFP9Vfs2nnpNrqEogEMmT/9Q+IFMwWk0jLY5dJqa/IorDD2qdqPqw+zXdkKB/Wnjz42Fz2fHNymow== dependencies: codemaker "^1.75.0" @@ -1537,10 +1537,10 @@ case@^1.6.3: resolved "https://registry.yarnpkg.com/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9" integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ== -cdk8s-cli@^1.2.134: - version "1.2.134" - resolved "https://registry.yarnpkg.com/cdk8s-cli/-/cdk8s-cli-1.2.134.tgz#29f23a6e5ae43058a485e706ca4e2dd543691958" - integrity sha512-4sMNZAsKU6e7hO1g3tmORdhmRmKunNgVkRcBnx6n5zZ1t1OjjigyLmfIbrClYnTJ8vU1NXOxBg+tbd/4vpEzMg== +cdk8s-cli@^1.2.135: + version "1.2.135" + resolved "https://registry.yarnpkg.com/cdk8s-cli/-/cdk8s-cli-1.2.135.tgz#6af5787324f27f806dad3c5b5b29b4d61e5d38b3" + integrity sha512-z0tgkKz/pp2ev8KqPUJc243jM4cmHz6FXxU4Da3o3Eii153Pq6LzKQzVZg3WW6PcGx/ny9wQeupsOpmBRpfMNQ== dependencies: "@types/node" "^14" ajv "^8.12.0" @@ -1558,19 +1558,19 @@ cdk8s-cli@^1.2.134: yaml "2.0.0-11" yargs "^15" -cdk8s@2.7.6: - version "2.7.6" - resolved "https://registry.yarnpkg.com/cdk8s/-/cdk8s-2.7.6.tgz#d49983a346a452e74e7c5c9d7e0b6a63e6cb3d41" - integrity sha512-OlYkXb8wcGGm1/94SlNXCj+XoWvadVjOVSDPp1AMLe1aR+90G1PtmVjOlpFnBUCgIAYr9ylWnEXWLMUp9VBuGA== +cdk8s@2.7.8: + version "2.7.8" + resolved "https://registry.yarnpkg.com/cdk8s/-/cdk8s-2.7.8.tgz#1626590f38e4d3be0377db4d750187f596270537" + integrity sha512-bbp7+25xlRcsjSh08pPFd/p5/pM+ydVv6EsUUDDPUnET+H29G+JfCFSjp81pHxizf7ZFOiyQAIqDTx7eZHL55A== dependencies: fast-json-patch "^3.1.1" follow-redirects "^1.15.2" yaml "2.0.0-7" cdk8s@^1.9.48: - version "1.10.7" - resolved "https://registry.yarnpkg.com/cdk8s/-/cdk8s-1.10.7.tgz#7aad1d0243a324221e8ce4df4d8d7c1633125a0c" - integrity sha512-3XHiUMUxGX5tfw0nkYxwvKA6vMcZh3HW9vIthHdR3bDETFZ8Jan9X/xL14qutzu9kg2OurS85izBkJIh23snIQ== + version "1.10.9" + resolved "https://registry.yarnpkg.com/cdk8s/-/cdk8s-1.10.9.tgz#220d5fc869a053d8ff8e967654a61edaa2896190" + integrity sha512-2csFjSoZLY6LRajaNb/oxeTgo/eYjHrInh709y87z5Mv2Xu8U82hPbwrKM3/+q70uHX4AMMpf2rBmN3HXSy5og== dependencies: fast-json-patch "^3.1.1" follow-redirects "^1.15.2" @@ -1796,15 +1796,15 @@ console-control-strings@^1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== -constructs@10.1.256: - version "10.1.256" - resolved "https://registry.yarnpkg.com/constructs/-/constructs-10.1.256.tgz#c2e1b1bc93e1b06e885a6b097c78b311242b4792" - integrity sha512-R9mPHqGo+Y2mkaBeQc2+fTC3SZgr8a39tpy3hXT70yvpbxSrTcqPqukksm7ZltDDr2osLjv5Xwt5x/SqjHtATw== +constructs@10.1.257: + version "10.1.257" + resolved "https://registry.yarnpkg.com/constructs/-/constructs-10.1.257.tgz#15accb0f865f4de2023ed0a857b9b7a6580602ad" + integrity sha512-Wyg17gM+YE/2TsuPMmS+QyWVZ39fTW77AD+87kSs3M94A+0hIrakPH58kif3Q0FlAVyoUDCZIy/qtTBh2AC+jA== constructs@^3.4.244: - version "3.4.251" - resolved "https://registry.yarnpkg.com/constructs/-/constructs-3.4.251.tgz#943f3fd23de966636d5f6fc7439c438059552b6b" - integrity sha512-OcNfX1ozwC83W+VVYqDpsanhgpj7skMvUKGCLO6PLTrUsLQ+lLujdNjnhU5uH8VBanfLkbYywbgOYAFfaF0Y7g== + version "3.4.252" + resolved "https://registry.yarnpkg.com/constructs/-/constructs-3.4.252.tgz#dc47c5ba8c85563fd7b60f3ffd7063fbefb499df" + integrity sha512-Dc3cFjLjdM0EqfBiCEm3llgWfum5a2HvCx0FFWj87xz+Q9PgD0e8Ac/LfBOKiufKzpvi0jr0IK3fvfNozFMR9A== conventional-changelog-angular@^5.0.12: version "5.0.13" @@ -2227,9 +2227,9 @@ eastasianwidth@^0.2.0: integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== electron-to-chromium@^1.4.284: - version "1.4.303" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.303.tgz#6c598653c52b2554f768d98374803236b8f022a8" - integrity sha512-XaqiQhVsGO5ymf/Lg6XEGpv2h8b5AFqQDQ9fQckolNP2VtD2VL1pn1TIx1SSYsf0srfXVi2Sm7n/K3slJSX3ig== + version "1.4.305" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.305.tgz#e4dfe3e06ab783f33171f9bde9e8ed092510fcd0" + integrity sha512-WETy6tG0CT5gm1O+xCbyapWNsCcmIvrn4NHViIGYo2AT8FV2qUCXdaB+WqYxSv/vS5mFqhBYnfZAAkVArjBmUg== emittery@^0.8.1: version "0.8.1" @@ -4104,9 +4104,9 @@ jsii-rosetta@^1.44.0, jsii-rosetta@^1.75.0: yargs "^16.2.0" jsii-srcmak@^0.1.823: - version "0.1.831" - resolved "https://registry.yarnpkg.com/jsii-srcmak/-/jsii-srcmak-0.1.831.tgz#0616a47fbfe3b9a9e056aacc2ec007ac4a4970c2" - integrity sha512-pqS7jYFxzX2hRJAJKF525Ve3aEN4WcmupIKRR/CGvOTTUHfELnUlLiGYDT03bCznA71rNA3x41wR3VGeY9Rl0A== + version "0.1.832" + resolved "https://registry.yarnpkg.com/jsii-srcmak/-/jsii-srcmak-0.1.832.tgz#726a32a6439dbb97a91b813f8b677427fbee0bac" + integrity sha512-dk1HLtxQlLL8Z0O6riWpW6FXHqBF38Mw0zkL7KNgpMPu7koabBIvA7ePajvkIaWBI/tFNqsKSNx8dxnYyJeIqQ== dependencies: fs-extra "^9.1.0" jsii "^1.75.0" @@ -4186,9 +4186,9 @@ json-stringify-safe@^5.0.1: integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== json2jsii@^0.3.274: - version "0.3.282" - resolved "https://registry.yarnpkg.com/json2jsii/-/json2jsii-0.3.282.tgz#6b62bac56c7c38a245439665fe6a287e8d08448c" - integrity sha512-b25HQKepsdYUykJZL+VlWCpdesTCPJiXPcBrquJBoA6XrqXxREQqlTrOunbg0JzSNU7l4nYjkvdGNUhFaeAM2Q== + version "0.3.283" + resolved "https://registry.yarnpkg.com/json2jsii/-/json2jsii-0.3.283.tgz#3313326b37e403896b306956e57ced92c4a43c72" + integrity sha512-zSXjz6tLGRev/e+Va2juoP1jkmsA7C5FrJdfzPoWYXjMmwJOdn6Fvd9Mhs6Uydb5W2q/KgMBgtgaLZ/NsevxqA== dependencies: camelcase "^6.3.0" json-schema "^0.4.0" @@ -4390,9 +4390,9 @@ lru-cache@^6.0.0: yallist "^4.0.0" lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1: - version "7.16.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.16.1.tgz#7acea16fecd9ed11430e78443c2bb81a06d3dea9" - integrity sha512-9kkuMZHnLH/8qXARvYSjNvq8S1GYFFzynQTAfKeaJ0sIrR3PUPuu37Z+EiIANiZBvpfTf2B5y8ecDLSMWlLv+w== + version "7.17.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.17.0.tgz#00c7ba5919e5ea7c69ff94ddabbf32cb09ab805c" + integrity sha512-zSxlVVwOabhVyTi6E8gYv2cr6bXK+8ifYz5/uyJb9feXX6NACVDwY4p5Ut3WC3Ivo/QhpARHU3iujx2xGAYHbQ== make-dir@^3.0.0: version "3.1.0" @@ -5209,10 +5209,10 @@ progress@^2.0.3: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -projen@^0.67.61: - version "0.67.61" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.67.61.tgz#6501060ebdfc02a0fde81b8294b7bace05b7407d" - integrity sha512-nQAuEgglIHqPFdb+/z8simqS2vPIsc7qMbj6UkxCmkM5676R0tmi8jyVk6V8fWIzzZc1aacjrU2lUf9I/9eS0A== +projen@^0.67.63: + version "0.67.63" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.67.63.tgz#e370f0aa266517628a4e7a360b6df69449f489f7" + integrity sha512-F2LMqcIXvvW7xscMjfqaLUSXOBRCn8vweU1P7+6yfniNdCNsRf2etdRL3nBUuxZ/j7XUwRmy54kv/YCjlNr3Zg== dependencies: "@iarna/toml" "^2.2.5" case "^1.6.3"