Merge "Fix cluster chart for single-node cluster"

diff --git a/deploy/cluster/templates/kubeadmcontrolplane.yaml b/deploy/cluster/templates/kubeadmcontrolplane.yaml
index 37fdb0f..a17e95b 100644 (file)
--- a/deploy/cluster/templates/kubeadmcontrolplane.yaml
+++ b/deploy/cluster/templates/kubeadmcontrolplane.yaml
@@ -22,6 +22,9 @@ spec:
       nodeRegistration:
         kubeletExtraArgs:
           node-labels: metal3.io/uuid={{ "{{" }} ds.meta_data.uuid {{ "}}" }}
+          cpu-manager-policy: static
+          topology-manager-policy: best-effort
+          kube-reserved: cpu=200m,memory=512Mi
         name: '{{ "{{" }} ds.meta_data.name {{ "}}" }}'
     preKubeadmCommands:
 {{- if .Values.networks }}

diff --git a/deploy/site/vm/e2etest/cdi-operator-release.yaml b/deploy/site/vm/e2etest/cdi-operator-release.yaml
index acef817..f9e0064 100644 (file)
--- a/deploy/site/vm/e2etest/cdi-operator-release.yaml
+++ b/deploy/site/vm/e2etest/cdi-operator-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: cdi-operator
-  namespace: flux-system
+  namespace: kud
 spec:
   interval: 5m
   chart:
@@ -12,11 +12,6 @@ spec:
       sourceRef:
         kind: GitRepository
         name: kud
-        namespace: flux-system
       interval: 1m
-  releaseName: cdi-operator
-  targetNamespace: kud
-  install:
-    createNamespace: true
   dependsOn:
-  - name: kud-podsecurity
+  - name: podsecurity

diff --git a/deploy/site/vm/e2etest/cdi-release.yaml b/deploy/site/vm/e2etest/cdi-release.yaml
index a07ef44..01c04d3 100644 (file)
--- a/deploy/site/vm/e2etest/cdi-release.yaml
+++ b/deploy/site/vm/e2etest/cdi-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: cdi
-  namespace: flux-system
+  namespace: kud
 spec:
   interval: 5m
   chart:
@@ -12,11 +12,6 @@ spec:
       sourceRef:
         kind: GitRepository
         name: kud
-        namespace: flux-system
       interval: 1m
-  releaseName: cdi
-  targetNamespace: kud
-  install:
-    createNamespace: true
   dependsOn:
   - name: cdi-operator

diff --git a/deploy/site/vm/e2etest/cpu-manager-release.yaml b/deploy/site/vm/e2etest/cpu-manager-release.yaml
index 5ac0e43..007fef6 100644 (file)
--- a/deploy/site/vm/e2etest/cpu-manager-release.yaml
+++ b/deploy/site/vm/e2etest/cpu-manager-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: cpu-manager
-  namespace: flux-system
+  namespace: kud
 spec:
   interval: 5m
   chart:
@@ -12,11 +12,6 @@ spec:
       sourceRef:
         kind: GitRepository
         name: kud
-        namespace: flux-system
       interval: 1m
-  releaseName: cpu-manager
-  targetNamespace: kud
-  install:
-    createNamespace: true
   dependsOn:
-  - name: kud-podsecurity
+  - name: podsecurity

diff --git a/deploy/site/vm/e2etest/emco-db-release.yaml b/deploy/site/vm/e2etest/emco-db-release.yaml
index 8f15512..060c82a 100644 (file)
--- a/deploy/site/vm/e2etest/emco-db-release.yaml
+++ b/deploy/site/vm/e2etest/emco-db-release.yaml
@@ -2,8 +2,8 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: emco-db
-  namespace: flux-system
+  name: db
+  namespace: emco
 spec:
   interval: 5m
   chart:
@@ -12,14 +12,9 @@ spec:
       sourceRef:
         kind: GitRepository
         name: emco
-        namespace: flux-system
       interval: 1m
-  releaseName: db
-  targetNamespace: emco
-  install:
-    createNamespace: true
   dependsOn:
-  - name: emco-podsecurity
+  - name: podsecurity
   values:
     global:
       repository: integratedcloudnative/

diff --git a/deploy/site/vm/e2etest/emco-monitor-release.yaml b/deploy/site/vm/e2etest/emco-monitor-release.yaml
index 3fa7b85..21968aa 100644 (file)
--- a/deploy/site/vm/e2etest/emco-monitor-release.yaml
+++ b/deploy/site/vm/e2etest/emco-monitor-release.yaml
@@ -2,8 +2,8 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: emco-monitor
-  namespace: flux-system
+  name: monitor
+  namespace: emco
 spec:
   interval: 5m
   chart:
@@ -12,12 +12,7 @@ spec:
       sourceRef:
         kind: GitRepository
         name: emco
