Code Review
/
icn.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e554714
)
Refactor cluster-icn to separate EMCO components
19/4719/1
author
Todd Malsbary
<todd.malsbary@intel.com>
Tue, 8 Mar 2022 00:23:54 +0000
(16:23 -0800)
committer
Todd Malsbary
<todd.malsbary@intel.com>
Tue, 8 Mar 2022 00:26:30 +0000
(16:26 -0800)
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I9b7e0e35fa625bb6c312dfbc1dbe0812ed602b37
37 files changed:
deploy/site/cluster-addons/.sops.yaml
[moved from
deploy/site/cluster-icn/.sops.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/cdi-operator.yaml
[moved from
deploy/site/cluster-icn/cdi-operator.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/cdi.yaml
[moved from
deploy/site/cluster-icn/cdi.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/cert-manager.yaml
[moved from
deploy/site/cluster-icn/cert-manager.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/cpu-manager.yaml
[moved from
deploy/site/cluster-icn/cpu-manager.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/flux-system/gotk-components.yaml
[moved from
deploy/site/cluster-icn/flux-system/gotk-components.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/flux-system/kustomization.yaml
[moved from
deploy/site/cluster-icn/flux-system/kustomization.yaml
with 96% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/flux-system/run-as-user-patch.json
[moved from
deploy/site/cluster-icn/flux-system/run-as-user-patch.json
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/iavf-driver-installer.yaml
[moved from
deploy/site/cluster-icn/iavf-driver-installer.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/kata.yaml
[moved from
deploy/site/cluster-icn/kata.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/kubevirt-operator.yaml
[moved from
deploy/site/cluster-icn/kubevirt-operator.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/kubevirt.yaml
[moved from
deploy/site/cluster-icn/kubevirt.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/kud-namespace.yaml
[moved from
deploy/site/cluster-icn/kud-namespace.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/kud-podsecurity.yaml
[moved from
deploy/site/cluster-icn/kud-podsecurity.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/multus-cni.yaml
[moved from
deploy/site/cluster-icn/multus-cni.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/node-feature-discovery.yaml
[moved from
deploy/site/cluster-icn/node-feature-discovery.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/nodus-network.yaml
[moved from
deploy/site/cluster-icn/nodus-network.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/nodus.yaml
[moved from
deploy/site/cluster-icn/nodus.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/qat-driver-installer.yaml
[moved from
deploy/site/cluster-icn/qat-driver-installer.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/qat-plugin.yaml
[moved from
deploy/site/cluster-icn/qat-plugin.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/sops.pub.asc
[moved from
deploy/site/cluster-icn/sops.pub.asc
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/sriov-network-operator.yaml
[moved from
deploy/site/cluster-icn/sriov-network-operator.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-addons/sriov-network.yaml
[moved from
deploy/site/cluster-icn/sriov-network.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-emco-compute/emco-monitor.yaml
[moved from
deploy/site/cluster-icn/emco-monitor.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-emco-compute/emco-namespace.yaml
[moved from
deploy/site/cluster-icn/emco-namespace.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-emco-compute/emco-source.yaml
[moved from
deploy/site/cluster-icn/emco-source.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-emco-management/emco-db.yaml
[moved from
deploy/site/cluster-icn/emco-db.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-emco-management/emco-namespace.yaml
[new file with mode: 0644]
patch
|
blob
deploy/site/cluster-emco-management/emco-podsecurity.yaml
[moved from
deploy/site/cluster-icn/emco-podsecurity.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-emco-management/emco-services.yaml
[moved from
deploy/site/cluster-icn/emco-services.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-emco-management/emco-source.yaml
[new file with mode: 0644]
patch
|
blob
deploy/site/cluster-emco-management/emco-tools.yaml
[moved from
deploy/site/cluster-icn/emco-tools.yaml
with 100% similarity]
patch
|
blob
|
history
deploy/site/cluster-icn/addons.yaml
[new file with mode: 0644]
patch
|
blob
deploy/site/cluster-icn/emco-compute.yaml
[new file with mode: 0644]
patch
|
blob
deploy/site/cluster-icn/emco-management.yaml
[new file with mode: 0644]
patch
|
blob
deploy/site/cluster-icn/gotk-sync.yaml
[moved from
deploy/site/cluster-icn/flux-system/gotk-sync.yaml
with 75% similarity]
patch
|
blob
|
history
tools/software-bom.sh
patch
|
blob
|
history
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
(file)
--- 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
resources:
- gotk-components.yaml
-- gotk-sync.yaml
patchesJson6902:
- path: run-as-user-patch.json
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
(file)
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
(file)
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
(file)
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
(file)
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
(file)
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
(file)
--- 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:
apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
kind: Kustomization
metadata:
- name: icn-flux-sync
+ name:
cluster-
icn-flux-sync
namespace: flux-system
spec:
interval: 10m0s
namespace: flux-system
spec:
interval: 10m0s
- path:
./
deploy/site/cluster-icn
+ path: deploy/site/cluster-icn
prune: true
sourceRef:
kind: GitRepository
name: 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
(executable)
--- 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}|
|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}|
|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}|