From 74aaca5c4079b78780622b14404abf9d28fd676c Mon Sep 17 00:00:00 2001
From: Todd Malsbary <todd.malsbary@intel.com>
Date: Mon, 7 Mar 2022 16:23:54 -0800
Subject: [PATCH] Refactor cluster-icn to separate EMCO components

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I9b7e0e35fa625bb6c312dfbc1dbe0812ed602b37
---
 .../site/{cluster-icn => cluster-addons}/.sops.yaml   |  0
 .../{cluster-icn => cluster-addons}/cdi-operator.yaml |  0
 deploy/site/{cluster-icn => cluster-addons}/cdi.yaml  |  0
 .../{cluster-icn => cluster-addons}/cert-manager.yaml |  0
 .../{cluster-icn => cluster-addons}/cpu-manager.yaml  |  0
 .../flux-system/gotk-components.yaml                  |  0
 .../flux-system/kustomization.yaml                    |  1 -
 .../flux-system/run-as-user-patch.json                |  0
 .../iavf-driver-installer.yaml                        |  0
 deploy/site/{cluster-icn => cluster-addons}/kata.yaml |  0
 .../kubevirt-operator.yaml                            |  0
 .../{cluster-icn => cluster-addons}/kubevirt.yaml     |  0
 .../kud-namespace.yaml                                |  0
 .../kud-podsecurity.yaml                              |  0
 .../{cluster-icn => cluster-addons}/multus-cni.yaml   |  0
 .../node-feature-discovery.yaml                       |  0
 .../nodus-network.yaml                                |  0
 .../site/{cluster-icn => cluster-addons}/nodus.yaml   |  0
 .../qat-driver-installer.yaml                         |  0
 .../{cluster-icn => cluster-addons}/qat-plugin.yaml   |  0
 .../site/{cluster-icn => cluster-addons}/sops.pub.asc |  0
 .../sriov-network-operator.yaml                       |  0
 .../sriov-network.yaml                                |  0
 .../emco-monitor.yaml                                 |  0
 .../emco-namespace.yaml                               |  0
 .../emco-source.yaml                                  |  0
 .../emco-db.yaml                                      |  0
 .../site/cluster-emco-management/emco-namespace.yaml  |  5 +++++
 .../emco-podsecurity.yaml                             |  0
 .../emco-services.yaml                                |  0
 deploy/site/cluster-emco-management/emco-source.yaml  | 16 ++++++++++++++++
 .../emco-tools.yaml                                   |  0
 deploy/site/cluster-icn/addons.yaml                   | 15 +++++++++++++++
 deploy/site/cluster-icn/emco-compute.yaml             | 15 +++++++++++++++
 deploy/site/cluster-icn/emco-management.yaml          | 19 +++++++++++++++++++
 .../site/cluster-icn/{flux-system => }/gotk-sync.yaml |  8 ++++++--
 tools/software-bom.sh                                 |  2 +-
 37 files changed, 77 insertions(+), 4 deletions(-)
 rename deploy/site/{cluster-icn => cluster-addons}/.sops.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/cdi-operator.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/cdi.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/cert-manager.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/cpu-manager.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/flux-system/gotk-components.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/flux-system/kustomization.yaml (96%)
 rename deploy/site/{cluster-icn => cluster-addons}/flux-system/run-as-user-patch.json (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/iavf-driver-installer.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/kata.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/kubevirt-operator.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/kubevirt.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/kud-namespace.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/kud-podsecurity.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/multus-cni.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/node-feature-discovery.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/nodus-network.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/nodus.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/qat-driver-installer.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/qat-plugin.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/sops.pub.asc (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/sriov-network-operator.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-addons}/sriov-network.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-emco-compute}/emco-monitor.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-emco-compute}/emco-namespace.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-emco-compute}/emco-source.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-emco-management}/emco-db.yaml (100%)
 create mode 100644 deploy/site/cluster-emco-management/emco-namespace.yaml
 rename deploy/site/{cluster-icn => cluster-emco-management}/emco-podsecurity.yaml (100%)
 rename deploy/site/{cluster-icn => cluster-emco-management}/emco-services.yaml (100%)
 create mode 100644 deploy/site/cluster-emco-management/emco-source.yaml
 rename deploy/site/{cluster-icn => cluster-emco-management}/emco-tools.yaml (100%)
 create mode 100644 deploy/site/cluster-icn/addons.yaml
 create mode 100644 deploy/site/cluster-icn/emco-compute.yaml
 create mode 100644 deploy/site/cluster-icn/emco-management.yaml
 rename deploy/site/cluster-icn/{flux-system => }/gotk-sync.yaml (75%)

