From d17557af41a09cb0c40a9574baebf3594ffafb4f Mon Sep 17 00:00:00 2001
From: Todd Malsbary <todd.malsbary@intel.com>
Date: Mon, 7 Mar 2022 16:26:17 -0800
Subject: [PATCH] Add Istio operator to addons

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I9a2135f49c0946a46e62d0074590bde62d6595ae
---
 deploy/site/cluster-addons/istio-namespace.yaml |  5 +++++
 deploy/site/cluster-addons/istio-operator.yaml  | 21 +++++++++++++++++++++
 deploy/site/cluster-addons/istio-source.yaml    | 16 ++++++++++++++++
 doc/software-bom.md                             |  1 +
 tools/software-bom.sh                           |  1 +
 5 files changed, 44 insertions(+)
 create mode 100644 deploy/site/cluster-addons/istio-namespace.yaml
 create mode 100644 deploy/site/cluster-addons/istio-operator.yaml
 create mode 100644 deploy/site/cluster-addons/istio-source.yaml

diff --git a/deploy/site/cluster-addons/istio-namespace.yaml b/deploy/site/cluster-addons/istio-namespace.yaml
new file mode 100644
index 0000000..60de14f
--- /dev/null
+++ b/deploy/site/cluster-addons/istio-namespace.yaml
@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: istio-system
diff --git a/deploy/site/cluster-addons/istio-operator.yaml b/deploy/site/cluster-addons/istio-operator.yaml
new file mode 100644
index 0000000..6c74bc1
--- /dev/null
+++ b/deploy/site/cluster-addons/istio-operator.yaml
@@ -0,0 +1,21 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: istio-operator
+  namespace: istio-system
+spec:
+  interval: 5m
+  chart:
+    spec:
+      chart: manifests/charts/istio-operator
+      sourceRef:
+        kind: GitRepository
+        name: istio
+      interval: 1m
+  install:
+    remediation:
+      retries: -1
+  upgrade:
+    remediation:
+      retries: -1
diff --git a/deploy/site/cluster-addons/istio-source.yaml b/deploy/site/cluster-addons/istio-source.yaml
new file mode 100644
index 0000000..5ce0336
--- /dev/null
+++ b/deploy/site/cluster-addons/istio-source.yaml
@@ -0,0 +1,16 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: GitRepository
+metadata:
+  name: istio
+  namespace: istio-system
+spec:
+  interval: 1m
+  url: https://github.com/istio/istio.git
+  ref:
+    tag: 1.10.3
+  ignore: |
+    # exclude all
+    /*
+    # include charts directory
+    !/manifests/charts
diff --git a/doc/software-bom.md b/doc/software-bom.md
index 0c94508..33ac57d 100644
--- a/doc/software-bom.md
+++ b/doc/software-bom.md
@@ -30,6 +30,7 @@
 |EMCO|v21.12|
 |Flux|0.27.0|
 |Intel Network Adapter Virtual Function Driver Installer|latest|
+|Istio|1.10.3|
 |Kata Containers|2.3.2|
 |KubeVirt|v0.50.0|
 |Multus|v3.8|
diff --git a/tools/software-bom.sh b/tools/software-bom.sh
index e0e2b73..f39d535 100755
--- a/tools/software-bom.sh
+++ b/tools/software-bom.sh
@@ -107,6 +107,7 @@ function compute_cluster_addons {
 |EMCO|$(git_repository_tag ${ICNDIR}/deploy/site/cluster-emco-management/emco-source.yaml)|
 |Flux|${FLUX_VERSION}|
 |Intel Network Adapter Virtual Function Driver Installer|$(image_tag ${ICNDIR}/deploy/iavf-driver-installer/icn/daemonset.yaml iavf-driver-installer)|
+|Istio|$(git_repository_tag ${ICNDIR}/deploy/site/cluster-addons/istio-source.yaml)|
 |Kata Containers|${KATA_VERSION}|
 |KubeVirt|${KUBEVIRT_VERSION}|
 |Multus|${MULTUS_VERSION}|
-- 
2.16.6