From ab240332da2d5438c1842609e06027157b243951 Mon Sep 17 00:00:00 2001 From: Neha Lohia Date: Fri, 10 Dec 2021 23:07:12 +0530 Subject: [PATCH 1/2] fix kubeconfig 2 Signed-off-by: Neha Lohia --- hack/test_e2e.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hack/test_e2e.sh b/hack/test_e2e.sh index fec701a9d2..9b5199c1ae 100755 --- a/hack/test_e2e.sh +++ b/hack/test_e2e.sh @@ -156,8 +156,9 @@ function create_cluster { - role: worker - role: worker EOF - kind get kubeconfig --internal --name ${E2E_CLUSTER_NAME} > "${E2E_ARTIFACTS}/kubeconfig.conf" - export KUBECONFIG="${E2E_ARTIFACTS}/kubeconfig.conf" + kind get kubeconfig --internal --name ${E2E_CLUSTER_NAME} > "${E2E_ARTIFACTS}/kubeconfig_internal.conf" + kind get kubeconfig --name ${E2E_CLUSTER_NAME} > "${E2E_ARTIFACTS}/kubeconfig_tests.conf" + # export KUBECONFIG="${E2E_ARTIFACTS}/kubeconfig_internal.conf" echo "cluster is up" echo -e "Let's move on.\n" } @@ -228,7 +229,7 @@ function install_kpng { # TODO this should be part of the template kubectl -n kube-system create sa kpng kubectl create clusterrolebinding kpng --clusterrole=system:node-proxier --serviceaccount=kube-system:kpng - kubectl -n kube-system create cm kpng --from-file "${E2E_ARTIFACTS}/kubeconfig.conf" + kubectl -n kube-system create cm kpng --from-file "${E2E_ARTIFACTS}/kubeconfig_internal.conf" echo "Applying template" export IMAGE=kpng:test export PULL=IfNotPresent @@ -244,13 +245,13 @@ function install_kpng { } function run_tests { - cp ${E2E_ARTIFACTS}/kubeconfig.conf ${E2E_DIR}/kubeconfig.conf + cp ${E2E_ARTIFACTS}/kubeconfig_tests.conf ${E2E_DIR}/kubeconfig_tests.conf ${E2E_DIR}/ginkgo --nodes=25 \ --focus="\[Conformance\]|\[sig-network\]" \ --skip="Feature|Federation|PerformanceDNS|Disruptive|Serial|LoadBalancer|KubeProxy|GCE|Netpol|NetworkPolicy" \ ${E2E_DIR}/e2e.test \ -- \ - --kubeconfig=kubeconfig.conf \ + --kubeconfig=kubeconfig_tests.conf \ --provider=local \ --dump-logs-on-failure=false \ --report-dir=artifacts/reports \ From 34b98523677766f582395680e0f40ac28f2c850a Mon Sep 17 00:00:00 2001 From: Neha Lohia Date: Fri, 10 Dec 2021 23:26:12 +0530 Subject: [PATCH 2/2] fix kubeconfig 3 Signed-off-by: Neha Lohia --- hack/test_e2e.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hack/test_e2e.sh b/hack/test_e2e.sh index 9b5199c1ae..c9d34728db 100755 --- a/hack/test_e2e.sh +++ b/hack/test_e2e.sh @@ -156,9 +156,8 @@ function create_cluster { - role: worker - role: worker EOF - kind get kubeconfig --internal --name ${E2E_CLUSTER_NAME} > "${E2E_ARTIFACTS}/kubeconfig_internal.conf" + kind get kubeconfig --internal --name ${E2E_CLUSTER_NAME} > "${E2E_ARTIFACTS}/kubeconfig.conf" kind get kubeconfig --name ${E2E_CLUSTER_NAME} > "${E2E_ARTIFACTS}/kubeconfig_tests.conf" - # export KUBECONFIG="${E2E_ARTIFACTS}/kubeconfig_internal.conf" echo "cluster is up" echo -e "Let's move on.\n" } @@ -229,7 +228,7 @@ function install_kpng { # TODO this should be part of the template kubectl -n kube-system create sa kpng kubectl create clusterrolebinding kpng --clusterrole=system:node-proxier --serviceaccount=kube-system:kpng - kubectl -n kube-system create cm kpng --from-file "${E2E_ARTIFACTS}/kubeconfig_internal.conf" + kubectl -n kube-system create cm kpng --from-file "${E2E_ARTIFACTS}/kubeconfig.conf" echo "Applying template" export IMAGE=kpng:test export PULL=IfNotPresent