Skip to content

Commit f4e98d2

Browse files
committed
release(chart): 0.28.2
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 9e99f2a commit f4e98d2

File tree

7 files changed

+37
-34
lines changed

7 files changed

+37
-34
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Update tag in docs and files
5151
run: ./update_tag_in_docs_and_files.sh ${LATEST_TAG} ${NEXT_TAG}
5252
- name: Update chart CHANGELOG
53-
run: ./generate_chart_changelog.sh HEAD
53+
run: ./generate_chart_changelog.sh
5454
- name: Build images
5555
run: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make build
5656
- name: Login Docker Hub

.github/workflows/helm-chart-release.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@ jobs:
2727
git config user.email "[email protected]"
2828
2929
- name: Get chart release notes (chart_release_notes.md)
30-
run: ./generate_chart_changelog.sh HEAD
30+
run: ./generate_chart_changelog.sh
31+
32+
- name: Run chart-releaser
33+
uses: helm/chart-releaser-action@main
34+
with:
35+
mark_as_latest: false
36+
skip_existing: true
37+
env:
38+
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
39+
CR_RELEASE_NOTES_FILE: RELEASE_NOTES.md
3140

3241
- name: Commit files
3342
run: |
3443
git config --local user.email "[email protected]"
3544
git config --local user.name "Selenium CI Bot"
36-
git commit -m "Update tag in docs and files" -a
45+
git commit -m "Update tag in docs and files" -a || true
3746
3847
- name: Push changes
3948
uses: ad-m/github-push-action@master
4049
with:
4150
github_token: ${{ secrets.SELENIUM_CI_TOKEN }}
4251
branch: trunk
43-
44-
- name: Run chart-releaser
45-
uses: helm/chart-releaser-action@main
46-
with:
47-
mark_as_latest: false
48-
skip_existing: true
49-
env:
50-
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
51-
CR_RELEASE_NOTES_FILE: RELEASE_NOTES.md

charts/selenium-grid/CHANGELOG.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
## :heavy_check_mark: selenium-grid-0.0.10.28.1
1+
## :heavy_check_mark: selenium-grid-0.28.1
22

3-
- Chart is using image tag "1.0.0"4.18.1-20240224
4-
- Chart is tested on Kubernetes versions: v1.25.16 v1.26.14 v1.27.11 v1.28.7 v1.29.2
5-
6-
### Added
7-
- feat(chart): option to disable release name prefix in object naming :: Viet Nguyen Duc
3+
- Chart is using image tag 4.18.0-20240220
4+
- Chart is tested on Kubernetes versions: v1.25.16 v1.26.14 v1.27.11 v1.28.7 v1.29.2
85

96
### Fixed
10-
- fix(chart): extra scripts can be imported in sub-chart by default :: Viet Nguyen Duc
7+
- bug(chart): template issue when chart is imported as dependency in umbrella charts :: Viet Nguyen Duc
8+
- bug(chart): SE_NODE_GRID_URL missing port when `hostname` is `selenium-grid.local` :: Viet Nguyen Duc
9+
- bug(chart) CRITICAL: Node startup probe loop infinite when ingress hostname is set :: Viet Nguyen Duc
1110

1211
### Changed
13-
- test(chart): test extra scripts import when import as sub-chart :: Viet Nguyen Duc
12+
- test(chart): update docs :: Viet Nguyen Duc
13+
- test(chart): add tests for the case basic auth is enabled :: Viet Nguyen Duc
14+
- test(chart): add tests for the case ingress is enabled with `hostname` set :: Viet Nguyen Duc
15+
- build(chart): change log and release notes for helm chart :: Viet Nguyen Duc
1416

1517
## :heavy_check_mark: selenium-grid-0.28.0
1618

