Add ambient

knative · Jun 16, 2023 · bb55704 · bb55704
1 parent 3a6c2b6
commit bb55704
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/test/config/ytt/ambient/istio-injection.yaml b/test/config/ytt/ambient/istio-injection.yaml
@@ -0,0 +1,24 @@
+#@ load("@ytt:overlay", "overlay")
+#@ load("@ytt:data", "data")
+#@ load("helpers.lib.yaml", "subset")
+
+#@ def namespaces():
+#@   names = [
+#@    data.values.serving.namespaces.system,
+#@    data.values.serving.namespaces.test.default,
+#@    data.values.serving.namespaces.test.alternate,
+#@    data.values.serving.namespaces.test.tls,
+#@   ]
+#@   matches = []
+#@   for name in names:
+#@     matches.append(subset(name=name, kind="Namespace"))
+#@   end
+#@   return overlay.or_op(*matches)
+#@ end
+
+#@overlay/match by=namespaces(), expects="1+"
+---
+#@overlay/match-child-defaults missing_ok=True
+metadata:
+  labels:
+    istio.io/dataplane-mode: amabient
diff --git a/test/e2e-common.sh b/test/e2e-common.sh
@@ -128,6 +128,9 @@ function parse_flags() {
       ;;
     --no-mesh)
       readonly MESH=0
+      # DO_NOT_SUBMIT:
+      # Just a demonstration now. Enable AMBIENT on no-mesh.
+      readonly AMBIENT=1
       return 1
       ;;
     --perf)
@@ -301,6 +304,10 @@ function install() {
     YTT_FILES+=("${REPO_ROOT_DIR}/test/config/ytt/mesh")
   fi
 
+  if (( AMBIENT )); then
+    YTT_FILES+=("${REPO_ROOT_DIR}/test/config/ytt/ambient")
+  fi
+
   if (( ENABLE_HA )); then
     YTT_FILES+=("${E2E_YAML_DIR}/test/config/chaosduck/chaosduck.yaml")
     YTT_FILES+=("${REPO_ROOT_DIR}/test/config/ytt/ha")

diff --git a/test/e2e-networking-library.sh b/test/e2e-networking-library.sh
@@ -80,7 +80,7 @@ function download_net_istio_yamls() {
     echo "Got NET_ISTIO_COMMIT from ${1}: ${sha}"
   fi
 
-  local istio_yaml="$(net_istio_file_url "$sha" istio.yaml)"
+  local istio_yaml="https://raw.githubusercontent.com/nak3/net-istio/add-ambient-3/third_party/istio-latest/istio-kind-ambient/istio.yaml"
   local istio_config_yaml="$(net_istio_file_url "$sha" config-istio.yaml)"
 
   wget -P "${target_dir}" "${istio_yaml}" \