Skip to content

Commit 1ff1bd0

Browse files
committed
Merge branch 'createvol-resp-capacity' into 'master'
Adds capacity to CreateVolumeResponse See merge request cloud-infrastructure/cvmfs-csi!3
2 parents 7eab8e9 + ed1e0e9 commit 1ff1bd0

File tree

7 files changed

+9
-8
lines changed

7 files changed

+9
-8
lines changed

deploy/kubernetes/csi-cvmfsplugin-attacher.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
serviceAccount: csi-attacher
2828
containers:
2929
- name: csi-attacher
30-
image: quay.io/k8scsi/csi-attacher:v0.2.0
30+
image: quay.io/k8scsi/csi-attacher:v0.3.0
3131
args:
3232
- "--v=5"
3333
- "--csi-address=$(ADDRESS)"

deploy/kubernetes/csi-cvmfsplugin-provisioner.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
serviceAccount: csi-provisioner
2828
containers:
2929
- name: csi-provisioner
30-
image: quay.io/k8scsi/csi-provisioner:v0.2.0
30+
image: quay.io/k8scsi/csi-provisioner:v0.3.0
3131
args:
3232
- "--provisioner=csi-cvmfsplugin"
3333
- "--csi-address=$(ADDRESS)"

deploy/kubernetes/csi-cvmfsplugin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
hostNetwork: true
1616
containers:
1717
- name: driver-registrar
18-
image: quay.io/k8scsi/driver-registrar:v0.2.0
18+
image: quay.io/k8scsi/driver-registrar:v0.3.0
1919
args:
2020
- "--v=5"
2121
- "--csi-address=$(ADDRESS)"

example/csi-cvmfsplugin-attacher.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
serviceAccount: csi-attacher
2828
containers:
2929
- name: csi-attacher
30-
image: quay.io/k8scsi/csi-attacher:v0.2.0
30+
image: quay.io/k8scsi/csi-attacher:v0.3.0
3131
args:
3232
- "--v=5"
3333
- "--csi-address=$(ADDRESS)"

example/csi-cvmfsplugin-provisioner.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
serviceAccount: csi-provisioner
2828
containers:
2929
- name: csi-provisioner
30-
image: quay.io/k8scsi/csi-provisioner:v0.2.0
30+
image: quay.io/k8scsi/csi-provisioner:v0.3.0
3131
args:
3232
- "--provisioner=csi-cvmfsplugin"
3333
- "--csi-address=$(ADDRESS)"

example/csi-cvmfsplugin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
hostNetwork: true
1616
containers:
1717
- name: driver-registrar
18-
image: quay.io/k8scsi/driver-registrar:v0.2.0
18+
image: quay.io/k8scsi/driver-registrar:v0.3.0
1919
args:
2020
- "--v=5"
2121
- "--csi-address=$(ADDRESS)"

pkg/cvmfs/controllerserver.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
5050

5151
return &csi.CreateVolumeResponse{
5252
Volume: &csi.Volume{
53-
Id: volId.id,
54-
Attributes: req.GetParameters(),
53+
Id: volId.id,
54+
Attributes: req.GetParameters(),
55+
CapacityBytes: req.GetCapacityRange().GetRequiredBytes(),
5556
},
5657
}, nil
5758
}

0 commit comments

Comments
 (0)