From afca8c961d61148eb18bba0ab2c314b12f88cb58 Mon Sep 17 00:00:00 2001 From: peng wu <2030047311@qq.com> Date: Thu, 12 Sep 2024 09:25:31 +0800 Subject: [PATCH 1/8] feat: support sync gatekeeper chart to ks extension repo --- .github/workflows/sync-helm-chart.yaml | 47 ++++++++++++++++++++++++++ Makefile | 3 ++ hack/package.sh | 24 +++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 .github/workflows/sync-helm-chart.yaml create mode 100644 Makefile create mode 100755 hack/package.sh diff --git a/.github/workflows/sync-helm-chart.yaml b/.github/workflows/sync-helm-chart.yaml new file mode 100644 index 0000000..e759ceb --- /dev/null +++ b/.github/workflows/sync-helm-chart.yaml @@ -0,0 +1,47 @@ +on: + workflow_dispatch: + push: + paths: + - 'charts/gatekeeper/**' + branches: + - 'master' + tags: + - 'v*' + +jobs: + sync-chart: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Setup SSH + uses: MrSquaare/ssh-setup-action@v2 + with: + host: github.com + private-key: ${{ secrets.SSH_PRIVATE_KEY }} + + - name: Install Helm + uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5 + with: + version: v3.13.0 + + - run: | + git config --global user.email "ci-bot@kubesphere.io" + git config --global user.name "ks-ci-bot" + git clone git@github.com:smartcat999/ks-extensions.git + rm -rf ks-extensions/gatekeeper + OUTPUT=ks-extensions/gatekeeper make package + cd ks-extensions/ + git add . + git commit -m "update ks-core helm chart" + git push origin master:sync/ks-core/${GITHUB_REF#refs/*/} --force + + - env: + GH_TOKEN: ${{ secrets.CIBOT_ACCESS_TOKEN }} + run: | + cd helm-charts/ + if [[ $(gh pr ls -H sync/ks-core/${GITHUB_REF#refs/*/} -B master) == "" ]]; then + gh pr create -H sync/ks-core/${GITHUB_REF#refs/*/} -B master --title "Update gatekeeper helm chart from ${GITHUB_REF#refs/*/}" --body "Update gatekeeper helm chart" + fi \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..6fb4674 --- /dev/null +++ b/Makefile @@ -0,0 +1,3 @@ + +package: + ./hack/package.sh \ No newline at end of file diff --git a/hack/package.sh b/hack/package.sh new file mode 100755 index 0000000..b9bccaf --- /dev/null +++ b/hack/package.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +EXT=${EXT:-gatekeeper} +INPUT=${INPUT:-charts/$EXT} +OUTPUT=${OUTPUT:-./tmp/$EXT} + +if [ ! -d "$OUTPUT" ]; then + mkdir -p "$OUTPUT" +fi + +for name in $(ls $INPUT | grep -Ev ^charts$); do + cp -R "$INPUT/$name" "$OUTPUT/$name" +done + +for chart in $(ls $INPUT | grep -E ^charts$); do + # shellcheck disable=SC2045 + for subchart in $(ls $INPUT/$chart); do + if [ ! -d "$OUTPUT/$chart" ]; then + mkdir -p "$OUTPUT/$chart" + fi + helm package "$INPUT/$chart/$subchart" -d "$OUTPUT/$chart" + done +done + From 5fbe245baf63507499d22ea68784d202f776f5a7 Mon Sep 17 00:00:00 2001 From: peng wu <2030047311@qq.com> Date: Thu, 12 Sep 2024 09:27:46 +0800 Subject: [PATCH 2/8] feat: update package.sh --- hack/package.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/package.sh b/hack/package.sh index b9bccaf..5e32dd1 100755 --- a/hack/package.sh +++ b/hack/package.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -EXT=${EXT:-gatekeeper} -INPUT=${INPUT:-charts/$EXT} -OUTPUT=${OUTPUT:-./tmp/$EXT} + +INPUT=${INPUT:-charts/gatekeeper} +OUTPUT=${OUTPUT:-./tmp/gatekeeper} if [ ! -d "$OUTPUT" ]; then mkdir -p "$OUTPUT" From af7ffd25c5aa3554efcdbd905645e226c812b616 Mon Sep 17 00:00:00 2001 From: peng wu <2030047311@qq.com> Date: Thu, 12 Sep 2024 09:32:07 +0800 Subject: [PATCH 3/8] feat: update sync-helm-chart workflow --- .github/workflows/sync-helm-chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-helm-chart.yaml b/.github/workflows/sync-helm-chart.yaml index e759ceb..6715eb4 100644 --- a/.github/workflows/sync-helm-chart.yaml +++ b/.github/workflows/sync-helm-chart.yaml @@ -41,7 +41,7 @@ jobs: - env: GH_TOKEN: ${{ secrets.CIBOT_ACCESS_TOKEN }} run: | - cd helm-charts/ + cd ks-extensions/ if [[ $(gh pr ls -H sync/ks-core/${GITHUB_REF#refs/*/} -B master) == "" ]]; then gh pr create -H sync/ks-core/${GITHUB_REF#refs/*/} -B master --title "Update gatekeeper helm chart from ${GITHUB_REF#refs/*/}" --body "Update gatekeeper helm chart" fi \ No newline at end of file From 7aae59585ff5b87312654494f5c6f2c90074a065 Mon Sep 17 00:00:00 2001 From: peng wu <2030047311@qq.com> Date: Thu, 12 Sep 2024 09:32:54 +0800 Subject: [PATCH 4/8] feat: update sync-helm-chart workflow --- .github/workflows/sync-helm-chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-helm-chart.yaml b/.github/workflows/sync-helm-chart.yaml index 6715eb4..d302720 100644 --- a/.github/workflows/sync-helm-chart.yaml +++ b/.github/workflows/sync-helm-chart.yaml @@ -30,7 +30,7 @@ jobs: - run: | git config --global user.email "ci-bot@kubesphere.io" git config --global user.name "ks-ci-bot" - git clone git@github.com:smartcat999/ks-extensions.git + git clone git@github.com:kubesphere-extensions/ks-extensions.git rm -rf ks-extensions/gatekeeper OUTPUT=ks-extensions/gatekeeper make package cd ks-extensions/ From 22529c485c1f2a4f48cda48543d09fc39b2733bf Mon Sep 17 00:00:00 2001 From: peng wu <2030047311@qq.com> Date: Thu, 12 Sep 2024 10:29:24 +0800 Subject: [PATCH 5/8] fix: commit message --- .github/workflows/sync-helm-chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-helm-chart.yaml b/.github/workflows/sync-helm-chart.yaml index d302720..e94dfe8 100644 --- a/.github/workflows/sync-helm-chart.yaml +++ b/.github/workflows/sync-helm-chart.yaml @@ -35,7 +35,7 @@ jobs: OUTPUT=ks-extensions/gatekeeper make package cd ks-extensions/ git add . - git commit -m "update ks-core helm chart" + git commit -m "update gatekeeper helm chart" git push origin master:sync/ks-core/${GITHUB_REF#refs/*/} --force - env: From 580ac6046075b641bc8216280091b135d0c9871b Mon Sep 17 00:00:00 2001 From: peng wu <2030047311@qq.com> Date: Thu, 12 Sep 2024 10:38:38 +0800 Subject: [PATCH 6/8] fix: sync branch --- .github/workflows/sync-helm-chart.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sync-helm-chart.yaml b/.github/workflows/sync-helm-chart.yaml index e94dfe8..75ecf15 100644 --- a/.github/workflows/sync-helm-chart.yaml +++ b/.github/workflows/sync-helm-chart.yaml @@ -36,12 +36,12 @@ jobs: cd ks-extensions/ git add . git commit -m "update gatekeeper helm chart" - git push origin master:sync/ks-core/${GITHUB_REF#refs/*/} --force + git push origin master:sync/gatekeeper/${GITHUB_REF#refs/*/} --force - env: GH_TOKEN: ${{ secrets.CIBOT_ACCESS_TOKEN }} run: | cd ks-extensions/ - if [[ $(gh pr ls -H sync/ks-core/${GITHUB_REF#refs/*/} -B master) == "" ]]; then - gh pr create -H sync/ks-core/${GITHUB_REF#refs/*/} -B master --title "Update gatekeeper helm chart from ${GITHUB_REF#refs/*/}" --body "Update gatekeeper helm chart" + if [[ $(gh pr ls -H sync/gatekeeper/${GITHUB_REF#refs/*/} -B master) == "" ]]; then + gh pr create -H sync/gatekeeper/${GITHUB_REF#refs/*/} -B master --title "Update gatekeeper helm chart from ${GITHUB_REF#refs/*/}" --body "Update gatekeeper helm chart" fi \ No newline at end of file From 4254a98550ef26ca7609fc0e2ee9cb7c71f194ad Mon Sep 17 00:00:00 2001 From: peng wu <2030047311@qq.com> Date: Sat, 14 Sep 2024 14:57:02 +0800 Subject: [PATCH 7/8] feat: update gatekeeper license to Apache 2.0 --- hack/package.sh | 203 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) diff --git a/hack/package.sh b/hack/package.sh index 5e32dd1..1066eff 100755 --- a/hack/package.sh +++ b/hack/package.sh @@ -22,3 +22,206 @@ for chart in $(ls $INPUT | grep -E ^charts$); do done done +cat >$OUTPUT/LICENSE< Date: Sat, 14 Sep 2024 17:29:33 +0800 Subject: [PATCH 8/8] feat: update gatekeeper license --- charts/gatekeeper/LICENSE | 201 +++++++++++++++++++++++++++++++++++++ hack/package.sh | 204 -------------------------------------- 2 files changed, 201 insertions(+), 204 deletions(-) create mode 100644 charts/gatekeeper/LICENSE diff --git a/charts/gatekeeper/LICENSE b/charts/gatekeeper/LICENSE new file mode 100644 index 0000000..f49a4e1 --- /dev/null +++ b/charts/gatekeeper/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. \ No newline at end of file diff --git a/hack/package.sh b/hack/package.sh index 1066eff..4643ecb 100755 --- a/hack/package.sh +++ b/hack/package.sh @@ -21,207 +21,3 @@ for chart in $(ls $INPUT | grep -E ^charts$); do helm package "$INPUT/$chart/$subchart" -d "$OUTPUT/$chart" done done - -cat >$OUTPUT/LICENSE<