mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-14 18:53:35 +00:00
vendor update for CSI 0.3.0
This commit is contained in:
5
vendor/k8s.io/kubernetes/test/images/volumes-tester/iscsi/Dockerfile
generated
vendored
5
vendor/k8s.io/kubernetes/test/images/volumes-tester/iscsi/Dockerfile
generated
vendored
@ -12,8 +12,9 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
FROM fedora
|
||||
RUN yum install -y iscsi-initiator-utils targetcli net-tools strace && yum clean all
|
||||
FROM fedora:26
|
||||
|
||||
RUN yum install -y iscsi-initiator-utils targetcli net-tools strace procps-ng psmisc && yum clean all
|
||||
ADD run_iscsid.sh /usr/local/bin/
|
||||
ADD initiatorname.iscsi /etc/iscsi/
|
||||
ADD block.tar.gz /
|
||||
|
4
vendor/k8s.io/kubernetes/test/images/volumes-tester/iscsi/Makefile
generated
vendored
4
vendor/k8s.io/kubernetes/test/images/volumes-tester/iscsi/Makefile
generated
vendored
@ -12,8 +12,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
TAG = 0.1
|
||||
PREFIX = staging-k8s.gcr.io
|
||||
TAG = 0.2
|
||||
PREFIX = gcr.io/kubernetes-e2e-test-images
|
||||
|
||||
all: push
|
||||
|
||||
|
BIN
vendor/k8s.io/kubernetes/test/images/volumes-tester/iscsi/block.tar.gz
generated
vendored
BIN
vendor/k8s.io/kubernetes/test/images/volumes-tester/iscsi/block.tar.gz
generated
vendored
Binary file not shown.
7
vendor/k8s.io/kubernetes/test/images/volumes-tester/iscsi/create_block.sh
generated
vendored
7
vendor/k8s.io/kubernetes/test/images/volumes-tester/iscsi/create_block.sh
generated
vendored
@ -1,4 +1,4 @@
|
||||
#!/bin/bash
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2015 The Kubernetes Authors.
|
||||
#
|
||||
@ -33,8 +33,9 @@ cleanup()
|
||||
|
||||
trap cleanup TERM EXIT
|
||||
|
||||
# Create 1MB device with ext2
|
||||
dd if=/dev/zero of=block count=1 bs=1M
|
||||
# Create 120MB device with ext2
|
||||
# (volume_io tests need at least 100MB)
|
||||
dd if=/dev/zero of=block seek=120 count=1 bs=1M
|
||||
mkfs.ext2 block
|
||||
|
||||
# Add index.html to it
|
||||
|
18
vendor/k8s.io/kubernetes/test/images/volumes-tester/iscsi/run_iscsid.sh
generated
vendored
18
vendor/k8s.io/kubernetes/test/images/volumes-tester/iscsi/run_iscsid.sh
generated
vendored
@ -1,4 +1,4 @@
|
||||
#!/bin/bash
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2015 The Kubernetes Authors.
|
||||
#
|
||||
@ -16,16 +16,26 @@
|
||||
|
||||
function start()
|
||||
{
|
||||
# targetcli need dbus
|
||||
mkdir /run/dbus
|
||||
dbus-daemon --system
|
||||
|
||||
# clear any previous configuration
|
||||
targetcli clearconfig confirm=True
|
||||
|
||||
# restore configuration from saveconfig.json
|
||||
targetcli restoreconfig
|
||||
iscsid
|
||||
|
||||
# maximum log level
|
||||
iscsid -f -d 8
|
||||
|
||||
echo "iscsid started"
|
||||
}
|
||||
|
||||
function stop()
|
||||
{
|
||||
echo "Stopping iscsid"
|
||||
|
||||
kill $( cat /var/run/iscsid.pid )
|
||||
killall iscsid
|
||||
targetcli clearconfig confirm=True
|
||||
|
||||
echo "iscsid stopped"
|
||||
|
2
vendor/k8s.io/kubernetes/test/images/volumes-tester/iscsi/saveconfig.json
generated
vendored
2
vendor/k8s.io/kubernetes/test/images/volumes-tester/iscsi/saveconfig.json
generated
vendored
@ -32,7 +32,7 @@
|
||||
"dev": "block",
|
||||
"name": "block",
|
||||
"plugin": "fileio",
|
||||
"size": 1048576,
|
||||
"size": 126877696,
|
||||
"write_back": true,
|
||||
"wwn": "521c57aa-9d9b-4e5d-ab1a-527487f92a33"
|
||||
}
|
||||
|
Reference in New Issue
Block a user