diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml index a74c5b7b8e9b..083e4e2c6a81 100644 --- a/.github/workflows/kind-e2e.yaml +++ b/.github/workflows/kind-e2e.yaml @@ -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 @@ -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 @@ -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 diff --git a/test/config/ytt/ambient/kapp-order.yaml b/test/config/ytt/ambient/kapp-order.yaml index 320e5f6f4628..fdd42d99ca45 100644 --- a/test/config/ytt/ambient/kapp-order.yaml +++ b/test/config/ytt/ambient/kapp-order.yaml @@ -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"