Skip to content

Commit 9106ba1

Browse files
committed
chart(fix): Remove alias from sub-chart to prevent render issue in other CD tools
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 838f721 commit 9106ba1

File tree

6 files changed

+17
-11
lines changed

6 files changed

+17
-11
lines changed

Diff for: .circleci/config.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ workflows:
3434
name: "K8s test - Autoscaling Jobs - HTTPS"
3535
platforms: linux/arm64
3636
machine-type: ubuntu2204arm64large
37-
k8s-version: 'v1.28.12'
37+
k8s-version: 'v1.28.13'
3838
test-strategy: job_https
3939
cluster: 'minikube'
4040
helm-version: 'v3.13.3'
@@ -43,7 +43,7 @@ workflows:
4343
name: "K8s test - Autoscaling Jobs - Ingress hostname"
4444
platforms: linux/arm64
4545
machine-type: ubuntu2204arm64large
46-
k8s-version: 'v1.29.7'
46+
k8s-version: 'v1.29.8'
4747
test-strategy: job_hostname
4848
cluster: 'minikube'
4949
helm-version: 'v3.14.4'
@@ -52,10 +52,10 @@ workflows:
5252
name: "K8s test - Autoscaling Deployments - HTTPS"
5353
platforms: linux/arm64
5454
machine-type: ubuntu2204arm64large
55-
k8s-version: 'v1.30.3'
55+
k8s-version: 'v1.30.4'
5656
test-strategy: deployment_https
5757
cluster: 'minikube'
58-
helm-version: 'v3.15.3'
58+
helm-version: 'v3.15.4'
5959
test-upgrade: true
6060
- docker-test:
6161
name: "Docker test - Use random user (true)"

Diff for: .github/workflows/helm-chart-test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,20 @@ jobs:
4949
cluster: 'minikube'
5050
helm-version: 'v3.12.3'
5151
test-upgrade: true
52-
- k8s-version: 'v1.28.12'
52+
- k8s-version: 'v1.28.13'
5353
test-strategy: job_https
5454
cluster: 'minikube'
5555
helm-version: 'v3.13.3'
5656
test-upgrade: true
57-
- k8s-version: 'v1.29.7'
57+
- k8s-version: 'v1.29.8'
5858
test-strategy: job_hostname
5959
cluster: 'minikube'
6060
helm-version: 'v3.14.4'
6161
test-upgrade: true
62-
- k8s-version: 'v1.30.3'
62+
- k8s-version: 'v1.30.4'
6363
test-strategy: deployment_https
6464
cluster: 'minikube'
65-
helm-version: 'v3.15.3'
65+
helm-version: 'v3.15.4'
6666
test-upgrade: true
6767
env:
6868
CLUSTER: ${{ matrix.cluster }}

Diff for: charts/selenium-grid/Chart.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ dependencies:
2121
- repository: https://prometheus-community.github.io/helm-charts
2222
version: 61.8.0
2323
name: kube-prometheus-stack
24-
alias: prometheus-stack
2524
condition: monitoring.enabled, prometheus-stack.enabled
2625
maintainers:
2726
- name: SeleniumHQ

Diff for: charts/selenium-grid/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1325,7 +1325,7 @@ ingress-nginx:
13251325
admissionWebhooks:
13261326
enabled: false
13271327

1328-
prometheus-stack:
1328+
kube-prometheus-stack:
13291329
# enabled: false
13301330
cleanPrometheusOperatorObjectNames: true
13311331

Diff for: tests/charts/ci/base-tls-values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ registrationSecret:
55
monitoring:
66
enabled: false
77

8-
prometheus-stack:
8+
kube-prometheus-stack:
99
cleanPrometheusOperatorObjectNames: true
1010
defaultRules:
1111
create: true

Diff for: tests/charts/make/chart_release.sh

+7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ on_failure() {
1212
# Trap ERR signal and call on_failure function
1313
trap 'on_failure' ERR
1414

15+
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:]')
16+
helm template oci://registry-1.docker.io/${NAMESPACE}/selenium-grid --version ${latest_chart_version}
17+
if [[ $? -eq 0 ]]; then
18+
echo "Chart version $latest_chart_version is already available in the registry"
19+
exit 0
20+
fi
21+
1522
CHART_PACKAGE_PATH=$(cat /tmp/selenium_chart_version)
1623
if [ -z "${CHART_PACKAGE_PATH}" ] || [ ! -f "${CHART_PACKAGE_PATH}" ]; then
1724
echo "Chart package path is empty. Please trigger chart_build.sh before this script."

0 commit comments

Comments
 (0)