Skip to content

Commit

Permalink
feat: aio chart (#1436)
Browse files Browse the repository at this point in the history
* feat: aio chart

* chore: remove unsupported oxshibboleth chart

* chore: remove unsupported oxpassport chart

---------

Co-authored-by: iromli <isman.firmansyah@gmail.com>
  • Loading branch information
moabu and iromli authored Nov 13, 2023
1 parent 64c02f3 commit a20a695
Show file tree
Hide file tree
Showing 314 changed files with 3,151 additions and 13,446 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# These owners will be the default owners for everything in this branch of
# the repo. Unless a later match takes precedence

/flex-cn-setup/ @moabu @iromli
/charts/ @moabu @iromli
/.github/ @moabu @iromli
/docker-*/ @moabu @iromli
/admin-ui/ @syntrydy @duttarnab
6 changes: 3 additions & 3 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ on:
- main
paths:
- 'docs/**'
- 'flex-cn-setup/pygluu/kubernetes/templates/helm/**'
- 'charts/**'
- 'mkdocs.yml'
- 'docker-**/README.md'
pull_request:
branches:
- main
paths:
- 'docs/**'
- 'flex-cn-setup/pygluu/kubernetes/templates/helm/**'
- 'charts/**'
- 'mkdocs.yml'
- 'docker-**/README.md'
release:
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Copy generated chart from main
run: |
helm package flex-cn-setup/pygluu/kubernetes/templates/helm/gluu
helm package charts/gluu
cp gluu-*.tgz ../
- name: Import GPG key
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/central_code_quality_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,10 @@ jobs:
strategy:
fail-fast: false
matrix:
module: [admin-ui, flex-cn-setup, flex-linux-setup]
module: [admin-ui, flex-linux-setup]
env:
NON_JVM_PROJECTS: |
admin-ui
flex-cn-setup
flex-linux-setup
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
max-parallel: 1
fail-fast: false
matrix:
python-projects: ["flex-cn-setup", "flex-linux-setup"]
python-projects: ["flex-linux-setup"]
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_janssen_helm_chart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- main
paths:
- 'flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/*'
- 'charts/gluu/*'
jobs:
createPullRequest:
runs-on: ubuntu-latest
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/uploadrelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ jobs:
strategy:
matrix:
include:
# pygluu kubernetes
- os: ubuntu-latest
artifact_name: pygluu-kubernetes.pyz
asset_name: pygluu-kubernetes-linux-amd64.pyz
asset_directory: flex-cn-setup
python_version: 3.8
# flex linux setup
- os: ubuntu-latest
artifact_name: flex-linux-setup.pyz
Expand All @@ -41,7 +35,7 @@ jobs:
- os: ubuntu-latest
artifact_name: helm # Will be changed automatically
asset_name: helm # Will be changed automatically
asset_directory: flex-cn-setup/pygluu/kubernetes/templates/helm/gluu
asset_directory: charts/gluu
python_version: 3.8

steps:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ ENV/
.mypy_cache/

*.pyz
/flex-cn-setup/pygluu/kubernetes/kubernetes-client
.DS_Store

docs/_build
Expand Down
4 changes: 2 additions & 2 deletions automation/docs/generated-cn-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ tar xvf helm-docs_"${HELM_DOCS_VERSION}"_Linux_x86_64.tar.gz
sudo cp helm-docs /usr/local/bin/
cd ..
# Generate Helm docs
helm-docs "$MAIN_DIRECTORY_LOCATION"/flex-cn-setup/pygluu/kubernetes/templates/helm/
helm-docs "$MAIN_DIRECTORY_LOCATION"/charts/
rm -rf helmtemp
echo "Copying Helm chart Readme to helm-chart.md"
cp "$MAIN_DIRECTORY_LOCATION"/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/README.md "$MAIN_DIRECTORY_LOCATION"/docs/reference/kubernetes/helm-chart.md
cp "$MAIN_DIRECTORY_LOCATION"/charts/gluu/README.md "$MAIN_DIRECTORY_LOCATION"/docs/reference/kubernetes/helm-chart.md
echo "Adding keywords to helm-chart"
sed -i '1 s/^/---\ntags:\n - administration\n - reference\n - kubernetes\n---\n/' "$MAIN_DIRECTORY_LOCATION"/docs/reference/kubernetes/helm-chart.md
echo "Copying docker-monolith main README.md to compose.md"
Expand Down
13 changes: 2 additions & 11 deletions automation/github-labels/labels-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@
},
"comp-charts-flex": {
"color": "0052CC",
"description": "Touching folder /flex-cn-setup/pygluu/kubernetes/templates/helm",
"description": "Touching folder /charts",
"auto-label": {
"branch": "",
"paths": ["flex-cn-setup/pygluu/kubernetes/templates/helm"],
"paths": ["charts"],
"title-prefixes": []
}
},
Expand Down Expand Up @@ -116,15 +116,6 @@
"title-prefixes": []
}
},
"comp-flex-cn-setup": {
"color": "0052CC",
"description": "Touching folder /flex-cn-setup",
"auto-label": {
"branch": "",
"paths": ["flex-cn-setup"],
"title-prefixes": []
}
},
"comp-flex-linux-setup": {
"color": "0052CC",
"description": "Touching folder /flex-linux-setup",
Expand Down
4 changes: 0 additions & 4 deletions automation/janssen_helm_chart/analyze_chart.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,6 @@ def clean_keys(values_dict: {}, parent_key="", second_parent_key="") -> None:

def main():
find_replace(main_dir, "support@gluu.org", "support@jans.io", "*.*")
find_replace(main_dir, "https://github.com/GluuFederation/flex/flex-cn-setup",
"https://github.com/JanssenProject/jans/charts/janssen", "*.*")
find_replace(main_dir, "https://gluu.org/docs/gluu-server/reference/container-configs/",
"/docker-jans-configurator", "*.*")
find_replace(main_dir, "https://gluu.org/docs/gluu-server/favicon.ico",
"https://github.com/JanssenProject/jans/raw/main/docs/logo/janssen_project_favicon_transparent_50px_50px.png",
"*.*")
Expand Down
2 changes: 1 addition & 1 deletion automation/janssen_helm_chart/prepare_chart.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e

temp_chart_folder="charts/janssen"
mkdir -p ${temp_chart_folder}
cp -r ./flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/* ${temp_chart_folder}
cp -r ./charts/gluu/* ${temp_chart_folder}
rm ${temp_chart_folder}/openbanking-values.yaml || echo "file doesn't exist"
rm ${temp_chart_folder}/charts/config/templates/upgrade-ldap-101-jans.yaml || echo "file doesn't exist"
rm ${temp_chart_folder}/charts/config/templates/ob-secrets.yaml || echo "file doesn't exist"
Expand Down
File renamed without changes.
27 changes: 27 additions & 0 deletions charts/flex-all-in-one/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
kubeVersion: ">=v1.22.0-0"
annotations:
artifacthub.io/changes: |
- 1.0.20 dev chart release
artifacthub.io/containsSecurityUpdates: 'true'
artifacthub.io/images: |
- name: all-in-one
image: ghcr.io/gluufederation/flex/flex-all-in-one:1.0.20_dev
artifacthub.io/license: Apache-2.0
artifacthub.io/prerelease: 'true'
catalog.cattle.io/certified: partner
catalog.cattle.io/release-name: flex-all-in-one
catalog.cattle.io/display-name: Flex Cloud Identity and Access Management All-in-One
apiVersion: v2
appVersion: "1.0.20-dev"
icon: >-
https://gluu.org/docs/gluu-server/favicon.ico
home: https://docs.gluu.org
sources:
- https://docs.gluu.org
- https://github.com/GluuProject/jans/charts/janssen
maintainers:
- name: moabu
email: support@gluu.org
description: Gluu Access and Identity Management All-in-One Chart. This chart deploys the selected janssen microservice all in one deployment.
name: flex-all-in-one
version: 1.0.20-dev
Loading

0 comments on commit a20a695

Please sign in to comment.