Skip to content

Commit

Permalink
chart(fix): Remove alias from sub-chart to prevent render issue in ot…
Browse files Browse the repository at this point in the history
…her CD tools

Signed-off-by: Viet Nguyen Duc <[email protected]>
  • Loading branch information
VietND96 committed Aug 20, 2024
1 parent 838f721 commit 9106ba1
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ workflows:
name: "K8s test - Autoscaling Jobs - HTTPS"
platforms: linux/arm64
machine-type: ubuntu2204arm64large
k8s-version: 'v1.28.12'
k8s-version: 'v1.28.13'
test-strategy: job_https
cluster: 'minikube'
helm-version: 'v3.13.3'
Expand All @@ -43,7 +43,7 @@ workflows:
name: "K8s test - Autoscaling Jobs - Ingress hostname"
platforms: linux/arm64
machine-type: ubuntu2204arm64large
k8s-version: 'v1.29.7'
k8s-version: 'v1.29.8'
test-strategy: job_hostname
cluster: 'minikube'
helm-version: 'v3.14.4'
Expand All @@ -52,10 +52,10 @@ workflows:
name: "K8s test - Autoscaling Deployments - HTTPS"
platforms: linux/arm64
machine-type: ubuntu2204arm64large
k8s-version: 'v1.30.3'
k8s-version: 'v1.30.4'
test-strategy: deployment_https
cluster: 'minikube'
helm-version: 'v3.15.3'
helm-version: 'v3.15.4'
test-upgrade: true
- docker-test:
name: "Docker test - Use random user (true)"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/helm-chart-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,20 @@ jobs:
cluster: 'minikube'
helm-version: 'v3.12.3'
test-upgrade: true
- k8s-version: 'v1.28.12'
- k8s-version: 'v1.28.13'
test-strategy: job_https
cluster: 'minikube'
helm-version: 'v3.13.3'
test-upgrade: true
- k8s-version: 'v1.29.7'
- k8s-version: 'v1.29.8'
test-strategy: job_hostname
cluster: 'minikube'
helm-version: 'v3.14.4'
test-upgrade: true
- k8s-version: 'v1.30.3'
- k8s-version: 'v1.30.4'
test-strategy: deployment_https
cluster: 'minikube'
helm-version: 'v3.15.3'
helm-version: 'v3.15.4'
test-upgrade: true
env:
CLUSTER: ${{ matrix.cluster }}
Expand Down
1 change: 0 additions & 1 deletion charts/selenium-grid/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ dependencies:
- repository: https://prometheus-community.github.io/helm-charts
version: 61.8.0
name: kube-prometheus-stack
alias: prometheus-stack
condition: monitoring.enabled, prometheus-stack.enabled
maintainers:
- name: SeleniumHQ
Expand Down
2 changes: 1 addition & 1 deletion charts/selenium-grid/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ ingress-nginx:
admissionWebhooks:
enabled: false

prometheus-stack:
kube-prometheus-stack:
# enabled: false
cleanPrometheusOperatorObjectNames: true

Expand Down
2 changes: 1 addition & 1 deletion tests/charts/ci/base-tls-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ registrationSecret:
monitoring:
enabled: false

prometheus-stack:
kube-prometheus-stack:
cleanPrometheusOperatorObjectNames: true
defaultRules:
create: true
Expand Down
7 changes: 7 additions & 0 deletions tests/charts/make/chart_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ on_failure() {
# Trap ERR signal and call on_failure function
trap 'on_failure' ERR

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:]')
helm template oci://registry-1.docker.io/${NAMESPACE}/selenium-grid --version ${latest_chart_version}
if [[ $? -eq 0 ]]; then
echo "Chart version $latest_chart_version is already available in the registry"
exit 0
fi

CHART_PACKAGE_PATH=$(cat /tmp/selenium_chart_version)
if [ -z "${CHART_PACKAGE_PATH}" ] || [ ! -f "${CHART_PACKAGE_PATH}" ]; then
echo "Chart package path is empty. Please trigger chart_build.sh before this script."
Expand Down

0 comments on commit 9106ba1

Please sign in to comment.