diff --git a/deploy/site/cluster-icn/.sops.yaml b/deploy/site/cluster-addons/.sops.yaml
similarity index 100%
rename from deploy/site/cluster-icn/.sops.yaml
rename to deploy/site/cluster-addons/.sops.yaml
diff --git a/deploy/site/cluster-icn/cdi-operator.yaml b/deploy/site/cluster-addons/cdi-operator.yaml
similarity index 100%
rename from deploy/site/cluster-icn/cdi-operator.yaml
rename to deploy/site/cluster-addons/cdi-operator.yaml
diff --git a/deploy/site/cluster-icn/cdi.yaml b/deploy/site/cluster-addons/cdi.yaml
similarity index 100%
rename from deploy/site/cluster-icn/cdi.yaml
rename to deploy/site/cluster-addons/cdi.yaml
diff --git a/deploy/site/cluster-icn/cert-manager.yaml b/deploy/site/cluster-addons/cert-manager.yaml
similarity index 100%
rename from deploy/site/cluster-icn/cert-manager.yaml
rename to deploy/site/cluster-addons/cert-manager.yaml
diff --git a/deploy/site/cluster-icn/cpu-manager.yaml b/deploy/site/cluster-addons/cpu-manager.yaml
similarity index 100%
rename from deploy/site/cluster-icn/cpu-manager.yaml
rename to deploy/site/cluster-addons/cpu-manager.yaml
diff --git a/deploy/site/cluster-icn/flux-system/gotk-components.yaml b/deploy/site/cluster-addons/flux-system/gotk-components.yaml
similarity index 100%
rename from deploy/site/cluster-icn/flux-system/gotk-components.yaml
rename to deploy/site/cluster-addons/flux-system/gotk-components.yaml
diff --git a/deploy/site/cluster-icn/flux-system/kustomization.yaml b/deploy/site/cluster-addons/flux-system/kustomization.yaml
similarity index 96%
rename from deploy/site/cluster-icn/flux-system/kustomization.yaml
rename to deploy/site/cluster-addons/flux-system/kustomization.yaml
index 0ef2fc9..8c3818f 100644
--- a/deploy/site/cluster-icn/flux-system/kustomization.yaml
+++ b/deploy/site/cluster-addons/flux-system/kustomization.yaml
@@ -3,7 +3,6 @@ kind: Kustomization
 
 resources:
 - gotk-components.yaml
-- gotk-sync.yaml
 
 patchesJson6902:
 - path: run-as-user-patch.json
