summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2019-01-04 04:11:57 +0000
committerGerrit Code Review <gerrit@onap.org>2019-01-04 04:11:57 +0000
commit6bbfadbdfe670334ad7755f3578d668d66dd9756 (patch)
tree0dd7c8a6bac0921cb096eba6c729245489ddc625 /vagrant
parentd0ec87e1df4ce133ca3e10f6de7c5b3789490255 (diff)
parent159eb9811ee7de4e99efc8f8a8404a2a9f455d70 (diff)
Merge "Bump kubernetes client to 1.12.3"
Diffstat (limited to 'vagrant')
-rw-r--r--vagrant/playbooks/configure-virtlet.yml5
-rw-r--r--vagrant/playbooks/krd-vars.yml2
-rwxr-xr-xvagrant/tests/integration_vFW.sh4
-rwxr-xr-xvagrant/tests/integration_vcFW.sh4
-rwxr-xr-xvagrant/tests/virtlet.sh6
5 files changed, 11 insertions, 10 deletions
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 e8d13f34..5d1a088a 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