From 860d3ddea953c3f77df35762afc1a282157c846b Mon Sep 17 00:00:00 2001
From: Todd Malsbary <todd.malsbary@intel.com>
Date: Tue, 14 Dec 2021 11:51:28 -0800
Subject: [PATCH] Rename cluster-e2etest to cluster-icn

This compute cluster definition includes all possible ICN addons.

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I957e3a6dbdd459a8037f50f0313a65a652023eb1
---
 README.md                                                  |  2 +-
 deploy/addons/addons.sh                                    |  8 ++++----
 deploy/cluster/values.yaml                                 |  2 +-
 deploy/kata/kata.sh                                        |  6 +++---
 .../cdi-operator-release.yaml                              |  0
 .../site/{cluster-e2etest => cluster-icn}/cdi-release.yaml |  0
 .../cpu-manager-release.yaml                               |  0
 .../{cluster-e2etest => cluster-icn}/emco-db-release.yaml  |  0
 .../emco-monitor-release.yaml                              |  0
 .../{cluster-e2etest => cluster-icn}/emco-namespace.yaml   |  0
 .../emco-podsecurity-release.yaml                          |  0
 .../emco-services-release.yaml                             |  0
 .../site/{cluster-e2etest => cluster-icn}/emco-source.yaml |  0
 .../emco-tools-release.yaml                                |  0
 .../flux-system/gotk-components.yaml                       |  0
 .../flux-system/gotk-sync.yaml                             |  4 ++--
 .../flux-system/kustomization.yaml                         |  0
 .../kata-kustomization.yaml                                |  0
 .../kubevirt-operator-release.yaml                         |  0
 .../{cluster-e2etest => cluster-icn}/kubevirt-release.yaml |  0
 .../{cluster-e2etest => cluster-icn}/kud-namespace.yaml    |  0
 .../kud-podsecurity-release.yaml                           |  0
 .../site/{cluster-e2etest => cluster-icn}/kud-source.yaml  |  0
 .../multus-cni-release.yaml                                |  0
 .../node-feature-discovery-release.yaml                    |  0
 .../ovn4nfv-network-release.yaml                           |  0
 .../{cluster-e2etest => cluster-icn}/ovn4nfv-release.yaml  |  0
 .../qat-device-plugin-release.yaml                         |  0
 .../sriov-network-operator-release.yaml                    |  0
 .../sriov-network-release.yaml                             |  0
 deploy/site/pod11/pod11.sh                                 | 14 +++++++-------
 deploy/site/pod11/site.yaml                                |  6 +++---
 deploy/site/vm/site.yaml                                   |  6 +++---
 deploy/site/vm/vm.sh                                       | 14 +++++++-------
 tools/migration/to_r6.sh                                   |  2 +-
 35 files changed, 32 insertions(+), 32 deletions(-)
 rename deploy/site/{cluster-e2etest => cluster-icn}/cdi-operator-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/cdi-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/cpu-manager-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/emco-db-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/emco-monitor-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/emco-namespace.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/emco-podsecurity-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/emco-services-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/emco-source.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/emco-tools-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/flux-system/gotk-components.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/flux-system/gotk-sync.yaml (87%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/flux-system/kustomization.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/kata-kustomization.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/kubevirt-operator-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/kubevirt-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/kud-namespace.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/kud-podsecurity-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/kud-source.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/multus-cni-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/node-feature-discovery-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/ovn4nfv-network-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/ovn4nfv-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/qat-device-plugin-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/sriov-network-operator-release.yaml (100%)
 rename deploy/site/{cluster-e2etest => cluster-icn}/sriov-network-release.yaml (100%)

diff --git a/README.md b/README.md
index 9ca60b4..da6a544 100644
--- a/README.md
+++ b/README.md
@@ -317,7 +317,7 @@ spec:
         flux:
             url: https://gerrit.akraino.org/r/icn
             branch: master
-            path: ./deploy/site/cluster-e2etest
+            path: ./deploy/site/cluster-icn
 ```
 
 A brief overview of the values is below. Refer to the machine and
diff --git a/deploy/addons/addons.sh b/deploy/addons/addons.sh
index 33f5d80..28337d9 100755
--- a/deploy/addons/addons.sh
+++ b/deploy/addons/addons.sh
@@ -11,7 +11,7 @@ BUILDDIR=${SCRIPTDIR/deploy/build}
 mkdir -p ${BUILDDIR}
 
 function register_emco_controllers {
-    local -r cluster_name=${CLUSTER_NAME:-e2etest}
+    local -r cluster_name=${CLUSTER_NAME:-icn}
     local -r host=$(kubectl -n metal3 get cluster/${cluster_name} -o jsonpath='{.spec.controlPlaneEndpoint.host}')
     cat <<EOF >${BUILDDIR}/${cluster_name}-config.yaml
 orchestrator:
@@ -66,13 +66,13 @@ EOF
 }
 
 function unregister_emco_controllers {
-    local -r cluster_name=${CLUSTER_NAME:-e2etest}
+    local -r cluster_name=${CLUSTER_NAME:-icn}
     emcoctl --config ${BUILDDIR}/${cluster_name}-config.yaml delete -f ${BUILDDIR}/${cluster_name}-controllers.yaml
 }
 
 function test_addons {
     # Create a temporary kubeconfig file for the tests
-    local -r cluster_name=${CLUSTER_NAME:-e2etest}
+    local -r cluster_name=${CLUSTER_NAME:-icn}
     local -r cluster_kubeconfig="${BUILDDIR}/${cluster_name}.conf"
     clusterctl -n metal3 get kubeconfig ${cluster_name} >${cluster_kubeconfig}
 
@@ -113,7 +113,7 @@ case $1 in
 Usage: $(basename $0) COMMAND
 
 The "test" command looks for the CLUSTER_NAME variable in the
-environment (default: "e2etest").  This should be the name of the
+environment (default: "icn").  This should be the name of the
 Cluster resource to execute the tests in.
 
 Commands:
diff --git a/deploy/cluster/values.yaml b/deploy/cluster/values.yaml
index 87c2632..63b7fad 100644
--- a/deploy/cluster/values.yaml
+++ b/deploy/cluster/values.yaml
@@ -73,7 +73,7 @@ flux:
   branch: master
   # path is the repository to the resources to be applied to the
   # cluster.
-  path: ./deploy/site/e2etest
+  path: ./deploy/site/cluster-icn
 
 # containerRuntime may be containerd or docker.
 containerRuntime: containerd
diff --git a/deploy/kata/kata.sh b/deploy/kata/kata.sh
index 75ca024..0cc3b86 100755
--- a/deploy/kata/kata.sh
+++ b/deploy/kata/kata.sh
@@ -65,14 +65,14 @@ function clean_webhook {
 }
 
 function is_kata_deployed {
-    local -r cluster_name=${CLUSTER_NAME:-e2etest}
+    local -r cluster_name=${CLUSTER_NAME:-icn}
     local -r cluster_kubeconfig="${BUILDDIR}/${cluster_name}.conf"
     kubectl --kubeconfig=${cluster_kubeconfig} get runtimeclass/kata-qemu
 }
 
 function test_kata {
     # Create a temporary kubeconfig file for the tests
-    local -r cluster_name=${CLUSTER_NAME:-e2etest}
+    local -r cluster_name=${CLUSTER_NAME:-icn}
     local -r cluster_kubeconfig="${BUILDDIR}/${cluster_name}.conf"
     clusterctl -n metal3 get kubeconfig ${cluster_name} >${cluster_kubeconfig}
 
@@ -102,7 +102,7 @@ case $1 in
 Usage: $(basename $0) COMMAND
 
 The "test" command looks for the CLUSTER_NAME variable in the
-environment (default: "e2etest").  This should be the name of the
+environment (default: "icn").  This should be the name of the
 Cluster resource to execute the tests in.
 
 Commands:
diff --git a/deploy/site/cluster-e2etest/cdi-operator-release.yaml b/deploy/site/cluster-icn/cdi-operator-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/cdi-operator-release.yaml
rename to deploy/site/cluster-icn/cdi-operator-release.yaml
diff --git a/deploy/site/cluster-e2etest/cdi-release.yaml b/deploy/site/cluster-icn/cdi-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/cdi-release.yaml
rename to deploy/site/cluster-icn/cdi-release.yaml
diff --git a/deploy/site/cluster-e2etest/cpu-manager-release.yaml b/deploy/site/cluster-icn/cpu-manager-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/cpu-manager-release.yaml
rename to deploy/site/cluster-icn/cpu-manager-release.yaml
diff --git a/deploy/site/cluster-e2etest/emco-db-release.yaml b/deploy/site/cluster-icn/emco-db-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/emco-db-release.yaml
rename to deploy/site/cluster-icn/emco-db-release.yaml
diff --git a/deploy/site/cluster-e2etest/emco-monitor-release.yaml b/deploy/site/cluster-icn/emco-monitor-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/emco-monitor-release.yaml
rename to deploy/site/cluster-icn/emco-monitor-release.yaml
diff --git a/deploy/site/cluster-e2etest/emco-namespace.yaml b/deploy/site/cluster-icn/emco-namespace.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/emco-namespace.yaml
rename to deploy/site/cluster-icn/emco-namespace.yaml
diff --git a/deploy/site/cluster-e2etest/emco-podsecurity-release.yaml b/deploy/site/cluster-icn/emco-podsecurity-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/emco-podsecurity-release.yaml
rename to deploy/site/cluster-icn/emco-podsecurity-release.yaml
diff --git a/deploy/site/cluster-e2etest/emco-services-release.yaml b/deploy/site/cluster-icn/emco-services-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/emco-services-release.yaml
rename to deploy/site/cluster-icn/emco-services-release.yaml
diff --git a/deploy/site/cluster-e2etest/emco-source.yaml b/deploy/site/cluster-icn/emco-source.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/emco-source.yaml
rename to deploy/site/cluster-icn/emco-source.yaml
diff --git a/deploy/site/cluster-e2etest/emco-tools-release.yaml b/deploy/site/cluster-icn/emco-tools-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/emco-tools-release.yaml
rename to deploy/site/cluster-icn/emco-tools-release.yaml
diff --git a/deploy/site/cluster-e2etest/flux-system/gotk-components.yaml b/deploy/site/cluster-icn/flux-system/gotk-components.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/flux-system/gotk-components.yaml
rename to deploy/site/cluster-icn/flux-system/gotk-components.yaml
diff --git a/deploy/site/cluster-e2etest/flux-system/gotk-sync.yaml b/deploy/site/cluster-icn/flux-system/gotk-sync.yaml
similarity index 87%
rename from deploy/site/cluster-e2etest/flux-system/gotk-sync.yaml
rename to deploy/site/cluster-icn/flux-system/gotk-sync.yaml
index 12fef3a..37287d3 100644
--- a/deploy/site/cluster-e2etest/flux-system/gotk-sync.yaml
+++ b/deploy/site/cluster-icn/flux-system/gotk-sync.yaml
@@ -15,11 +15,11 @@ spec:
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
-  name: e2etest-flux-sync
+  name: icn-flux-sync
   namespace: flux-system
 spec:
   interval: 10m0s
-  path: ./deploy/site/cluster-e2etest
+  path: ./deploy/site/cluster-icn
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/deploy/site/cluster-e2etest/flux-system/kustomization.yaml b/deploy/site/cluster-icn/flux-system/kustomization.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/flux-system/kustomization.yaml
rename to deploy/site/cluster-icn/flux-system/kustomization.yaml
diff --git a/deploy/site/cluster-e2etest/kata-kustomization.yaml b/deploy/site/cluster-icn/kata-kustomization.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/kata-kustomization.yaml
rename to deploy/site/cluster-icn/kata-kustomization.yaml
diff --git a/deploy/site/cluster-e2etest/kubevirt-operator-release.yaml b/deploy/site/cluster-icn/kubevirt-operator-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/kubevirt-operator-release.yaml
rename to deploy/site/cluster-icn/kubevirt-operator-release.yaml
diff --git a/deploy/site/cluster-e2etest/kubevirt-release.yaml b/deploy/site/cluster-icn/kubevirt-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/kubevirt-release.yaml
rename to deploy/site/cluster-icn/kubevirt-release.yaml
diff --git a/deploy/site/cluster-e2etest/kud-namespace.yaml b/deploy/site/cluster-icn/kud-namespace.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/kud-namespace.yaml
rename to deploy/site/cluster-icn/kud-namespace.yaml
diff --git a/deploy/site/cluster-e2etest/kud-podsecurity-release.yaml b/deploy/site/cluster-icn/kud-podsecurity-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/kud-podsecurity-release.yaml
rename to deploy/site/cluster-icn/kud-podsecurity-release.yaml
diff --git a/deploy/site/cluster-e2etest/kud-source.yaml b/deploy/site/cluster-icn/kud-source.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/kud-source.yaml
rename to deploy/site/cluster-icn/kud-source.yaml
diff --git a/deploy/site/cluster-e2etest/multus-cni-release.yaml b/deploy/site/cluster-icn/multus-cni-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/multus-cni-release.yaml
rename to deploy/site/cluster-icn/multus-cni-release.yaml
diff --git a/deploy/site/cluster-e2etest/node-feature-discovery-release.yaml b/deploy/site/cluster-icn/node-feature-discovery-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/node-feature-discovery-release.yaml
rename to deploy/site/cluster-icn/node-feature-discovery-release.yaml
diff --git a/deploy/site/cluster-e2etest/ovn4nfv-network-release.yaml b/deploy/site/cluster-icn/ovn4nfv-network-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/ovn4nfv-network-release.yaml
rename to deploy/site/cluster-icn/ovn4nfv-network-release.yaml
diff --git a/deploy/site/cluster-e2etest/ovn4nfv-release.yaml b/deploy/site/cluster-icn/ovn4nfv-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/ovn4nfv-release.yaml
rename to deploy/site/cluster-icn/ovn4nfv-release.yaml
diff --git a/deploy/site/cluster-e2etest/qat-device-plugin-release.yaml b/deploy/site/cluster-icn/qat-device-plugin-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/qat-device-plugin-release.yaml
rename to deploy/site/cluster-icn/qat-device-plugin-release.yaml
diff --git a/deploy/site/cluster-e2etest/sriov-network-operator-release.yaml b/deploy/site/cluster-icn/sriov-network-operator-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/sriov-network-operator-release.yaml
rename to deploy/site/cluster-icn/sriov-network-operator-release.yaml
diff --git a/deploy/site/cluster-e2etest/sriov-network-release.yaml b/deploy/site/cluster-icn/sriov-network-release.yaml
similarity index 100%
rename from deploy/site/cluster-e2etest/sriov-network-release.yaml
rename to deploy/site/cluster-icn/sriov-network-release.yaml
diff --git a/deploy/site/pod11/pod11.sh b/deploy/site/pod11/pod11.sh
index c26b239..c031495 100755
--- a/deploy/site/pod11/pod11.sh
+++ b/deploy/site/pod11/pod11.sh
@@ -25,15 +25,15 @@ function clean {
 }
 
 function is_cluster_ready {
-    [[ $(kubectl -n metal3 get cluster e2etest -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}') == "True" ]]
+    [[ $(kubectl -n metal3 get cluster icn -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}') == "True" ]]
 }
 
 function is_control_plane_ready {
     # Checking the Cluster resource status is not sufficient, it
     # reports the control plane as ready before the nodes forming the
     # control plane are ready
-    local -r replicas=$(kubectl -n metal3 get kubeadmcontrolplane e2etest -o jsonpath='{.spec.replicas}')
-    [[ $(kubectl --kubeconfig=${BUILDDIR}/e2etest-admin.conf get nodes -l node-role.kubernetes.io/control-plane -o jsonpath='{range .items[*]}{.status.conditions[?(@.type=="Ready")].status}{"\n"}{end}' | grep -c True) == ${replicas} ]]
+    local -r replicas=$(kubectl -n metal3 get kubeadmcontrolplane icn -o jsonpath='{.spec.replicas}')
+    [[ $(kubectl --kubeconfig=${BUILDDIR}/icn-admin.conf get nodes -l node-role.kubernetes.io/control-plane -o jsonpath='{range .items[*]}{.status.conditions[?(@.type=="Ready")].status}{"\n"}{end}' | grep -c True) == ${replicas} ]]
 }
 
 function insert_control_plane_network_identity_into_ssh_config {
@@ -46,8 +46,8 @@ function insert_control_plane_network_identity_into_ssh_config {
     chmod 600 ${HOME}/.ssh/config
     # Add the entry for the control plane network, host value in ssh
     # config is a wildcard
-    endpoint=$(helm -n metal3 get values -a cluster-e2etest | awk '/controlPlaneEndpoint:/ {print $2}')
-    prefix=$(helm -n metal3 get values -a cluster-e2etest | awk '/controlPlanePrefix:/ {print $2}')
+    endpoint=$(helm -n metal3 get values -a cluster-icn | awk '/controlPlaneEndpoint:/ {print $2}')
+    prefix=$(helm -n metal3 get values -a cluster-icn | awk '/controlPlanePrefix:/ {print $2}')
     host=$(ipcalc ${endpoint}/${prefix} | awk '/Network:/ {sub(/\.0.*/,".*"); print $2}')
     if [[ $(grep -c "Host ${host}" ${HOME}/.ssh/config) != 0 ]]; then
 	sed -i -e '/Host '"${host}"'/,+1 d' ${HOME}/.ssh/config
@@ -62,8 +62,8 @@ 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
+    clusterctl -n metal3 get kubeconfig icn >${BUILDDIR}/icn-admin.conf
+    chmod 600 ${BUILDDIR}/icn-admin.conf
     wait_for is_control_plane_ready
     insert_control_plane_network_identity_into_ssh_config
 }
diff --git a/deploy/site/pod11/site.yaml b/deploy/site/pod11/site.yaml
index 9c66316..7b423cb 100644
--- a/deploy/site/pod11/site.yaml
+++ b/deploy/site/pod11/site.yaml
@@ -225,7 +225,7 @@ sops:
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-    name: cluster-e2etest
+    name: cluster-icn
     namespace: metal3
 spec:
     interval: 5m
@@ -237,7 +237,7 @@ spec:
                 name: icn
             interval: 1m
     values:
-        clusterName: e2etest
+        clusterName: icn
         clusterLabels:
             site: pod11
         controlPlaneEndpoint: 10.10.110.23
@@ -253,7 +253,7 @@ spec:
         flux:
             url: https://gerrit.akraino.org/r/icn
             branch: master
-            path: ./deploy/site/cluster-e2etest
+            path: ./deploy/site/cluster-icn
 sops:
     kms: []
     gcp_kms: []
diff --git a/deploy/site/vm/site.yaml b/deploy/site/vm/site.yaml
index 3dce0b8..b393f73 100644
--- a/deploy/site/vm/site.yaml
+++ b/deploy/site/vm/site.yaml
@@ -185,7 +185,7 @@ sops:
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-    name: cluster-e2etest
+    name: cluster-icn
     namespace: metal3
 spec:
     interval: 5m
@@ -197,7 +197,7 @@ spec:
                 name: icn
             interval: 1m
     values:
-        clusterName: e2etest
+        clusterName: icn
         clusterLabels:
             site: vm
         keepalived:
@@ -214,7 +214,7 @@ spec:
         flux:
             url: https://gerrit.akraino.org/r/icn
             branch: master
-            path: ./deploy/site/cluster-e2etest
+            path: ./deploy/site/cluster-icn
 sops:
     kms: []
     gcp_kms: []
diff --git a/deploy/site/vm/vm.sh b/deploy/site/vm/vm.sh
index 841644b..de1fdf8 100755
--- a/deploy/site/vm/vm.sh
+++ b/deploy/site/vm/vm.sh
@@ -50,15 +50,15 @@ function clean {
 }
 
 function is_cluster_ready {
-    [[ $(kubectl -n metal3 get cluster e2etest -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}') == "True" ]]
+    [[ $(kubectl -n metal3 get cluster icn -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}') == "True" ]]
 }
 
 function is_control_plane_ready {
     # Checking the Cluster resource status is not sufficient, it
     # reports the control plane as ready before the nodes forming the
     # control plane are ready
-    local -r replicas=$(kubectl -n metal3 get kubeadmcontrolplane e2etest -o jsonpath='{.spec.replicas}')
-    [[ $(kubectl --kubeconfig=${BUILDDIR}/e2etest-admin.conf get nodes -l node-role.kubernetes.io/control-plane -o jsonpath='{range .items[*]}{.status.conditions[?(@.type=="Ready")].status}{"\n"}{end}' | grep -c True) == ${replicas} ]]
+    local -r replicas=$(kubectl -n metal3 get kubeadmcontrolplane icn -o jsonpath='{.spec.replicas}')
+    [[ $(kubectl --kubeconfig=${BUILDDIR}/icn-admin.conf get nodes -l node-role.kubernetes.io/control-plane -o jsonpath='{range .items[*]}{.status.conditions[?(@.type=="Ready")].status}{"\n"}{end}' | grep -c True) == ${replicas} ]]
 }
 
 function insert_control_plane_network_identity_into_ssh_config {
@@ -71,8 +71,8 @@ function insert_control_plane_network_identity_into_ssh_config {
     chmod 600 ${HOME}/.ssh/config
     # Add the entry for the control plane network, host value in ssh
     # config is a wildcard
-    endpoint=$(helm -n metal3 get values -a cluster-e2etest | awk '/controlPlaneEndpoint:/ {print $2}')
-    prefix=$(helm -n metal3 get values -a cluster-e2etest | awk '/controlPlanePrefix:/ {print $2}')
+    endpoint=$(helm -n metal3 get values -a cluster-icn | awk '/controlPlaneEndpoint:/ {print $2}')
+    prefix=$(helm -n metal3 get values -a cluster-icn | awk '/controlPlanePrefix:/ {print $2}')
     host=$(ipcalc ${endpoint}/${prefix} | awk '/Network:/ {sub(/\.0.*/,".*"); print $2}')
     if [[ $(grep -c "Host ${host}" ${HOME}/.ssh/config) != 0 ]]; then
 	sed -i -e '/Host '"${host}"'/,+1 d' ${HOME}/.ssh/config
@@ -87,8 +87,8 @@ 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
+    clusterctl -n metal3 get kubeconfig icn >${BUILDDIR}/icn-admin.conf
+    chmod 600 ${BUILDDIR}/icn-admin.conf
     wait_for is_control_plane_ready
     insert_control_plane_network_identity_into_ssh_config
 }
diff --git a/tools/migration/to_r6.sh b/tools/migration/to_r6.sh
index 29470dd..86682b4 100755
--- a/tools/migration/to_r6.sh
+++ b/tools/migration/to_r6.sh
@@ -132,7 +132,7 @@ userData: {}
 #flux:
 #  url: https://gerrit.akraino.org/r/icn
 #  branch: master
-#  path: ./deploy/site/cluster-e2etest
+#  path: ./deploy/site/cluster-icn
 EOF
 }
 
-- 
2.16.6