From 4b9fe6a9d933d879c16cc7f81b97ff8cd264bd05 Mon Sep 17 00:00:00 2001 From: Aliaksandr Panasiuk Date: Wed, 5 Jun 2024 13:23:06 +0200 Subject: [PATCH 1/6] #4 - prepare repository to open-source --- README.md | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index ef0b06f..a89a925 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,48 @@ # k3d.provisioner.infra -This repository provides K3D config file. + +This repository provides [K3D](https://k3d.io) config file. Mainly it is designed to be managed by administrators, DevOps engineers, SREs. ## Contents + * [Requirements](#requirements) -* [Git flow strategy](#git-flow-strategy) +* [Git workflow](#git-workflow) * [Additional information](#additional-information) * [Development](#development) -## Requirements: -K3D = version is specified in the project file of each tenant of the repository in section `tools`. +## Requirements + +`K3D` = version is specified in the [project.yaml](https://github.com/edenlabllc/rmk/blob/develop/docs/configuration/project-management/preparation-of-project-repository.md#projectyaml) file +of each project of the repository in the `tools` section. + +## Git workflow + +This repository uses the classic [GitFlow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) workflow, +embracing all its advantages and disadvantages. -## Git flow strategy -This repository uses the [GitFlow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) approach. -#### Stable branches: develop, master -Each merge in the master branch adds a new SemVer2 tag and a GitHub release is created. +**Stable branches:** develop, master + +Each merge in the master branch adds a new [SemVer2](https://semver.org/) tag and a GitHub release is created. ## Additional information -* This configuration of K3D manifest can only be launched from the tenant repository via the RMK, + +This configuration of K3D manifest can only be launched from the project repository via [RMK](https://github.com/edenlabllc/rmk), because the entire input set of variables is formed by the RMK at the moment the commands are launched: `rmk cluster k3d`. -RMK also keeps track of which version of the release of K3D config file the tenant repository will use. +RMK also keeps track of which version of the release of K3D config file the project repository will use. The version of config file artifact is described in the project file of each -tenant repository in the section `inventory.clusters`. +project repository in the section: + +```yaml +inventory: + clusters: + k3d.provisioner.infra: + version: + url: git::https://github.com/edenlabllc/{{.Name}}.git?ref={{.Version}} +``` ## Development -For development, you need to use one of the tenant repositories and change the code + +For development, you need to use one of the project's repositories and change the code in the directory `.PROJECT/clusters/k3d.provisioner.infra-/k3d.yaml`. After developing and refactoring code, copy change files to this repository in feature branch and create Pull Request. From 5efc5c8c02642e9f5638f836a9e519540db6b630 Mon Sep 17 00:00:00 2001 From: Aliaksandr Panasiuk Date: Wed, 5 Jun 2024 13:25:58 +0200 Subject: [PATCH 2/6] #4 - add LICENSE file and badges --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 4 ++ 2 files changed, 205 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + 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. diff --git a/README.md b/README.md index a89a925..6c82c99 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # k3d.provisioner.infra +[![Release](https://img.shields.io/github/v/release/edenlabllc/k3d.provisioner.infra.svg?style=for-the-badge)](https://github.com/edenlabllc/aws.provisioner.infra/releases/latest) +[![Software License](https://img.shields.io/github/license/edenlabllc/k3d.provisioner.infra.svg?style=for-the-badge)](LICENSE) +[![Powered By: Edenlab](https://img.shields.io/badge/powered%20by-edenlab-8A2BE2.svg?style=for-the-badge)](https://edenlab.io) + This repository provides [K3D](https://k3d.io) config file. Mainly it is designed to be managed by administrators, DevOps engineers, SREs. From cbe55123e069f896b62cfe27f38eaf266b2d27e8 Mon Sep 17 00:00:00 2001 From: Aliaksandr Panasiuk Date: Wed, 5 Jun 2024 13:27:48 +0200 Subject: [PATCH 3/6] #4 - refactoring README.md file --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c82c99..1779d67 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Each merge in the master branch adds a new [SemVer2](https://semver.org/) tag an ## Additional information This configuration of K3D manifest can only be launched from the project repository via [RMK](https://github.com/edenlabllc/rmk), -because the entire input set of variables is formed by the RMK at the moment +because the entire input set of variables is formed by RMK at the moment the commands are launched: `rmk cluster k3d`. RMK also keeps track of which version of the release of K3D config file the project repository will use. The version of config file artifact is described in the project file of each From f961a384940eb7255e28f58879e5772b0e16d25c Mon Sep 17 00:00:00 2001 From: Aliaksandr Panasiuk Date: Wed, 5 Jun 2024 13:30:59 +0200 Subject: [PATCH 4/6] #4 - refactoring README.md file --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1779d67..2130343 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ This configuration of K3D manifest can only be launched from the project reposit because the entire input set of variables is formed by RMK at the moment the commands are launched: `rmk cluster k3d`. RMK also keeps track of which version of the release of K3D config file the project repository will use. -The version of config file artifact is described in the project file of each +The version of config file artifact is described in the [project.yaml](https://github.com/edenlabllc/rmk/blob/develop/docs/configuration/project-management/preparation-of-project-repository.md#projectyaml) file of each project repository in the section: ```yaml From 25e7fb0773b9370f7e6a582423950f2794d9f521 Mon Sep 17 00:00:00 2001 From: Aliaksandr Panasiuk Date: Wed, 5 Jun 2024 14:40:20 +0200 Subject: [PATCH 5/6] #4 - refactoring README.md file --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2130343..04d4de0 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Software License](https://img.shields.io/github/license/edenlabllc/k3d.provisioner.infra.svg?style=for-the-badge)](LICENSE) [![Powered By: Edenlab](https://img.shields.io/badge/powered%20by-edenlab-8A2BE2.svg?style=for-the-badge)](https://edenlab.io) -This repository provides [K3D](https://k3d.io) config file. +This repository provides a [K3D](https://k3d.io) config file. Mainly it is designed to be managed by administrators, DevOps engineers, SREs. ## Contents @@ -16,7 +16,7 @@ Mainly it is designed to be managed by administrators, DevOps engineers, SREs. ## Requirements -`K3D` = version is specified in the [project.yaml](https://github.com/edenlabllc/rmk/blob/develop/docs/configuration/project-management/preparation-of-project-repository.md#projectyaml) file +`k3d` = version is specified in the [project.yaml](https://github.com/edenlabllc/rmk/blob/develop/docs/configuration/project-management/preparation-of-project-repository.md#projectyaml) file of each project of the repository in the `tools` section. ## Git workflow From 03bc70a13bd911714c87962b190546a4c3bf9adf Mon Sep 17 00:00:00 2001 From: Aliaksandr Panasiuk Date: Wed, 5 Jun 2024 14:44:23 +0200 Subject: [PATCH 6/6] #4 - refactoring Development articles README.md file --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 04d4de0..ff4cedf 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,6 @@ inventory: ## Development -For development, you need to use one of the project's repositories and change the code -in the directory `.PROJECT/clusters/k3d.provisioner.infra-/k3d.yaml`. -After developing and refactoring code, copy change files to this repository in feature branch and create Pull Request. +For development, navigate to the local `.PROJECT/clusters/k3d.provisioner.infra-/k3d.yaml` directory of a project repository, +then perform the changes directly in the files and test them. +Finally, copy the changed files to a new feature branch of this repository and create a pull request (PR).