charts/selenium-grid/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: selenium-grid
33
description: A Helm chart for creating a Selenium Grid Server in Kubernetes
44
type: application
5-
version: 0.28.1
5+
version: 0.28.2
66
appVersion: 4.18.1-20240224
77
icon: https://github.com/SeleniumHQ/docker-selenium/raw/trunk/logo.png
88
dependencies:

generate_chart_changelog.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,33 @@
44
CHART_DIR="./charts/selenium-grid"
55
CHANGELOG_FILE="./charts/selenium-grid/CHANGELOG.md"
66
TAG_PATTERN="selenium-grid"
7-
SET_TAG=${1:-""}
7+
DEFAULT_TAG="trunk"
8+
SET_TAG=${1:-$(git rev-parse --abbrev-ref HEAD)}
89

910
# Get current chart app version
10-
CHART_APP_VERSION=$(find . \( -type d -name .git -prune \) -o -type f -name 'Chart.yaml' -print0 | xargs -0 cat | grep ^appVersion | cut -d ':' -f 2 | tr -d '[:space:]')
11+
CHART_APP_VERSION=$(find . \( -type d -name .git -prune \) -o -type f -wholename '*/selenium-grid/Chart.yaml' -print0 | xargs -0 cat | grep ^appVersion | cut -d ':' -f 2 | tr -d '[:space:]')
1112