-        namespace: flux-system
       interval: 1m
-  releaseName: monitor
-  targetNamespace: emco
-  install:
-    createNamespace: true
   values:
     registryPrefix: integratedcloudnative/
     tag: openness-21.03.06

diff --git a/deploy/site/vm/e2etest/emco-namespace.yaml b/deploy/site/vm/e2etest/emco-namespace.yaml
new file mode 100644 (file)
index 0000000..6b83b1c
--- /dev/null
+++ b/deploy/site/vm/e2etest/emco-namespace.yaml
@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: emco

diff --git a/deploy/site/vm/e2etest/emco-podsecurity-release.yaml b/deploy/site/vm/e2etest/emco-podsecurity-release.yaml
index 20c6c20..49001eb 100644 (file)
--- a/deploy/site/vm/e2etest/emco-podsecurity-release.yaml
+++ b/deploy/site/vm/e2etest/emco-podsecurity-release.yaml
@@ -2,8 +2,8 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: emco-podsecurity
-  namespace: flux-system
+  name: podsecurity
+  namespace: emco
 spec:
   interval: 5m
   chart:
@@ -14,9 +14,5 @@ spec:
         name: icn
         namespace: flux-system
       interval: 1m
-  releaseName: emco-podsecurity
-  targetNamespace: emco
-  install:
-    createNamespace: true
   values:
     roleRef: psp:privileged

diff --git a/deploy/site/vm/e2etest/emco-services-release.yaml b/deploy/site/vm/e2etest/emco-services-release.yaml
index 5e0519d..beedd64 100644 (file)
--- a/deploy/site/vm/e2etest/emco-services-release.yaml
+++ b/deploy/site/vm/e2etest/emco-services-release.yaml
@@ -2,8 +2,8 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: emco-services
-  namespace: flux-system
+  name: services
+  namespace: emco
 spec:
   interval: 5m
   chart:
@@ -12,14 +12,9 @@ spec:
       sourceRef:
         kind: GitRepository
         name: emco
-        namespace: flux-system
       interval: 1m
-  releaseName: services
-  targetNamespace: emco
-  install:
-    createNamespace: true
   dependsOn:
-  - name: emco-db
+  - name: db
   values:
     global:
       repository: integratedcloudnative/

diff --git a/deploy/site/vm/e2etest/emco-source.yaml b/deploy/site/vm/e2etest/emco-source.yaml
index 79c06b4..a745cc6 100644 (file)
--- a/deploy/site/vm/e2etest/emco-source.yaml
+++ b/deploy/site/vm/e2etest/emco-source.yaml
@@ -3,7 +3,7 @@ apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
   name: emco
-  namespace: flux-system
+  namespace: emco
 spec:
   interval: 1m
   url: https://github.com/open-ness/EMCO

diff --git a/deploy/site/vm/e2etest/emco-tools-release.yaml b/deploy/site/vm/e2etest/emco-tools-release.yaml
index aec92a7..e18806b 100644 (file)
--- a/deploy/site/vm/e2etest/emco-tools-release.yaml
+++ b/deploy/site/vm/e2etest/emco-tools-release.yaml
@@ -2,8 +2,8 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: emco-tools
-  namespace: flux-system
+  name: tools
+  namespace: emco
 spec:
   interval: 5m
   chart:
@@ -12,14 +12,9 @@ spec:
       sourceRef:
         kind: GitRepository
         name: emco
-        namespace: flux-system
       interval: 1m
-  releaseName: tools
-  targetNamespace: emco
-  install:
-    createNamespace: true
   dependsOn:
-  - name: emco-podsecurity
+  - name: podsecurity
   values:
     global:
       repository: integratedcloudnative/

diff --git a/deploy/site/vm/e2etest/kubevirt-operator-release.yaml b/deploy/site/vm/e2etest/kubevirt-operator-release.yaml
index eb77f1c..03ff1e5 100644 (file)
--- a/deploy/site/vm/e2etest/kubevirt-operator-release.yaml
+++ b/deploy/site/vm/e2etest/kubevirt-operator-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: kubevirt-operator
-  namespace: flux-system
+  namespace: kud
 spec:
   interval: 5m
   chart:
@@ -12,11 +12,6 @@ spec:
       sourceRef:
         kind: GitRepository
         name: kud
-        namespace: flux-system
       interval: 1m
-  releaseName: kubevirt-operator
-  targetNamespace: kud
-  install:
-    createNamespace: true
   dependsOn:
-  - name: kud-podsecurity
+  - name: podsecurity

diff --git a/deploy/site/vm/e2etest/kubevirt-release.yaml b/deploy/site/vm/e2etest/kubevirt-release.yaml
index 75ab3d0..c0a7150 100644 (file)
--- a/deploy/site/vm/e2etest/kubevirt-release.yaml
+++ b/deploy/site/vm/e2etest/kubevirt-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: kubevirt
-  namespace: flux-system
+  namespace: kud
 spec:
   interval: 5m
   chart:
