Add support for installing nonKIND cluster via kubeadm, moving file l…

…ocations Co-authored-by: Vishwanath Jayaraman <[email protected]>
nephio-project · Aug 20, 2024 · 3ea8634 · 3ea8634
1 parent 8e07fa9
commit 3ea8634
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/e2e/provision/init.sh b/e2e/provision/init.sh
@@ -87,7 +87,6 @@ if [ ${MGMT_CLUSTER_TYPE} == "kubeadm" ]; then
 fi
 export ANSIBLE_CMD_EXTRA_VAR_LIST='{ "nephio_catalog_repo_uri": "'${NEPHIO_CATALOG_REPO_URI}'", "k8s": { "context" : "'${K8S_CONTEXT}'", "version" : "'$K8S_VERSION'" } }'
 
-
 if [ ${K8S_CONTEXT} == "kind-kind" ]; then
     export ANSIBLE_TAG=all
 else

diff --git a/e2e/provision/playbooks/roles/kubeadm/tasks/main.yml b/e2e/provision/playbooks/roles/kubeadm/tasks/main.yml
@@ -207,7 +207,6 @@
   ansible.builtin.shell: kubectl taint node $(hostname) node-role.kubernetes.io/control-plane-
   register: my_output
   changed_when: my_output.rc != 0
-<<<<<<< HEAD
 
 - name: Wait for deployments to complete
   ansible.builtin.include_tasks: wait-deployments.yml
@@ -216,5 +215,3 @@
     loop_var: namespace
   vars:
     context: "{{ k8s.context }}"
-=======
->>>>>>> 4a828c2 (add support for installing nonKIND cluster via kubeadm (previously PR #46) (#296))
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,7 +87,6 @@ if [ ${MGMT_CLUSTER_TYPE} == "kubeadm" ]; then @@
     fi
     export ANSIBLE_CMD_EXTRA_VAR_LIST='{ "nephio_catalog_repo_uri": "'${NEPHIO_CATALOG_REPO_URI}'", "k8s": { "context" : "'${K8S_CONTEXT}'", "version" : "'$K8S_VERSION'" } }'
     if [ ${K8S_CONTEXT} == "kind-kind" ]; then
         export ANSIBLE_TAG=all
     else
@@ Expand Down @@