1213
# Generate the changelog
1314
generate_changelog() {
1415
# Get a list of tags sorted by commit date
1516
tags=($(git tag --sort=committerdate | grep "^$TAG_PATTERN"))
1617
tags_size=${#tags[@]}
1718

18-
CURRENT_CHART_VERSION=$(find . \( -type d -name .git -prune \) -o -type f -name 'Chart.yaml' -print0 | xargs -0 cat | grep ^version | cut -d ':' -f 2 | tr -d '[:space:]')
19+
CURRENT_CHART_VERSION=$(find . \( -type d -name .git -prune \) -o -type f -wholename '*/selenium-grid/Chart.yaml' -print0 | xargs -0 cat | grep ^version | cut -d ':' -f 2 | tr -d '[:space:]')
1920

2021
# Check if there are tags
2122
if [ ${#tags[@]} -eq 0 ]; then
22-
commit_range="HEAD"
23+
commit_range="$DEFAULT_TAG"
2324
change_title="${TAG_PATTERN}-${CURRENT_CHART_VERSION}"
24-
elif [ ${#tags[@]} -eq 1 ] || [ "$SET_TAG" = "HEAD" ]; then
25+
elif [ ${#tags[@]} -eq 1 ] || [ "$SET_TAG" = "$DEFAULT_TAG" ]; then
2526
previous_tag="${tags[$tags_size-1]}"
26-
current_tag="HEAD"
27-
commit_range="${previous_tag}..${current_tag}"
27+
current_tag="$DEFAULT_TAG"
28+
commit_range="${previous_tag}..origin/${current_tag}"
2829
change_title="${TAG_PATTERN}-${CURRENT_CHART_VERSION}"
2930
else
3031
previous_tag="${tags[$tags_size-2]}"
3132
current_tag="${tags[$tags_size-1]}"
32-
commit_range="${previous_tag}..${current_tag}"
33+
commit_range="${previous_tag}..origin/${current_tag}"
3334
change_title="$current_tag"
3435
fi
3536

@@ -79,7 +80,7 @@ generate_changelog() {
7980

8081
# Create chart_release_notes.md
8182
release_notes_file="$CHART_DIR/RELEASE_NOTES.md"
82-
chart_description=$(find . \( -type d -name .git -prune \) -o -type f -name 'Chart.yaml' -print0 | xargs -0 cat | grep ^description | cut -d ':' -f 2)
83+
chart_description=$(find . \( -type d -name .git -prune \) -o -type f -wholename '*/selenium-grid/Chart.yaml' -print0 | xargs -0 cat | grep ^description | cut -d ':' -f 2)
8384
echo "$chart_description" > "$release_notes_file"
8485
echo "" >> "$release_notes_file"
8586
cat $temp_file >> "$release_notes_file"

tests/charts/umbrella-charts/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ version: 0.0.1
66
appVersion: "1.0.0"
77
dependencies:
88
- name: selenium-grid
9-
version: 0.28.1
9+
version: 0.28.2
1010
repository: file://../../../charts/selenium-grid

update_tag_in_docs_and_files.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LATEST_TAG=$1
44
NEXT_TAG=$2
55
LATEST_DATE=$(echo ${LATEST_TAG} | sed 's/.*-//')
66
NEXT_DATE=$(echo ${NEXT_TAG} | sed 's/.*-//')
7-
latest_chart_app_version=$(find . \( -type d -name .git -prune \) -o -type f -name 'Chart.yaml' -print0 | xargs -0 cat | grep ^appVersion | cut -d ':' -f 2 | tr -d '[:space:]')
7+
latest_chart_app_version=$(find . \( -type d -name .git -prune \) -o -type f -wholename '*/selenium-grid/Chart.yaml' -print0 | xargs -0 cat | grep ^appVersion | cut -d ':' -f 2 | tr -d '[:space:]')
88
FFMPEG_TAG_VERSION=$(grep FFMPEG_TAG_VERSION Makefile | sed 's/.*,\([^)]*\))/\1/p' | head -n 1)
99
RCLONE_TAG_VERSION=$(grep RCLONE_TAG_VERSION Makefile | sed 's/.*,\([^)]*\))/\1/p' | head -n 1)
1010

@@ -34,7 +34,7 @@ find . \( -type d -name .git -prune \) -o -type f ! -name 'CHANGELOG.md' -print0
3434
if [ "$latest_chart_app_version" == $LATEST_TAG ] && [ "$latest_chart_app_version" != "$NEXT_TAG" ]; then
3535
IFS='.' read -ra latest_version_parts <<< "$LATEST_TAG"
3636
IFS='.' read -ra next_version_parts <<< "$NEXT_TAG"
37-
latest_chart_version=$(find . \( -type d -name .git -prune \) -o -type f -name 'Chart.yaml' -print0 | xargs -0 cat | grep ^version | cut -d ':' -f 2 | tr -d '[:space:]')
37+
latest_chart_version=$(find . \( -type d -name .git -prune \) -o -type f -wholename '*/selenium-grid/Chart.yaml' -print0 | xargs -0 cat | grep ^version | cut -d ':' -f 2 | tr -d '[:space:]')
3838
IFS='.' read -ra latest_chart_version_parts <<< "$latest_chart_version"
3939
if [ "${latest_version_parts[0]}" != "${next_version_parts[0]}" ]; then
4040
((latest_chart_version_parts[0]++))
@@ -51,7 +51,7 @@ if [ "$latest_chart_app_version" == $LATEST_TAG ] && [ "$latest_chart_app_versio
5151
echo -e "\033[0;32m LATEST_CHART_VERSION -> ${latest_chart_version}\033[0m"
5252
echo -e "\033[0;32m NEXT_CHART_VERSION -> ${next_chart_version}\033[0m"
5353
# If you want to test this locally and you are using macOS, do `brew install gnu-sed` and change `sed` for `gsed`.
54-
find . \( -type d -name .git -prune \) -o -type f -name 'Chart.yaml' -print0 | xargs -0 sed -i "s/${latest_chart_version}/${next_chart_version}/g"
54+
find . \( -type d -name .git -prune \) -o -type f -wholename '*/selenium-grid/Chart.yaml' -print0 | xargs -0 sed -i "s/${latest_chart_version}/${next_chart_version}/g"
5555
find . \( -type d -name .git -prune \) -o -type f -name 'bug_report.yaml' -print0 | xargs -0 sed -i "s/${latest_chart_version}/${next_chart_version}/g"
5656
fi
5757

0 commit comments

Comments
 (0)