diff --git a/deploy/site/cluster-icn/flux-system/run-as-user-patch.json b/deploy/site/cluster-addons/flux-system/run-as-user-patch.json
similarity index 100%
rename from deploy/site/cluster-icn/flux-system/run-as-user-patch.json
rename to deploy/site/cluster-addons/flux-system/run-as-user-patch.json
diff --git a/deploy/site/cluster-icn/iavf-driver-installer.yaml b/deploy/site/cluster-addons/iavf-driver-installer.yaml
similarity index 100%
rename from deploy/site/cluster-icn/iavf-driver-installer.yaml
rename to deploy/site/cluster-addons/iavf-driver-installer.yaml
diff --git a/deploy/site/cluster-icn/kata.yaml b/deploy/site/cluster-addons/kata.yaml
similarity index 100%
rename from deploy/site/cluster-icn/kata.yaml
rename to deploy/site/cluster-addons/kata.yaml
diff --git a/deploy/site/cluster-icn/kubevirt-operator.yaml b/deploy/site/cluster-addons/kubevirt-operator.yaml
similarity index 100%
rename from deploy/site/cluster-icn/kubevirt-operator.yaml
rename to deploy/site/cluster-addons/kubevirt-operator.yaml
diff --git a/deploy/site/cluster-icn/kubevirt.yaml b/deploy/site/cluster-addons/kubevirt.yaml
similarity index 100%
rename from deploy/site/cluster-icn/kubevirt.yaml
rename to deploy/site/cluster-addons/kubevirt.yaml
diff --git a/deploy/site/cluster-icn/kud-namespace.yaml b/deploy/site/cluster-addons/kud-namespace.yaml
similarity index 100%
rename from deploy/site/cluster-icn/kud-namespace.yaml
rename to deploy/site/cluster-addons/kud-namespace.yaml
diff --git a/deploy/site/cluster-icn/kud-podsecurity.yaml b/deploy/site/cluster-addons/kud-podsecurity.yaml
similarity index 100%
rename from deploy/site/cluster-icn/kud-podsecurity.yaml
rename to deploy/site/cluster-addons/kud-podsecurity.yaml
diff --git a/deploy/site/cluster-icn/multus-cni.yaml b/deploy/site/cluster-addons/multus-cni.yaml
similarity index 100%
rename from deploy/site/cluster-icn/multus-cni.yaml
rename to deploy/site/cluster-addons/multus-cni.yaml
diff --git a/deploy/site/cluster-icn/node-feature-discovery.yaml b/deploy/site/cluster-addons/node-feature-discovery.yaml
similarity index 100%
rename from deploy/site/cluster-icn/node-feature-discovery.yaml
rename to deploy/site/cluster-addons/node-feature-discovery.yaml
diff --git a/deploy/site/cluster-icn/nodus-network.yaml b/deploy/site/cluster-addons/nodus-network.yaml
similarity index 100%
rename from deploy/site/cluster-icn/nodus-network.yaml
rename to deploy/site/cluster-addons/nodus-network.yaml
diff --git a/deploy/site/cluster-icn/nodus.yaml b/deploy/site/cluster-addons/nodus.yaml
similarity index 100%
rename from deploy/site/cluster-icn/nodus.yaml
rename to deploy/site/cluster-addons/nodus.yaml
diff --git a/deploy/site/cluster-icn/qat-driver-installer.yaml b/deploy/site/cluster-addons/qat-driver-installer.yaml
similarity index 100%
rename from deploy/site/cluster-icn/qat-driver-installer.yaml
rename to deploy/site/cluster-addons/qat-driver-installer.yaml
diff --git a/deploy/site/cluster-icn/qat-plugin.yaml b/deploy/site/cluster-addons/qat-plugin.yaml
similarity index 100%
rename from deploy/site/cluster-icn/qat-plugin.yaml
rename to deploy/site/cluster-addons/qat-plugin.yaml
diff --git a/deploy/site/cluster-icn/sops.pub.asc b/deploy/site/cluster-addons/sops.pub.asc
similarity index 100%
rename from deploy/site/cluster-icn/sops.pub.asc
rename to deploy/site/cluster-addons/sops.pub.asc
diff --git a/deploy/site/cluster-icn/sriov-network-operator.yaml b/deploy/site/cluster-addons/sriov-network-operator.yaml
similarity index 100%
rename from deploy/site/cluster-icn/sriov-network-operator.yaml
rename to deploy/site/cluster-addons/sriov-network-operator.yaml
diff --git a/deploy/site/cluster-icn/sriov-network.yaml b/deploy/site/cluster-addons/sriov-network.yaml
similarity index 100%
rename from deploy/site/cluster-icn/sriov-network.yaml
rename to deploy/site/cluster-addons/sriov-network.yaml
diff --git a/deploy/site/cluster-icn/emco-monitor.yaml b/deploy/site/cluster-emco-compute/emco-monitor.yaml
similarity index 100%
rename from deploy/site/cluster-icn/emco-monitor.yaml
rename to deploy/site/cluster-emco-compute/emco-monitor.yaml
diff --git a/deploy/site/cluster-icn/emco-namespace.yaml b/deploy/site/cluster-emco-compute/emco-namespace.yaml
similarity index 100%
rename from deploy/site/cluster-icn/emco-namespace.yaml
rename to deploy/site/cluster-emco-compute/emco-namespace.yaml
diff --git a/deploy/site/cluster-icn/emco-source.yaml b/deploy/site/cluster-emco-compute/emco-source.yaml
similarity index 100%
rename from deploy/site/cluster-icn/emco-source.yaml
rename to deploy/site/cluster-emco-compute/emco-source.yaml
diff --git a/deploy/site/cluster-icn/emco-db.yaml b/deploy/site/cluster-emco-management/emco-db.yaml
similarity index 100%
rename from deploy/site/cluster-icn/emco-db.yaml
rename to deploy/site/cluster-emco-management/emco-db.yaml
diff --git a/deploy/site/cluster-emco-management/emco-namespace.yaml b/deploy/site/cluster-emco-management/emco-namespace.yaml
new file mode 100644
index 0000000..6b83b1c
--- /dev/null
+++ b/deploy/site/cluster-emco-management/emco-namespace.yaml
@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: emco
diff --git a/deploy/site/cluster-icn/emco-podsecurity.yaml b/deploy/site/cluster-emco-management/emco-podsecurity.yaml
similarity index 100%
rename from deploy/site/cluster-icn/emco-podsecurity.yaml
rename to deploy/site/cluster-emco-management/emco-podsecurity.yaml
diff --git a/deploy/site/cluster-icn/emco-services.yaml b/deploy/site/cluster-emco-management/emco-services.yaml
similarity index 100%
rename from deploy/site/cluster-icn/emco-services.yaml
rename to deploy/site/cluster-emco-management/emco-services.yaml
diff --git a/deploy/site/cluster-emco-management/emco-source.yaml b/deploy/site/cluster-emco-management/emco-source.yaml
new file mode 100644
index 0000000..f6652aa
--- /dev/null
+++ b/deploy/site/cluster-emco-management/emco-source.yaml
@@ -0,0 +1,16 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: GitRepository
+metadata:
+  name: emco
+  namespace: emco
+spec:
+  interval: 1m
+  url: https://gitlab.com/project-emco/core/emco-base.git
+  ref:
+    tag: v21.12
+  ignore: |
+    # exclude all
+    /*
+    # include charts directory
+    !/deployments/helm
diff --git a/deploy/site/cluster-icn/emco-tools.yaml b/deploy/site/cluster-emco-management/emco-tools.yaml
similarity index 100%
rename from deploy/site/cluster-icn/emco-tools.yaml
rename to deploy/site/cluster-emco-management/emco-tools.yaml
diff --git a/deploy/site/cluster-icn/addons.yaml b/deploy/site/cluster-icn/addons.yaml
new file mode 100644
index 0000000..170028a
--- /dev/null
+++ b/deploy/site/cluster-icn/addons.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+kind: Kustomization
+metadata:
+  name: addons
+  namespace: flux-system
+spec:
+  interval: 5m
+  path: deploy/site/cluster-addons
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: icn
+  wait: true
+  timeout: 10m
diff --git a/deploy/site/cluster-icn/emco-compute.yaml b/deploy/site/cluster-icn/emco-compute.yaml
new file mode 100644
index 0000000..4b97d14
--- /dev/null
+++ b/deploy/site/cluster-icn/emco-compute.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+kind: Kustomization
+metadata:
+  name: emco-compute
+  namespace: flux-system
+spec:
+  interval: 5m
+  path: deploy/site/cluster-emco-compute
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: icn
+  wait: true
+  timeout: 10m
diff --git a/deploy/site/cluster-icn/emco-management.yaml b/deploy/site/cluster-icn/emco-management.yaml
new file mode 100644
index 0000000..28866df
--- /dev/null
+++ b/deploy/site/cluster-icn/emco-management.yaml
@@ -0,0 +1,19 @@
+---
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+kind: Kustomization
+metadata:
+  name: emco-management
+  namespace: flux-system
+spec:
+  decryption:
+    provider: sops
+    secretRef:
+      name: icn-master-sops-gpg
+  interval: 5m
+  path: deploy/site/cluster-emco-management
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: icn
+  wait: true
+  timeout: 10m
diff --git a/deploy/site/cluster-icn/flux-system/gotk-sync.yaml b/deploy/site/cluster-icn/gotk-sync.yaml
similarity index 75%
rename from deploy/site/cluster-icn/flux-system/gotk-sync.yaml
rename to deploy/site/cluster-icn/gotk-sync.yaml
index 37287d3..ead2a42 100644
--- a/deploy/site/cluster-icn/flux-system/gotk-sync.yaml
+++ b/deploy/site/cluster-icn/gotk-sync.yaml
@@ -15,12 +15,16 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
-  name: icn-flux-sync
+  name: cluster-icn-flux-sync
   namespace: flux-system
 spec:
   interval: 10m0s
-  path: ./deploy/site/cluster-icn
+  path: deploy/site/cluster-icn
   prune: true
   sourceRef:
     kind: GitRepository
     name: icn
+  decryption:
+    provider: sops
+    secretRef:
+      name: icn-master-sops-gpg
diff --git a/tools/software-bom.sh b/tools/software-bom.sh
index fb8f996..e0e2b73 100755
--- a/tools/software-bom.sh
+++ b/tools/software-bom.sh
@@ -104,7 +104,7 @@ function compute_cluster_addons {
 |Containerized Data Importer|${CDI_VERSION}|
 |cert-manager|${CERT_MANAGER_VERSION}|
 |CPU Manager for Kubernetes|${CPU_MANAGER_VERSION}|
-|EMCO|$(git_repository_tag ${ICNDIR}/deploy/site/cluster-icn/emco-source.yaml)|
+|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)|
 |Kata Containers|${KATA_VERSION}|
-- 
2.16.6