Skip to content

Commit 5abfa32

Browse files
chore: Move helm charts to top level folder (#56)
1 parent fe65e45 commit 5abfa32

57 files changed

Lines changed: 12 additions & 15 deletions

Some content is hidden

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

.github/linters/ct.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
remote: origin
33
target-branch: main
44
chart-dirs:
5-
- deployment/kubernetes/charts
5+
- helm-charts
66
helm-extra-args: --timeout 1000s
77
chart-repos:
88
- opensearch=https://opensearch-project.github.io/helm-charts

.github/workflows/kubernetes-charts-build.yaml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ on:
66
tags:
77
- "helm-charts-v*.*.*" # e.g., helm-charts-v0.1.1
88
paths:
9-
- "deployment/kubernetes/charts/**"
9+
- "helm-charts/**"
1010
- ".github/workflows/kubernetes-charts-build**"
1111
pull_request:
1212
paths:
13-
- "deployment/kubernetes/charts/**"
13+
- "helm-charts/**"
1414
- ".github/workflows/kubernetes**"
1515

1616
defaults:
1717
run:
18-
working-directory: ./deployment/kubernetes
18+
working-directory: ./helm-charts
1919

2020
jobs:
2121
helm-lint-test:
@@ -48,18 +48,17 @@ jobs:
4848
fi
4949
5050
- name: Recursive dependency update (all charts, including nested)
51-
working-directory: .
5251
run: |
5352
# Run twice so nested subcharts (like cogstack-jupyterhub -> jupyterhub) are fully updated
5453
for _ in 1 2; do
55-
# Find every Chart.yaml under deployment/kubernetes/charts and run helm dependency update in its directory
54+
# Find every Chart.yaml under helm-charts and run helm dependency update in its directory
5655
while IFS= read -r chartfile; do
5756
chart_dir="$(dirname "$chartfile")"
5857
if grep -q "^dependencies:" "$chartfile" 2>/dev/null; then
5958
echo "Updating dependencies for $chart_dir"
6059
helm dependency update "$chart_dir"
6160
fi
62-
done < <(find deployment/kubernetes/charts -type f -name Chart.yaml)
61+
done < <(find . -type f -name Chart.yaml)
6362
done
6463
6564
- name: Run chart-testing (lint)
@@ -114,26 +113,24 @@ jobs:
114113
- name: Recursive dependency update (all charts, including nested)
115114
# Waiting on helm recursive feature https://github.com/helm/helm/pull/30855
116115
# Could alternatively switch to helm "cascade" plugin
117-
working-directory: .
118116
run: |
119117
# Run twice so nested subcharts (like cogstack-jupyterhub -> jupyterhub) are fully updated
120118
for _ in 1 2; do
121-
# Find every Chart.yaml under deployment/kubernetes/charts and run helm dependency update in its directory
119+
# Find every Chart.yaml under helm-charts and run helm dependency update in its directory
122120
while IFS= read -r chartfile; do
123121
chart_dir="$(dirname "$chartfile")"
124122
if grep -q "^dependencies:" "$chartfile" 2>/dev/null; then
125123
echo "Updating dependencies for $chart_dir"
126124
helm dependency update "$chart_dir"
127125
fi
128-
done < <(find deployment/kubernetes/charts -type f -name Chart.yaml)
126+
done < <(find . -type f -name Chart.yaml)
129127
done
130128
131129
- name: Package Helm Charts
132-
# TODO: List the dir instead of hardcoding each one
133130
run: |
134-
helm package ./charts/medcat-service-helm --version ${{ steps.version.outputs.chart_version }}
135-
helm package ./charts/medcat-trainer-helm --version ${{ steps.version.outputs.chart_version }} --dependency-update
136-
helm package ./charts/cogstack-helm-ce --version ${{ steps.version.outputs.chart_version }} --dependency-update
131+
helm package ./medcat-service-helm --version ${{ steps.version.outputs.chart_version }}
132+
helm package ./medcat-trainer-helm --version ${{ steps.version.outputs.chart_version }} --dependency-update
133+
helm package ./cogstack-helm-ce --version ${{ steps.version.outputs.chart_version }} --dependency-update
137134
138135
- name: Helm OCI login to Docker Hub
139136
run: helm registry login registry-1.docker.io -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }}
@@ -150,4 +147,4 @@ jobs:
150147
with:
151148
draft: true
152149
files: |
153-
./deployment/kubernetes/*.tgz
150+
helm-charts/*.tgz
File renamed without changes.
File renamed without changes.
File renamed without changes.

deployment/kubernetes/charts/cogstack-helm-ce/charts/jupyterhub/Chart.lock renamed to helm-charts/cogstack-helm-ce/charts/jupyterhub/Chart.lock

File renamed without changes.

deployment/kubernetes/charts/cogstack-helm-ce/charts/jupyterhub/Chart.yaml renamed to helm-charts/cogstack-helm-ce/charts/jupyterhub/Chart.yaml

File renamed without changes.

deployment/kubernetes/charts/cogstack-helm-ce/charts/jupyterhub/values.yaml renamed to helm-charts/cogstack-helm-ce/charts/jupyterhub/values.yaml

File renamed without changes.

0 commit comments

Comments
 (0)