From 990a8649371f4679f608a2f4e92a7f1da3460b03 Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Fri, 13 Jan 2023 00:04:29 +0100 Subject: [PATCH 1/2] Update license --- LICENSE | 256 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 201 insertions(+), 55 deletions(-) diff --git a/LICENSE b/LICENSE index a67fc6b..261eeb9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,55 +1,201 @@ -### Carvel ### -carvel-artifacts/ -repo/ - -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, built with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - -# Dependency directories (remove the comment below to include it) -# vendor/ - -### VS Code ### -.vscode/ - -############# -### macOS ### -############# - -# General -.DS_Store -*.DS_Store -**/.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From 30721de9c00bdf8e04b1f980a76e4d7b5399f65a Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Fri, 13 Jan 2023 00:04:38 +0100 Subject: [PATCH 2/2] Update for Kadras organization --- .github/workflows/release.yml | 4 ++-- .github/workflows/test.yml | 4 ++-- CODE_OF_CONDUCT.md | 2 +- README.md | 14 +++++++------- package/package-build.yml | 2 +- package/package-resources.yml | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a59fb7b..8cf2922 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,13 +11,13 @@ jobs: contents: write id-token: write packages: write - uses: arktonix/cloud-native-utils/.github/workflows/package-release.yml@main + uses: kadras-io/github-reusable-workflows/.github/workflows/package-release.yml@main with: package-name-slug: metrics-server package-name-display: Metrics Server registry-server: ghcr.io registry-username: ${{ github.actor }} image: ${{ github.repository }} - version: 0.6.2 + version: 0.6.2+kadras.1 secrets: pull-request-token: ${{ secrets.GH_ORG_PAT }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bf22bb2..3e3c1a1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: name: Configuration Tests permissions: contents: read - uses: arktonix/cloud-native-utils/.github/workflows/package-test-config.yml@main + uses: kadras-io/github-reusable-workflows/.github/workflows/package-test-config.yml@main with: command: make test-config @@ -16,6 +16,6 @@ jobs: name: Integration Tests permissions: contents: read - uses: arktonix/cloud-native-utils/.github/workflows/package-test-integration.yml@main + uses: kadras-io/github-reusable-workflows/.github/workflows/package-test-integration.yml@main with: command: make test-integration diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 39afb14..d65f99f 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -60,7 +60,7 @@ representative at an online or offline event. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at -community@arktonix.com. +community@kadras.io. All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the diff --git a/README.md b/README.md index b58c301..dfd7005 100644 --- a/README.md +++ b/README.md @@ -17,12 +17,12 @@ This project provides a [Carvel package](https://carvel.dev/kapp-controller/docs ## Installation -First, add the [Kadras package repository](https://github.com/arktonix/kadras-packages) to your Kubernetes cluster. +First, add the [Kadras package repository](https://github.com/kadras-io/kadras-packages) to your Kubernetes cluster. ```shell kubectl create namespace kadras-packages kctrl package repository add -r kadras-repo \ - --url ghcr.io/arktonix/kadras-packages \ + --url ghcr.io/kadras-io/kadras-packages \ -n kadras-packages ``` @@ -31,7 +31,7 @@ Then, install the Metrics Server package. ```shell kctrl package install -i metrics-server \ -p metrics-server.packages.kadras.io \ - -v 0.6.2 \ + -v 0.6.2+kadras.1 \ -n kadras-packages ``` @@ -78,7 +78,7 @@ Then, reference it from the `kctrl` command when installing or upgrading the pac ```shell kctrl package install -i metrics-server \ -p metrics-server.packages.kadras.io \ - -v 0.6.2 \ + -v 0.6.2+kadras.1 \ -n kadras-packages \ --values-file values.yml ``` @@ -103,13 +103,13 @@ You can also update an existing package with a newer `values.yml` file. ## Other -The recommended way of installing the Metrics Server package is via the [Kadras package repository](https://github.com/arktonix/kadras-packages). If you prefer not using the repository, you can install the package by creating the necessary Carvel `PackageMetadata` and `Package` resources directly using [`kapp`](https://carvel.dev/kapp/docs/latest/install) or `kubectl`. +The recommended way of installing the Metrics Server package is via the [Kadras package repository](https://github.com/kadras-io/kadras-packages). If you prefer not using the repository, you can install the package by creating the necessary Carvel `PackageMetadata` and `Package` resources directly using [`kapp`](https://carvel.dev/kapp/docs/latest/install) or `kubectl`. ```shell kubectl create namespace kadras-packages kapp deploy -a metrics-server-package -n kadras-packages -y \ - -f https://github.com/arktonix/package-for-metrics-server/releases/latest/download/metadata.yml \ - -f https://github.com/arktonix/package-for-metrics-server/releases/latest/download/package.yml + -f https://github.com/kadras-io/package-for-metrics-server/releases/latest/download/metadata.yml \ + -f https://github.com/kadras-io/package-for-metrics-server/releases/latest/download/package.yml ``` ## Support and Documentation diff --git a/package/package-build.yml b/package/package-build.yml index 548964c..1894834 100644 --- a/package/package-build.yml +++ b/package/package-build.yml @@ -19,7 +19,7 @@ spec: - kbld: {} export: - imgpkgBundle: - image: ghcr.io/arktonix/package-for-metrics-server + image: ghcr.io/kadras-io/package-for-metrics-server useKbldImagesLock: true includePaths: - config diff --git a/package/package-resources.yml b/package/package-resources.yml index d66d3ba..7ace888 100755 --- a/package/package-resources.yml +++ b/package/package-resources.yml @@ -160,7 +160,7 @@ spec: resource metrics for Kubernetes built-in autoscaling pipelines. maintainers: - name: Thomas Vitale - providerName: Arktonix + providerName: Kadras shortDescription: Scalable and efficient source of container resource metrics for Kubernetes built-in autoscaling pipelines.