*: update kube vendor to v1.7.4

Signed-off-by: Antonio Murdaca <runcom@redhat.com>

contrib/test/crio-integration-playbook.yaml

@@ -216,6 +216,20 @@
     shell: "cp test/plugin_test_args.bash /opt/cni/bin/"
     args:
       chdir: /root/src/github.com/kubernetes-incubator/cri-o/
+    # k8s builds with go1.8.x, rhel, fedora don't have it yet
+  - name: install Golang upstream in Fedora/RHEL
+    shell: |
+            curl -fsSL "https://golang.org/dl/go1.8.3.linux-amd64.tar.gz" \
+            | tar -xzC /usr/local
+    when: ansible_distribution == 'Fedora' or ansible_distribution == 'RedHat'
+  - name: Set custom Golang path for Fedora/RHEL
+    lineinfile:
+      dest: /root/.bashrc
+      line: 'export PATH=/usr/local/go/bin:$PATH'
+      insertafter: 'EOF'
+      regexp: 'export PATH=/usr/local/go/bin:$PATH'
+      state: present
+    when: ansible_distribution == 'Fedora' or ansible_distribution == 'RedHat'
   - name: run integration tests RHEL
     shell: 'CGROUP_MANAGER=cgroupfs STORAGE_OPTS="--storage-driver=overlay2 --storage-opt overlay2.override_kernel_check=1" make localintegration 2>&1 > testout.txt'
     args:
@@ -258,14 +272,12 @@
     shell: 'mv /root/src/github.com/kubernetes-incubator/cri-o/test/TestReport-bats*.xml /root/src/github.com/kubernetes-incubator/cri-o/reports/'
     when: xunit
   # XXX: kube tests from now on
-  # TODO: remove custom repo origin and put kube master back after PR #510
-  #       we need this because of node-e2e tests failing on RHEL otherwise
-  #       For more info see issue #529
   - name: git clone k8s repo
     git:
       repo: https://github.com/runcom/kubernetes
       dest: /root/src/k8s.io/kubernetes
-      version: custom-RHEL-node-e2e
+      # based on kube upstream v1.7.4
+      version: cri-o-node-e2e-patched
       force: yes
     async: 600
     poll: 10