Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various e2e setup tweaks #430

Merged
merged 3 commits into from
Oct 25, 2024
Merged

Various e2e setup tweaks #430

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3eebc3b
bump default test version to latest istio release
SgtCoDFish Oct 25, 2024
a66b216
add command for geting latest istio version in CI
SgtCoDFish Oct 25, 2024
136eeb1
move e2e option up to prevent missing env var warnings
SgtCoDFish Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions make/test-e2e.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ISTIO_VERSION ?= 1.22.2
ISTIO_VERSION ?= 1.23.2
ISTIO_CONFIG_FILE ?= ./make/config/istio/istio-config-default.yaml

.PHONY: print-latest-istio-version
print-latest-istio-version:
@curl -sSL --show-error -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/istio/istio/releases | jq -r '.[].tag_name' | sort -rV | head -n1

$(bin_dir)/scratch/istioctl-$(ISTIO_VERSION): | $(bin_dir)/scratch/
curl -L https://istio.io/downloadIstio | ISTIO_VERSION=$(ISTIO_VERSION) sh -
mv istio-$(ISTIO_VERSION)/bin/istioctl $(bin_dir)/scratch/istioctl-$(ISTIO_VERSION)
Expand Down Expand Up @@ -88,6 +92,7 @@ INSTALL_OPTIONS += -f ./make/config/istio-csr-values.yaml

test-e2e-deps: e2e-setup-cert-manager
test-e2e-deps: e2e-create-cert-manager-istio-resources
test-e2e-deps: ISTIO_INSTALL_OPTIONS :=

test-e2e-deps-sidecars: test-e2e-deps
test-e2e-deps-sidecars: install
Expand All @@ -96,7 +101,6 @@ test-e2e-deps-sidecars: e2e-setup-istio
test-e2e-deps-ambient: test-e2e-deps
test-e2e-deps-ambient: INSTALL_OPTIONS += --set app.server.caTrustedNodeAccounts="istio-system/ztunnel"
test-e2e-deps-ambient: install
test-e2e-deps-ambient: ISTIO_INSTALL_OPTIONS :=
test-e2e-deps-ambient: ISTIO_INSTALL_OPTIONS += --set profile=ambient
test-e2e-deps-ambient: e2e-setup-istio

Expand Down