@@ -12,11 +12,6 @@ spec:
       sourceRef:
         kind: GitRepository
         name: kud
-        namespace: flux-system
       interval: 1m
-  releaseName: kubevirt
-  targetNamespace: kud
-  install:
-    createNamespace: true
   dependsOn:
   - name: kubevirt-operator

diff --git a/deploy/site/vm/e2etest/kud-namespace.yaml b/deploy/site/vm/e2etest/kud-namespace.yaml
new file mode 100644 (file)
index 0000000..05928e0
--- /dev/null
+++ b/deploy/site/vm/e2etest/kud-namespace.yaml
@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: kud

diff --git a/deploy/site/vm/e2etest/kud-podsecurity.yaml b/deploy/site/vm/e2etest/kud-podsecurity-release.yaml
similarity index 68%
rename from deploy/site/vm/e2etest/kud-podsecurity.yaml
rename to deploy/site/vm/e2etest/kud-podsecurity-release.yaml
index 387c8e1..452c504 100644 (file)
--- a/deploy/site/vm/e2etest/kud-podsecurity.yaml
+++ b/deploy/site/vm/e2etest/kud-podsecurity-release.yaml
@@ -2,8 +2,8 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: kud-podsecurity
-  namespace: flux-system
+  name: podsecurity
+  namespace: kud
 spec:
   interval: 5m
   chart:
@@ -14,9 +14,5 @@ spec:
         name: icn
         namespace: flux-system
       interval: 1m
-  releaseName: kud-podsecurity
-  targetNamespace: kud
-  install:
-    createNamespace: true
   values:
     roleRef: psp:privileged

diff --git a/deploy/site/vm/e2etest/kud-source.yaml b/deploy/site/vm/e2etest/kud-source.yaml
index 7618383..9c58a33 100644 (file)
--- a/deploy/site/vm/e2etest/kud-source.yaml
+++ b/deploy/site/vm/e2etest/kud-source.yaml
@@ -3,7 +3,7 @@ apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
   name: kud
-  namespace: flux-system
+  namespace: kud
 spec:
   interval: 1m
   url: https://gerrit.onap.org/r/multicloud/k8s

diff --git a/deploy/site/vm/e2etest/multus-cni-release.yaml b/deploy/site/vm/e2etest/multus-cni-release.yaml
index d43f084..700037d 100644 (file)
--- a/deploy/site/vm/e2etest/multus-cni-release.yaml
+++ b/deploy/site/vm/e2etest/multus-cni-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: multus-cni
-  namespace: flux-system
+  namespace: kud
 spec:
   interval: 5m
   chart:
@@ -12,11 +12,6 @@ spec:
       sourceRef:
         kind: GitRepository
         name: kud
-        namespace: flux-system
       interval: 1m
-  releaseName: multus-cni
-  targetNamespace: kud
-  install:
-    createNamespace: true
   dependsOn:
-  - name: kud-podsecurity
+  - name: podsecurity

diff --git a/deploy/site/vm/e2etest/node-feature-discovery-release.yaml b/deploy/site/vm/e2etest/node-feature-discovery-release.yaml
index 02c1c29..a364b18 100644 (file)
--- a/deploy/site/vm/e2etest/node-feature-discovery-release.yaml
+++ b/deploy/site/vm/e2etest/node-feature-discovery-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: node-feature-discovery
-  namespace: flux-system
+  namespace: kud
 spec:
   interval: 5m
   chart:
@@ -12,11 +12,6 @@ spec:
       sourceRef:
         kind: GitRepository
         name: kud
-        namespace: flux-system
       interval: 1m
-  releaseName: node-feature-discovery
-  targetNamespace: kud
-  install:
-    createNamespace: true
   dependsOn:
-  - name: kud-podsecurity
+  - name: podsecurity

diff --git a/deploy/site/vm/e2etest/ovn4nfv-network-release.yaml b/deploy/site/vm/e2etest/ovn4nfv-network-release.yaml
index a300ca2..70dfa8b 100644 (file)
--- a/deploy/site/vm/e2etest/ovn4nfv-network-release.yaml
+++ b/deploy/site/vm/e2etest/ovn4nfv-network-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: ovn4nfv-network
-  namespace: flux-system
+  namespace: kud
 spec:
   interval: 5m
   chart:
@@ -12,11 +12,6 @@ spec:
       sourceRef:
         kind: GitRepository
         name: kud
-        namespace: flux-system
       interval: 1m
-  releaseName: ovn4nfv-network
-  targetNamespace: kud
-  install:
-    createNamespace: true
   dependsOn:
   - name: multus-cni

