diff --git a/contrib/test/integration/build/kubernetes.yml b/contrib/test/integration/build/kubernetes.yml index 062a2ae2903..9281a4be780 100644 --- a/contrib/test/integration/build/kubernetes.yml +++ b/contrib/test/integration/build/kubernetes.yml @@ -8,15 +8,6 @@ version: "{{ k8s_git_version }}" force: "{{ force_clone | default(False) | bool}}" -# replace hardcoded line not to use legacy stats provider -- name: use CRI stats - lineinfile: - path: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/pkg/kubelet/cadvisor/util.go" - regexp: '^(\s*)runtimeEndpoint == CrioSocket \|\| runtimeEndpoint == \"unix\:\/\/\"\+CrioSocket$' - # keep the whitespace to ensure the file still looks pretty :) - line: '\1false' - backrefs: yes - - name: install etcd command: "hack/install-etcd.sh" args: diff --git a/contrib/test/integration/main.yml b/contrib/test/integration/main.yml index 878da464a9d..37df2fb5fb5 100644 --- a/contrib/test/integration/main.yml +++ b/contrib/test/integration/main.yml @@ -27,7 +27,7 @@ vars: k8s_git_version: "master" k8s_github_fork: "kubernetes" - crio_socket: "/var/run/crio/crio.sock" + crio_socket: "/run/crio/crio.sock" when: "(cgroupv2 is undefined) or (cgroupv2 == False) | bool" - name: clone build and install kubernetes for cgroup v2 @@ -35,7 +35,7 @@ vars: k8s_git_version: "master" k8s_github_fork: "kubernetes" - crio_socket: "/var/run/crio/crio.sock" + crio_socket: "/run/crio/crio.sock" when: "cgroupv2 | bool" - name: clone build and install kubetest @@ -155,7 +155,7 @@ force_clone: true k8s_git_version: "master" k8s_github_fork: "kubernetes" - crio_socket: "/var/run/crio/crio.sock" + crio_socket: "/run/crio/crio.sock" - name: clone build and install kubetest include: "build/kubetest.yml" @@ -178,7 +178,7 @@ force_clone: true k8s_git_version: "master" k8s_github_fork: "kubernetes" - crio_socket: "/var/run/crio/crio.sock" + crio_socket: "/run/crio/crio.sock" when: "(cgroupv2 is undefined) or (cgroupv2 == False) | bool" - name: clone build and install kubernetes for cgroup v2 include: "build/kubernetes.yml" @@ -186,7 +186,7 @@ force_clone: true k8s_git_version: "master" k8s_github_fork: "kubernetes" - crio_socket: "/var/run/crio/crio.sock" + crio_socket: "/run/crio/crio.sock" when: "cgroupv2 | bool" - name: clone build and install kubetest