Skip to content

WIP: Enable Istio ambient e2e tests #15942

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.

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 8 additions & 9 deletions .github/workflows/kind-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ jobs:
- kourier-tls
- istio
- istio-tls
# Disabled due to flakiness: https://github.com/knative/serving/issues/14637
# - istio-ambient
- istio-ambient
- contour
- gateway_istio
- gateway_contour
Expand Down Expand Up @@ -124,11 +123,11 @@ jobs:
namespace-resources: virtualservices
enable-tls: 1

# Disabled due to flakiness: https://github.com/knative/serving/issues/14637
# - ingress: istio-ambient
# namespace-resources: virtualservices
# ingress-class: istio
# ambient: 1
# TODO investigate flakiness: https://github.com/knative/serving/issues/14637
- ingress: istio-ambient
namespace-resources: virtualservices
ingress-class: istio
ambient: 1

- ingress: kourier-tls
ingress-class: kourier
Expand All @@ -148,8 +147,8 @@ jobs:
INGRESS_CLASS: ${{ matrix.ingress-class || matrix.ingress }}.ingress.networking.knative.dev
GATEWAY_API_IMPLEMENTATION: ${{ matrix.gateway-api-implementation }}
ENABLE_TLS: ${{ matrix.enable-tls || 0 }}
# Disabled due to flakiness: https://github.com/knative/serving/issues/14637
# AMBIENT: ${{ matrix.ambient || 0 }}
# TODO investigate flakiness: https://github.com/knative/serving/issues/14637
AMBIENT: ${{ matrix.ambient || 0 }}

steps:
- name: setup-go
Expand Down
40 changes: 20 additions & 20 deletions test/config/ytt/ambient/kapp-order.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
#! ztunnel have to be deployed before istio-cni-node.
#! TODO: Remove this ordering if https://github.com/istio/istio/issues/45781 was solved.

#@ load("@ytt:overlay", "overlay")
#@ load("helpers.lib.yaml", "subset", "label_subset")

#@overlay/match by=subset(kind="DaemonSet", name="ztunnel"), expects="1+"
---
metadata:
#@overlay/match missing_ok=True
annotations:
#@overlay/match missing_ok=True
kapp.k14s.io/change-group: "ztunnel"

#@overlay/match by=subset(kind="DaemonSet", name="istio-cni-node"), expects="1+"
---
metadata:
#@overlay/match missing_ok=True
#@overlay/match-child-defaults missing_ok=True
annotations:
kapp.k14s.io/change-group: "istio-cni-node"
kapp.k14s.io/change-rule: "upsert after upserting ztunnel"
#
##@ load("@ytt:overlay", "overlay")
##@ load("helpers.lib.yaml", "subset", "label_subset")
#
##@overlay/match by=subset(kind="DaemonSet", name="ztunnel"), expects="1+"
#---
#metadata:
# #@overlay/match missing_ok=True
# annotations:
# #@overlay/match missing_ok=True
# kapp.k14s.io/change-group: "ztunnel"
#
##@overlay/match by=subset(kind="DaemonSet", name="istio-cni-node"), expects="1+"
#---
#metadata:
# #@overlay/match missing_ok=True
# #@overlay/match-child-defaults missing_ok=True
# annotations:
# kapp.k14s.io/change-group: "istio-cni-node"
# kapp.k14s.io/change-rule: "upsert after upserting ztunnel"
Loading