vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove references to overlay2 in the code

Browse source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2017-09-28 11:43:15 -04:00
parent 51fc13abf3
commit 1a41d6ecd4
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/kpod/main.go
View file

@ -98,7 +98,7 @@ func main() {
}, },
cli.StringFlag{ cli.StringFlag{
Name: "storage-driver, s", Name: "storage-driver, s",
Usage: "select which storage driver is used to manage storage of images and containers (default is overlay2)", Usage: "select which storage driver is used to manage storage of images and containers (default is overlay)",
}, },
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "storage-opt", Name: "storage-opt",

10
contrib/test/integration/build/cri-o.yml
View file

@ -47,10 +47,10 @@
- src: test/redhat_sigstore.yaml - src: test/redhat_sigstore.yaml
dest: /etc/containers/registries.d/registry.access.redhat.com.yaml dest: /etc/containers/registries.d/registry.access.redhat.com.yaml
- name: run with overlay2 - name: run with overlay
replace: replace:
regexp: 'storage_driver = ""' regexp: 'storage_driver = ""'
replace: 'storage_driver = "overlay2"' replace: 'storage_driver = "overlay"'
name: /etc/crio/crio.conf name: /etc/crio/crio.conf
backup: yes backup: yes
@ -69,11 +69,11 @@
regexp: 'docker\.io' regexp: 'docker\.io'
state: present state: present
- name: add overlay2 storage opts on RHEL/CentOS - name: add overlay storage opts on RHEL/CentOS
lineinfile: lineinfile:
dest: /etc/crio/crio.conf dest: /etc/crio/crio.conf
line: '"overlay2.override_kernel_check=1"' line: '"overlay.override_kernel_check=1"'
insertafter: 'storage_option = \[' insertafter: 'storage_option = \['
regexp: 'overlay2\.override_kernel_check=1' regexp: 'overlay\.override_kernel_check=1'
state: present state: present
when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS' when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS'

4
contrib/test/integration/test.yml
View file

@ -17,7 +17,7 @@
- name: set extra storage options - name: set extra storage options
set_fact: set_fact:
extra_storage_opts: " --storage-opt overlay2.override_kernel_check=1" extra_storage_opts: " --storage-opt overlay.override_kernel_check=1"
when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS' when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS'
- name: set extra shell for non-xunit tests - name: set extra shell for non-xunit tests
@ -26,7 +26,7 @@
when: not xunit when: not xunit
- name: run integration tests - name: run integration tests
shell: "CGROUP_MANAGER=cgroupfs STORAGE_OPTS='--storage-driver=overlay2{{ extra_storage_opts | default('') }}' make localintegration{{ extra_shell_suffix }}" shell: "CGROUP_MANAGER=cgroupfs STORAGE_OPTS='--storage-driver=overlay{{ extra_storage_opts | default('') }}' make localintegration{{ extra_shell_suffix }}"
args: args:
chdir: "{{ ansible_env.GOPATH }}/src/github.com/kubernetes-incubator/cri-o" chdir: "{{ ansible_env.GOPATH }}/src/github.com/kubernetes-incubator/cri-o"
ignore_errors: yes ignore_errors: yes

8
docs/kpod-inspect.1.md
View file

@ -146,11 +146,11 @@ kpod inspect redis:alpine
"Size": 3965955, "Size": 3965955,
"VirtualSize": 19808086, "VirtualSize": 19808086,
"GraphDriver": { "GraphDriver": {
"Name": "overlay2", "Name": "overlay",
"Data": { "Data": {
"MergedDir": "/var/lib/containers/storage/overlay2/2059d805c90e034cb773d9722232ef018a72143dd31113b470fb876baeccd700/merged", "MergedDir": "/var/lib/containers/storage/overlay/2059d805c90e034cb773d9722232ef018a72143dd31113b470fb876baeccd700/merged",
"UpperDir": "/var/lib/containers/storage/overlay2/2059d805c90e034cb773d9722232ef018a72143dd31113b470fb876baeccd700/diff", "UpperDir": "/var/lib/containers/storage/overlay/2059d805c90e034cb773d9722232ef018a72143dd31113b470fb876baeccd700/diff",
"WorkDir": "/var/lib/containers/storage/overlay2/2059d805c90e034cb773d9722232ef018a72143dd31113b470fb876baeccd700/work" "WorkDir": "/var/lib/containers/storage/overlay/2059d805c90e034cb773d9722232ef018a72143dd31113b470fb876baeccd700/work"
} }
}, },
"RootFS": { "RootFS": {

6
docs/kpod-mount.1.md
View file

@ -38,13 +38,13 @@ SELinux label for the mount point
kpod mount c831414b10a3 kpod mount c831414b10a3
/var/lib/containers/storage/overlay2/f3ac502d97b5681989dff84dfedc8354239bcecbdc2692f9a639f4e080a02364/merged /var/lib/containers/storage/overlay/f3ac502d97b5681989dff84dfedc8354239bcecbdc2692f9a639f4e080a02364/merged
kpod mount kpod mount
c831414b10a3 /var/lib/containers/storage/overlay2/f3ac502d97b5681989dff84dfedc8354239bcecbdc2692f9a639f4e080a02364/merged c831414b10a3 /var/lib/containers/storage/overlay/f3ac502d97b5681989dff84dfedc8354239bcecbdc2692f9a639f4e080a02364/merged
a7060253093b /var/lib/containers/storage/overlay2/0ff7d7ca68bed1ace424f9df154d2dd7b5a125c19d887f17653cbcd5b6e30ba1/merged a7060253093b /var/lib/containers/storage/overlay/0ff7d7ca68bed1ace424f9df154d2dd7b5a125c19d887f17653cbcd5b6e30ba1/merged
## SEE ALSO ## SEE ALSO
kpod(1), kpod-umount(1), mount(8) kpod(1), kpod-umount(1), mount(8)