Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/add app charts #34

Merged
merged 49 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
ad9a2a1
major clean up
sandstromviktor Mar 13, 2024
6b0a2ba
remove charts folder
sandstromviktor Mar 13, 2024
e37f580
update readme with dependency update
sandstromviktor Mar 13, 2024
742717e
added apps
sandstromviktor Mar 13, 2024
ae25278
updated custom app with tests and full values file
sandstromviktor Mar 14, 2024
ea72550
refactored charts
sandstromviktor Mar 14, 2024
e5e05d0
update charts with tests
sandstromviktor Mar 14, 2024
d42e40e
added test and default image to dash chart
sandstromviktor Mar 14, 2024
87b249e
testing release
sandstromviktor Mar 14, 2024
dda0eef
update workflow test
sandstromviktor Mar 14, 2024
3507d69
renamed folder to charts
sandstromviktor Mar 14, 2024
e614fa4
update
sandstromviktor Mar 14, 2024
73f7e78
adding fetch depth
sandstromviktor Mar 14, 2024
190ae8d
renamed to apps and change chart names
sandstromviktor Mar 14, 2024
500e261
add charts_dir arg
sandstromviktor Mar 14, 2024
8bd7bd6
add git config to wf
sandstromviktor Mar 14, 2024
c696d11
update
sandstromviktor Mar 14, 2024
452948e
update charts with correct structure
sandstromviktor Mar 14, 2024
3192af1
fixed chart names
sandstromviktor Mar 14, 2024
5e062fb
fixed chart files and workflow
sandstromviktor Mar 14, 2024
c359cff
adding lint and test
sandstromviktor Mar 14, 2024
e6b58ba
lint workflow
sandstromviktor Mar 14, 2024
118f2de
lower case name
sandstromviktor Mar 14, 2024
19b600e
correct version
sandstromviktor Mar 14, 2024
f4f5802
update workflow
sandstromviktor Mar 14, 2024
86196cf
testing some more
sandstromviktor Mar 18, 2024
b2d3af0
testing
sandstromviktor Mar 18, 2024
b97b5c4
test
sandstromviktor Mar 18, 2024
5560436
testing
sandstromviktor Mar 18, 2024
51f1bc2
update
sandstromviktor Mar 18, 2024
21ac0a1
validate maintainers false
sandstromviktor Mar 18, 2024
ffb2717
update
sandstromviktor Mar 18, 2024
5377858
working tests locally - testing remotely
sandstromviktor Mar 18, 2024
2251800
excluding shinyproxy due to serviceaccount error
sandstromviktor Mar 18, 2024
7af6690
fixed lint
sandstromviktor Mar 18, 2024
b492bef
update volumek8s chart and workflow
sandstromviktor Mar 18, 2024
99b9d69
fixed lint
sandstromviktor Mar 18, 2024
2ea0acb
changed pvc
sandstromviktor Mar 18, 2024
1d26a40
update workflow, exclude pvc
sandstromviktor Mar 18, 2024
80d7f44
update
sandstromviktor Mar 18, 2024
796b0e9
update filemanager version
sandstromviktor Mar 18, 2024
9cb75a5
revert namespace for serve
sandstromviktor Mar 18, 2024
d06f9dd
revert serve-apps
sandstromviktor Mar 18, 2024
5c83e6e
removed tls comment
sandstromviktor Mar 18, 2024
47134b0
Removing typo from charts
sandstromviktor Mar 20, 2024
6295553
Merge pull request #32 from ScilifelabDataCentre/add-tests
sandstromviktor Mar 20, 2024
707a6b2
Merge pull request #31 from ScilifelabDataCentre/add-app-charts
sandstromviktor Mar 20, 2024
693656b
Merge pull request #30 from ScilifelabDataCentre/clean-up-repo
sandstromviktor Mar 20, 2024
44289be
Merge branch 'feature/add-app-charts' of github.com:ScilifelabDataCen…
sandstromviktor Mar 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions .github/workflows/code-checks.yaml

This file was deleted.

48 changes: 48 additions & 0 deletions .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Lint and Test Charts

on:
pull_request:
workflow_dispatch:


jobs:
lint-test:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Helm
uses: azure/[email protected]
with:
version: v3.13.0

- name: Set up Python
uses: actions/[email protected]
with:
python-version: 3.12

- name: Set up chart-testing
uses: helm/[email protected]

- name: Run chart-testing (list-changed)
id: list-changed
run: |
changed=$(ct list-changed --chart-dirs apps --target-branch main)
if [[ -n "$changed" ]]; then
echo "changed=true" >> $GITHUB_OUTPUT
fi

- name: Run chart-testing (lint)
if: steps.list-changed.outputs.changed == 'true'
run: ct lint --chart-dirs apps --all --target-branch main --validate-maintainers=false

- name: Create kind cluster
if: steps.list-changed.outputs.changed == 'true'
uses: helm/[email protected]

- name: Run chart-testing (install)
if: steps.list-changed.outputs.changed == 'true'
run: ct install --chart-dirs apps --all --target-branch main --excluded-charts shinyproxy,volumek8s
84 changes: 39 additions & 45 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,60 +1,54 @@
name: Release Helm charts
name: Release Charts

on:
release:
types: [published]
push:
branches:
- main
workflow_dispatch:

permissions:
contents: write
packages: write

jobs:
sync-branch:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Merge base branch -> gh-pages
uses: devmasx/[email protected]
with:
type: now
from_branch: ${{ github.base_ref }}
target_branch: gh-pages
github_token: ${{ github.token }}

chart-releaser:
runs-on: ubuntu-20.04
needs: sync-branch
release:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: gh-pages
fetch-depth: 0

- name: Configure Git
run: |
echo "GITHUB_ACTOR: $GITHUB_ACTOR"
git config --global user.name "$GITHUB_ACTOR"
git config --global user.email "[email protected]"

git config user.name "$GITHUB_ACTOR"
git config user.email "[email protected]"

- name: Install Helm
run: |
curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
chmod 700 get_helm.sh
./get_helm.sh
uses: azure/[email protected]
with:
version: 3.13.0

- name: Add chart dependencies
run: |
helm repo add stable https://charts.helm.sh/stable

- name: Update index.yaml and helm package
run: |
cd scaleout/stackn
helm package .
helm repo index . --url https://scaleoutsystems.github.io/charts/scaleout/stackn --merge index.yaml
- name: Run chart-releaser
uses: helm/[email protected]
with:
charts_dir: apps
skip_existing: true
env:
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Commit index.yaml and helm package to gh-pages
- name: Push Charts to GHCR
run: |
git pull origin gh-pages
git add -A
git commit -m "Updated index.yaml and helm package"
git push origin gh-pages

for pkg in .cr-release-packages/*; do
if [ -z "${pkg:-}" ]; then
break
fi
helm push "${pkg}" oci://ghcr.io/scilifelabdatacentre/serve-charts || true
done
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,6 @@ repos/

#Other
values-local*

/tmpcharts
requirements.lock
192 changes: 190 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,10 +1,198 @@
Copyright 2020 Scaleout Systems AB
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
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,
Expand Down
Loading
Loading