Thanks to visit codestin.com
Credit goes to github.com

Skip to content

test: set cri stats more idiomatically #5926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jun 2, 2022
Merged

test: set cri stats more idiomatically #5926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions contrib/test/integration/build/kubernetes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions contrib/test/integration/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
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
include: "build/kubernetes.yml"
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
Expand Down Expand Up @@ -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"
Expand All @@ -178,15 +178,15 @@
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"
vars:
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
Expand Down