Skip to content

Commit 6a6219d

Browse files
authored
Merge pull request #616 from vprashar2929/ci-rel-helm
ci(release): push helm chart before creating pull request
2 parents ae4b7a3 + 7fe1bcd commit 6a6219d

File tree

4 files changed

+15
-24
lines changed

4 files changed

+15
-24
lines changed

.github/workflows/pr-checks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ jobs:
249249
id: additional_tags
250250
shell: bash
251251
run: |
252-
echo "result=$(git rev-parse --short HEAD),main" >> $GITHUB_OUTPUT
252+
echo "result=$(git rev-parse --short HEAD),latest" >> $GITHUB_OUTPUT
253253
254254
- name: Install all tools
255255
uses: ./.github/tools-cache

.github/workflows/push.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,30 @@
11
name: Push
2-
32
on: # yamllint disable-line rule:truthy
43
push:
54
branches: [main]
6-
75
jobs:
86
test-and-codecov:
97
uses: ./.github/workflows/test-and-codecov.yaml
108
secrets:
119
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
12-
1310
publish:
1411
name: Publish operator container images
1512
runs-on: ubuntu-latest-8-cores
1613
steps:
1714
- name: Checkout source
1815
uses: actions/checkout@v4
19-
2016
- uses: actions/setup-go@v5
2117
with:
2218
go-version-file: go.mod
2319
cache: false
24-
2520
- name: Compute version
2621
uses: ./.github/compute-version
2722
id: version
28-
2923
- name: Additional tags
3024
id: additional_tags
3125
shell: bash
3226
run: |
33-
echo "result=$(git rev-parse --short HEAD),main" >> $GITHUB_OUTPUT
34-
27+
echo "result=$(git rev-parse --short HEAD),latest" >> $GITHUB_OUTPUT
3528
- name: Build and Publish Images to External registry
3629
uses: ./.github/publish-images
3730
with:

.github/workflows/release.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ jobs:
6363
- name: Package Helm Chart
6464
shell: bash
6565
run: |
66-
mkdir -p helm-releases
66+
mkdir -p ./tmp/helm-releases
6767
VERSION=${{ github.event.inputs.tag }}
68-
helm package manifests/helm/kepler-operator -d helm-releases
68+
helm package manifests/helm/kepler-operator -d ./tmp/helm-releases
6969
# Rename the helm chart to include 'helm' identifier
70-
mv helm-releases/kepler-operator-${VERSION}.tgz helm-releases/kepler-operator-helm-${VERSION}.tgz
70+
mv ./tmp/helm-releases/kepler-operator-${VERSION}.tgz ./tmp/helm-releases/kepler-operator-helm-${VERSION}.tgz
7171
- name: Git set user
7272
run: |
7373
git config user.name "$USERNAME"
@@ -82,6 +82,11 @@ jobs:
8282
make operator-push bundle-push
8383
env:
8484
IMG_BASE: ${{ vars.IMG_BASE }}
85+
- name: Push Helm Chart to OCI registry
86+
shell: bash
87+
run: |
88+
VERSION=${{ github.event.inputs.tag }}
89+
helm push ./tmp/helm-releases/kepler-operator-helm-${VERSION}.tgz oci://quay.io/sustainable_computing_io/charts
8590
- name: Create Pull Request
8691
id: create_pr
8792
uses: peter-evans/create-pull-request@v7
@@ -125,10 +130,3 @@ jobs:
125130
generate_release_notes: true
126131
draft: false
127132
prerelease: false
128-
files: |
129-
helm-releases/*.tgz
130-
- name: Push Helm Chart to OCI registry
131-
shell: bash
132-
run: |
133-
VERSION=${{ github.event.inputs.tag }}
134-
helm push helm-releases/kepler-operator-helm-${VERSION}.tgz oci://quay.io/sustainable_computing_io/charts

docs/developer/helm-chart-maintenance.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -448,14 +448,14 @@ make helm-validate
448448

449449
```bash
450450
# Create output directory
451-
mkdir -p helm-releases
451+
mkdir -p ./tmp/helm-releases
452452
453453
# Package the chart
454-
helm package manifests/helm/kepler-operator -d helm-releases
454+
helm package manifests/helm/kepler-operator -d ./tmp/helm-releases
455455
456456
# Optional: Rename with -helm- identifier for clarity
457-
mv helm-releases/kepler-operator-${VERSION}.tgz \
458-
helm-releases/kepler-operator-helm-${VERSION}.tgz
457+
mv ./tmp/helm-releases/kepler-operator-${VERSION}.tgz \
458+
./tmp/helm-releases/kepler-operator-helm-${VERSION}.tgz
459459
```
460460

461461
**4. Login to OCI Registry**:
@@ -471,7 +471,7 @@ helm registry login quay.io/sustainable_computing_io \
471471

472472
```bash
473473
# Push to Quay.io OCI registry
474-
helm push helm-releases/kepler-operator-helm-${VERSION}.tgz \
474+
helm push ./tmp/helm-releases/kepler-operator-helm-${VERSION}.tgz \
475475
oci://quay.io/sustainable_computing_io/charts
476476
```
477477

0 commit comments

Comments
 (0)