From 159eb9811ee7de4e99efc8f8a8404a2a9f455d70 Mon Sep 17 00:00:00 2001 From: Kiran Kamineni Date: Tue, 18 Dec 2018 22:33:06 -0800 Subject: Bump kubernetes client to 1.12.3 Bumping up the kubernetes client library used to kubernetes 1.12.3 We will move it to v10.0.0 once our k8s deployment moves to 1.13.0 Bumping kubectl version to 1.12.2 as andrewrothstein/ansible-kubectl does not have 1.12.3 in its main.yml Issue-ID: MULTICLOUD-301 Change-Id: Ifb2eaecb794bfdec19d631fdc9ece051d5ebfc60 Signed-off-by: Kiran Kamineni --- vagrant/playbooks/configure-virtlet.yml | 5 +++-- vagrant/playbooks/krd-vars.yml | 2 +- vagrant/tests/integration_vFW.sh | 4 ++-- vagrant/tests/integration_vcFW.sh | 4 ++-- vagrant/tests/virtlet.sh | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-) (limited to 'vagrant') diff --git a/vagrant/playbooks/configure-virtlet.yml b/vagrant/playbooks/configure-virtlet.yml index 66deb5cb..44c87a48 100644 --- a/vagrant/playbooks/configure-virtlet.yml +++ b/vagrant/playbooks/configure-virtlet.yml @@ -128,9 +128,10 @@ path: "{{ virtlet_dest }}/virtletctl" mode: "+x" - name: install virtletctl as kubectl plugin - command: "{{ virtlet_dest }}/virtletctl install" + become: yes + command: "mv {{ virtlet_dest }}/virtletctl /usr/local/bin/kubectl-virt" - name: create Virtlet k8s objects - shell: "/usr/local/bin/kubectl plugin virt gen | /usr/local/bin/kubectl apply -f -" + shell: "/usr/local/bin/kubectl virt gen | /usr/local/bin/kubectl apply -f -" ignore_errors: True - name: wait for Virtlet daemonset shell: "/usr/local/bin/kubectl get ds virtlet -n=kube-system -o=jsonpath --template={.status.numberReady}" diff --git a/vagrant/playbooks/krd-vars.yml b/vagrant/playbooks/krd-vars.yml index 15b7a1a4..0107f267 100644 --- a/vagrant/playbooks/krd-vars.yml +++ b/vagrant/playbooks/krd-vars.yml @@ -59,5 +59,5 @@ ovn4nfv_url: "https://git.opnfv.org/ovn4nfv-k8s-plugin/" go_version: '1.11' kubespray_version: 2.8.0 -kubectl_version: 1.11.2 +kubectl_version: 1.12.2 helm_client_version: 2.9.1 diff --git a/vagrant/tests/integration_vFW.sh b/vagrant/tests/integration_vFW.sh index 962f9f75..78a6b10c 100755 --- a/vagrant/tests/integration_vFW.sh +++ b/vagrant/tests/integration_vFW.sh @@ -32,12 +32,12 @@ setup $packetgen_deployment_name $firewall_deployment_name $sink_deployment_name # Test for deployment_name in $packetgen_deployment_name $firewall_deployment_name $sink_deployment_name; do pod_name=$(kubectl get pods | grep $deployment_name | awk '{print $1}') - vm=$(kubectl plugin virt virsh list | grep ".*$deployment_name" | awk '{print $2}') + vm=$(kubectl virt virsh list | grep ".*$deployment_name" | awk '{print $2}') echo "Pod name: $pod_name Virsh domain: $vm" echo "ssh -i ~/.ssh/id_rsa.pub admin@$(kubectl get pods $pod_name -o jsonpath="{.status.podIP}")" echo "kubectl attach -it $pod_name" echo "=== Virtlet details ====" - echo "$(kubectl plugin virt virsh dumpxml $vm | grep VIRTLET_)\n" + echo "$(kubectl virt virsh dumpxml $vm | grep VIRTLET_)\n" done popd diff --git a/vagrant/tests/integration_vcFW.sh b/vagrant/tests/integration_vcFW.sh index 15cffcb8..ccda1190 100755 --- a/vagrant/tests/integration_vcFW.sh +++ b/vagrant/tests/integration_vcFW.sh @@ -39,12 +39,12 @@ setup $packetgen_deployment_name $firewall_deployment_name $sink_deployment_name # Test for deployment_name in $packetgen_deployment_name $firewall_deployment_name; do pod_name=$(kubectl get pods | grep $deployment_name | awk '{print $1}') - vm=$(kubectl plugin virt virsh list | grep ".*$deployment_name" | awk '{print $2}') + vm=$(kubectl virt virsh list | grep ".*$deployment_name" | awk '{print $2}') echo "Pod name: $pod_name Virsh domain: $vm" echo "ssh -i ~/.ssh/id_rsa.pub admin@$(kubectl get pods $pod_name -o jsonpath="{.status.podIP}")" echo "kubectl attach -it $pod_name" echo "=== Virtlet details ====" - echo "$(kubectl plugin virt virsh dumpxml $vm | grep VIRTLET_)\n" + echo "$(kubectl virt virsh dumpxml $vm | grep VIRTLET_)\n" done # Teardown diff --git a/vagrant/tests/virtlet.sh b/vagrant/tests/virtlet.sh index 268247ba..04c1276d 100755 --- a/vagrant/tests/virtlet.sh +++ b/vagrant/tests/virtlet.sh @@ -26,8 +26,8 @@ setup $virtlet_deployment_name # Test deployment_pod=$(kubectl get pods | grep $virtlet_deployment_name | awk '{print $1}') -vm_name=$(kubectl plugin virt virsh list | grep "virtlet-.*-$virtlet_deployment_name" | awk '{print $2}') -vm_status=$(kubectl plugin virt virsh list | grep "virtlet-.*-$virtlet_deployment_name" | awk '{print $3}') +vm_name=$(kubectl virt virsh list | grep "virtlet-.*-$virtlet_deployment_name" | awk '{print $2}') +vm_status=$(kubectl virt virsh list | grep "virtlet-.*-$virtlet_deployment_name" | awk '{print $3}') if [[ "$vm_status" != "running" ]]; then echo "There is no Virtual Machine running by $deployment_pod pod" exit 1 @@ -36,7 +36,7 @@ echo "Pod name: $deployment_pod Virsh domain: $vm_name" echo "ssh testuser@$(kubectl get pods $deployment_pod -o jsonpath="{.status.podIP}")" echo "kubectl attach -it $deployment_pod" echo "=== Virtlet details ====" -echo "$(kubectl plugin virt virsh dumpxml $vm_name | grep VIRTLET_)\n" +echo "$(kubectl virt virsh dumpxml $vm_name | grep VIRTLET_)\n" popd # Teardown -- cgit 1.2.3-korg