diff --git a/deploy/site/vm/e2etest/ovn4nfv-release.yaml b/deploy/site/vm/e2etest/ovn4nfv-release.yaml
index c897be6..4120bfc 100644 (file)
--- a/deploy/site/vm/e2etest/ovn4nfv-release.yaml
+++ b/deploy/site/vm/e2etest/ovn4nfv-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: ovn4nfv
-  namespace: flux-system
+  namespace: kud
 spec:
   interval: 5m
   chart:
@@ -12,11 +12,6 @@ spec:
       sourceRef:
         kind: GitRepository
         name: kud
-        namespace: flux-system
       interval: 1m
-  releaseName: ovn4nfv
-  targetNamespace: kud
-  install:
-    createNamespace: true
   dependsOn:
-  - name: kud-podsecurity
+  - name: podsecurity

diff --git a/deploy/site/vm/e2etest/qat-device-plugin-release.yaml b/deploy/site/vm/e2etest/qat-device-plugin-release.yaml
index 6e2cc1e..9b3a8ab 100644 (file)
--- a/deploy/site/vm/e2etest/qat-device-plugin-release.yaml
+++ b/deploy/site/vm/e2etest/qat-device-plugin-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: qat-device-plugin
-  namespace: flux-system
+  namespace: kud
 spec:
   interval: 5m
   chart:
@@ -12,11 +12,6 @@ spec:
       sourceRef:
         kind: GitRepository
         name: kud
-        namespace: flux-system
       interval: 1m
-  releaseName: qat-device-plugin
-  targetNamespace: kud
-  install:
-    createNamespace: true
   dependsOn:
-  - name: kud-podsecurity
+  - name: podsecurity

diff --git a/deploy/site/vm/e2etest/sriov-network-operator-release.yaml b/deploy/site/vm/e2etest/sriov-network-operator-release.yaml
index 44f8ffd..6f02a30 100644 (file)
--- a/deploy/site/vm/e2etest/sriov-network-operator-release.yaml
+++ b/deploy/site/vm/e2etest/sriov-network-operator-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: sriov-network-operator
-  namespace: flux-system
+  namespace: kud
 spec:
   interval: 5m
   chart:
@@ -12,11 +12,6 @@ spec:
       sourceRef:
         kind: GitRepository
         name: kud
-        namespace: flux-system
       interval: 1m
-  releaseName: sriov-network-operator
-  targetNamespace: kud
-  install:
-    createNamespace: true
   dependsOn:
-  - name: kud-podsecurity
+  - name: podsecurity

diff --git a/deploy/site/vm/e2etest/sriov-network-release.yaml b/deploy/site/vm/e2etest/sriov-network-release.yaml
index 150e32f..6de6d13 100644 (file)
--- a/deploy/site/vm/e2etest/sriov-network-release.yaml
+++ b/deploy/site/vm/e2etest/sriov-network-release.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
   name: sriov-network
-  namespace: flux-system
+  namespace: kud
 spec:
   interval: 5m
   chart:
@@ -12,11 +12,6 @@ spec:
       sourceRef:
         kind: GitRepository
         name: kud
-        namespace: flux-system
       interval: 1m
-  releaseName: sriov-network
-  targetNamespace: kud
-  install:
-    createNamespace: true
   dependsOn:
   - name: sriov-network-operator

diff --git a/deploy/site/vm/vm.sh b/deploy/site/vm/vm.sh
index 0d79743..d382420 100755 (executable)
--- a/deploy/site/vm/vm.sh
+++ b/deploy/site/vm/vm.sh
@@ -23,7 +23,7 @@ function release_name {
 }
 
 function deploy {
-    for values in build/site/vm/machine-*-values.yaml; do
+    for values in ${BUILDDIR}/machine-*-values.yaml; do
        helm -n metal3 install $(release_name ${values}) ${SCRIPTDIR}/../../machine --create-namespace -f ${values}
     done
     helm -n metal3 install cluster-e2etest ${SCRIPTDIR}/../../cluster --create-namespace -f ${BUILDDIR}/cluster-e2etest-values.yaml
@@ -31,7 +31,7 @@ function deploy {
 
 function clean {
     helm -n metal3 uninstall cluster-e2etest
-    for values in build/site/vm/machine-*-values.yaml; do
+    for values in ${BUILDDIR}/machine-*-values.yaml; do
        helm -n metal3 uninstall $(release_name ${values})
     done
 }
@@ -46,6 +46,7 @@ function is_control_plane_ready {
 
 function wait_for_all_ready {
     WAIT_FOR_INTERVAL=60s
+    WAIT_FOR_TRIES=30
     wait_for is_cluster_ready
     clusterctl -n metal3 get kubeconfig e2etest >${BUILDDIR}/e2etest-admin.conf
     chmod 600 ${BUILDDIR}/e2etest-admin.conf