Skip to content

Commit a20a695

Browse files
moabuiromli
andauthored
feat: aio chart (#1436)
* feat: aio chart * chore: remove unsupported oxshibboleth chart * chore: remove unsupported oxpassport chart --------- Co-authored-by: iromli <[email protected]>
1 parent 64c02f3 commit a20a695

File tree

314 files changed

+3151
-13446
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

314 files changed

+3151
-13446
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# These owners will be the default owners for everything in this branch of
55
# the repo. Unless a later match takes precedence
66

7-
/flex-cn-setup/ @moabu @iromli
7+
/charts/ @moabu @iromli
88
/.github/ @moabu @iromli
99
/docker-*/ @moabu @iromli
1010
/admin-ui/ @syntrydy @duttarnab

.github/workflows/build-docs.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ on:
55
- main
66
paths:
77
- 'docs/**'
8-
- 'flex-cn-setup/pygluu/kubernetes/templates/helm/**'
8+
- 'charts/**'
99
- 'mkdocs.yml'
1010
- 'docker-**/README.md'
1111
pull_request:
1212
branches:
1313
- main
1414
paths:
1515
- 'docs/**'
16-
- 'flex-cn-setup/pygluu/kubernetes/templates/helm/**'
16+
- 'charts/**'
1717
- 'mkdocs.yml'
1818
- 'docker-**/README.md'
1919
release:
@@ -69,7 +69,7 @@ jobs:
6969
7070
- name: Copy generated chart from main
7171
run: |
72-
helm package flex-cn-setup/pygluu/kubernetes/templates/helm/gluu
72+
helm package charts/gluu
7373
cp gluu-*.tgz ../
7474
7575
- name: Import GPG key

.github/workflows/central_code_quality_check.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,10 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
module: [admin-ui, flex-cn-setup, flex-linux-setup]
32+
module: [admin-ui, flex-linux-setup]
3333
env:
3434
NON_JVM_PROJECTS: |
3535
admin-ui
36-
flex-cn-setup
3736
flex-linux-setup
3837
3938
steps:

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
max-parallel: 1
8686
fail-fast: false
8787
matrix:
88-
python-projects: ["flex-cn-setup", "flex-linux-setup"]
88+
python-projects: ["flex-linux-setup"]
8989
steps:
9090
- name: Checkout
9191
uses: actions/checkout@v3

.github/workflows/update_janssen_helm_chart.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- main
77
paths:
8-
- 'flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/*'
8+
- 'charts/gluu/*'
99
jobs:
1010
createPullRequest:
1111
runs-on: ubuntu-latest

.github/workflows/uploadrelease.yml

+1-7
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ jobs:
1919
strategy:
2020
matrix:
2121
include:
22-
# pygluu kubernetes
23-
- os: ubuntu-latest
24-
artifact_name: pygluu-kubernetes.pyz
25-
asset_name: pygluu-kubernetes-linux-amd64.pyz
26-
asset_directory: flex-cn-setup
27-
python_version: 3.8
2822
# flex linux setup
2923
- os: ubuntu-latest
3024
artifact_name: flex-linux-setup.pyz
@@ -41,7 +35,7 @@ jobs:
4135
- os: ubuntu-latest
4236
artifact_name: helm # Will be changed automatically
4337
asset_name: helm # Will be changed automatically
44-
asset_directory: flex-cn-setup/pygluu/kubernetes/templates/helm/gluu
38+
asset_directory: charts/gluu
4539
python_version: 3.8
4640

4741
steps:

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ ENV/
103103
.mypy_cache/
104104

105105
*.pyz
106-
/flex-cn-setup/pygluu/kubernetes/kubernetes-client
107106
.DS_Store
108107

109108
docs/_build

automation/docs/generated-cn-docs.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ tar xvf helm-docs_"${HELM_DOCS_VERSION}"_Linux_x86_64.tar.gz
1414
sudo cp helm-docs /usr/local/bin/
1515
cd ..
1616
# Generate Helm docs
17-
helm-docs "$MAIN_DIRECTORY_LOCATION"/flex-cn-setup/pygluu/kubernetes/templates/helm/
17+
helm-docs "$MAIN_DIRECTORY_LOCATION"/charts/
1818
rm -rf helmtemp
1919
echo "Copying Helm chart Readme to helm-chart.md"
20-
cp "$MAIN_DIRECTORY_LOCATION"/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/README.md "$MAIN_DIRECTORY_LOCATION"/docs/reference/kubernetes/helm-chart.md
20+
cp "$MAIN_DIRECTORY_LOCATION"/charts/gluu/README.md "$MAIN_DIRECTORY_LOCATION"/docs/reference/kubernetes/helm-chart.md
2121
echo "Adding keywords to helm-chart"
2222
sed -i '1 s/^/---\ntags:\n - administration\n - reference\n - kubernetes\n---\n/' "$MAIN_DIRECTORY_LOCATION"/docs/reference/kubernetes/helm-chart.md
2323
echo "Copying docker-monolith main README.md to compose.md"

automation/github-labels/labels-schema.json

+2-11
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@
6464
},
6565
"comp-charts-flex": {
6666
"color": "0052CC",
67-
"description": "Touching folder /flex-cn-setup/pygluu/kubernetes/templates/helm",
67+
"description": "Touching folder /charts",
6868
"auto-label": {
6969
"branch": "",
70-
"paths": ["flex-cn-setup/pygluu/kubernetes/templates/helm"],
70+
"paths": ["charts"],
7171
"title-prefixes": []
7272
}
7373
},
@@ -116,15 +116,6 @@
116116
"title-prefixes": []
117117
}
118118
},
119-
"comp-flex-cn-setup": {
120-
"color": "0052CC",
121-
"description": "Touching folder /flex-cn-setup",
122-
"auto-label": {
123-
"branch": "",
124-
"paths": ["flex-cn-setup"],
125-
"title-prefixes": []
126-
}
127-
},
128119
"comp-flex-linux-setup": {
129120
"color": "0052CC",
130121
"description": "Touching folder /flex-linux-setup",

automation/janssen_helm_chart/analyze_chart.py

-4
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,6 @@ def clean_keys(values_dict: {}, parent_key="", second_parent_key="") -> None:
135135

136136
def main():
137137
find_replace(main_dir, "[email protected]", "[email protected]", "*.*")
138-
find_replace(main_dir, "https://github.com/GluuFederation/flex/flex-cn-setup",
139-
"https://github.com/JanssenProject/jans/charts/janssen", "*.*")
140-
find_replace(main_dir, "https://gluu.org/docs/gluu-server/reference/container-configs/",
141-
"/docker-jans-configurator", "*.*")
142138
find_replace(main_dir, "https://gluu.org/docs/gluu-server/favicon.ico",
143139
"https://github.com/JanssenProject/jans/raw/main/docs/logo/janssen_project_favicon_transparent_50px_50px.png",
144140
"*.*")

automation/janssen_helm_chart/prepare_chart.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e
33

44
temp_chart_folder="charts/janssen"
55
mkdir -p ${temp_chart_folder}
6-
cp -r ./flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/* ${temp_chart_folder}
6+
cp -r ./charts/gluu/* ${temp_chart_folder}
77
rm ${temp_chart_folder}/openbanking-values.yaml || echo "file doesn't exist"
88
rm ${temp_chart_folder}/charts/config/templates/upgrade-ldap-101-jans.yaml || echo "file doesn't exist"
99
rm ${temp_chart_folder}/charts/config/templates/ob-secrets.yaml || echo "file doesn't exist"

charts/flex-all-in-one/Chart.yaml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
kubeVersion: ">=v1.22.0-0"
2+
annotations:
3+
artifacthub.io/changes: |
4+
- 1.0.20 dev chart release
5+
artifacthub.io/containsSecurityUpdates: 'true'
6+
artifacthub.io/images: |
7+
- name: all-in-one
8+
image: ghcr.io/gluufederation/flex/flex-all-in-one:1.0.20_dev
9+
artifacthub.io/license: Apache-2.0
10+
artifacthub.io/prerelease: 'true'
11+
catalog.cattle.io/certified: partner
12+
catalog.cattle.io/release-name: flex-all-in-one
13+
catalog.cattle.io/display-name: Flex Cloud Identity and Access Management All-in-One
14+
apiVersion: v2
15+
appVersion: "1.0.20-dev"
16+
icon: >-
17+
https://gluu.org/docs/gluu-server/favicon.ico
18+
home: https://docs.gluu.org
19+
sources:
20+
- https://docs.gluu.org
21+
- https://github.com/GluuProject/jans/charts/janssen
22+
maintainers:
23+
- name: moabu
24+
25+
description: Gluu Access and Identity Management All-in-One Chart. This chart deploys the selected janssen microservice all in one deployment.
26+
name: flex-all-in-one
27+
version: 1.0.20-dev

0 commit comments

Comments
 (0)