Skip to content

Commit

Permalink
fix(ci) update test to agree with new defaults
Browse files Browse the repository at this point in the history
Do not set the admin API Service name for tests against the ingress
chart.

5802d40 added a new default for
gatewayDiscovery.generateAdminApiService. This setting is incompatible
with specifying an admin Service name. The test was originally setting
that name and failing, and the commit was merged to main despite.
  • Loading branch information
rainest committed Jul 19, 2023
1 parent ba71522 commit 29ed55a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 4 additions & 1 deletion scripts/test-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ ADDITIONAL_FLAGS=()
# ------------------------------------------------------------------------------
if [[ "${CHART_NAME}" == "ingress" ]]; then
CONTROLLER_PREFIX="controller."
ADDITIONAL_FLAGS+=("--set ${CONTROLLER_PREFIX}ingressController.gatewayDiscovery.adminApiService.name=${RELEASE_NAME}-gateway-admin ")
# this is intentionally a no-op at present. this originally had a set that was
# made obsolete by a values default change. it's now a placeholder showing an
# example modification
# ADDITIONAL_FLAGS+=("<replace with a --set command>")
fi

# ------------------------------------------------------------------------------
Expand Down
5 changes: 4 additions & 1 deletion scripts/test-upgrade.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ ADDITIONAL_FLAGS=()
# ------------------------------------------------------------------------------
if [[ "${CHART_NAME}" == "ingress" ]]; then
CONTROLLER_PREFIX="controller."
ADDITIONAL_FLAGS+=("--set ${CONTROLLER_PREFIX}ingressController.gatewayDiscovery.adminApiService.name=\"${RELEASE_NAME}-gateway-admin\" ")
# this is intentionally a no-op at present. this originally had a set that was
# made obsolete by a values default change. it's now a placeholder showing an
# example modification
# ADDITIONAL_FLAGS+=("<replace with a --set command>")
fi

# ------------------------------------------------------------------------------
Expand Down

0 comments on commit 29ed55a

Please sign in to comment.