Skip to content
Snippets Groups Projects
Commit 2ea48035 authored by Lukas Kämmerling's avatar Lukas Kämmerling Committed by Ferdinand Hofherr
Browse files

Add btrfs support


Replaces #186

Signed-off-by: default avatarLukas Kämmerling <lukas.kaemmerling@hetzner-cloud.de>
parent c74a95bf
Branches master
No related tags found
No related merge requests found
...@@ -6,6 +6,6 @@ ADD . /csi/ ...@@ -6,6 +6,6 @@ ADD . /csi/
RUN CGO_ENABLED=0 go build -o driver.bin github.com/hetznercloud/csi-driver/cmd/driver RUN CGO_ENABLED=0 go build -o driver.bin github.com/hetznercloud/csi-driver/cmd/driver
FROM alpine:3.13 FROM alpine:3.13
RUN apk add --no-cache ca-certificates e2fsprogs xfsprogs blkid xfsprogs-extra e2fsprogs-extra RUN apk add --no-cache ca-certificates e2fsprogs xfsprogs blkid xfsprogs-extra e2fsprogs-extra btrfs-progs
COPY --from=builder /csi/driver.bin /bin/hcloud-csi-driver COPY --from=builder /csi/driver.bin /bin/hcloud-csi-driver
ENTRYPOINT ["/bin/hcloud-csi-driver"] ENTRYPOINT ["/bin/hcloud-csi-driver"]
...@@ -23,6 +23,7 @@ write_files: ...@@ -23,6 +23,7 @@ write_files:
export HCLOUD_TOKEN={{.HcloudToken}} export HCLOUD_TOKEN={{.HcloudToken}}
path: /root/.bashrc path: /root/.bashrc
runcmd: runcmd:
- export HOME=/root
- sysctl --system - sysctl --system
- apt install -y apt-transport-https curl - apt install -y apt-transport-https curl
- curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - - curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
......
...@@ -11,59 +11,59 @@ require ( ...@@ -11,59 +11,59 @@ require (
github.com/hetznercloud/hcloud-go v1.24.0 github.com/hetznercloud/hcloud-go v1.24.0
github.com/kubernetes-csi/csi-test/v3 v3.0.0-20191125181725-b9c750e7d185 github.com/kubernetes-csi/csi-test/v3 v3.0.0-20191125181725-b9c750e7d185
github.com/prometheus/client_golang v1.8.0 github.com/prometheus/client_golang v1.8.0
golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073
google.golang.org/grpc v1.33.0 google.golang.org/grpc v1.33.0
google.golang.org/protobuf v1.25.0 // indirect google.golang.org/protobuf v1.25.0 // indirect
k8s.io/kubernetes v1.20.2 k8s.io/kubernetes v1.21.0 // indirect
k8s.io/mount-utils v0.0.0 k8s.io/mount-utils v0.0.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 k8s.io/utils v0.0.0-20201110183641-67b214c5f920
) )
replace k8s.io/api => k8s.io/api v0.20.2 replace k8s.io/api => k8s.io/api v0.21.0
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2 replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
replace k8s.io/apimachinery => k8s.io/apimachinery v0.20.2 replace k8s.io/apimachinery => k8s.io/apimachinery v0.21.0
replace k8s.io/apiserver => k8s.io/apiserver v0.20.2 replace k8s.io/apiserver => k8s.io/apiserver v0.21.0
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.2 replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
replace k8s.io/client-go => k8s.io/client-go v0.20.2 replace k8s.io/client-go => k8s.io/client-go v0.21.0
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.2 replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.0
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.2 replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.0
replace k8s.io/code-generator => k8s.io/code-generator v0.20.2 replace k8s.io/code-generator => k8s.io/code-generator v0.21.0
replace k8s.io/component-base => k8s.io/component-base v0.20.2 replace k8s.io/component-base => k8s.io/component-base v0.21.0
replace k8s.io/component-helpers => k8s.io/component-helpers v0.20.2 replace k8s.io/component-helpers => k8s.io/component-helpers v0.21.0
replace k8s.io/controller-manager => k8s.io/controller-manager v0.20.2 replace k8s.io/controller-manager => k8s.io/controller-manager v0.21.0
replace k8s.io/cri-api => k8s.io/cri-api v0.20.2 replace k8s.io/cri-api => k8s.io/cri-api v0.21.0
replace k8s.io/mount-utils => k8s.io/mount-utils v0.20.2-rc.0 replace k8s.io/mount-utils => k8s.io/mount-utils v0.21.0-rc.0
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.2 replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.0
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.2 replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.0
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.2 replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.0
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.2 replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.0
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.2 replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.0
replace k8s.io/kubelet => k8s.io/kubelet v0.20.2 replace k8s.io/kubelet => k8s.io/kubelet v0.21.0
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.2 replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.0
replace k8s.io/metrics => k8s.io/metrics v0.20.2 replace k8s.io/metrics => k8s.io/metrics v0.21.0
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.2 replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.0
replace k8s.io/kubectl => k8s.io/kubectl v0.20.2 replace k8s.io/kubectl => k8s.io/kubectl v0.21.0
This diff is collapsed.
...@@ -4,7 +4,6 @@ import ( ...@@ -4,7 +4,6 @@ import (
"github.com/go-kit/kit/log" "github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level" "github.com/go-kit/kit/log/level"
"github.com/hetznercloud/csi-driver/csi" "github.com/hetznercloud/csi-driver/csi"
"k8s.io/kubernetes/pkg/util/resizefs"
"k8s.io/mount-utils" "k8s.io/mount-utils"
"k8s.io/utils/exec" "k8s.io/utils/exec"
) )
...@@ -17,16 +16,16 @@ type ResizeService interface { ...@@ -17,16 +16,16 @@ type ResizeService interface {
// LinuxResizeService resizes volumes on a Linux system. // LinuxResizeService resizes volumes on a Linux system.
type LinuxResizeService struct { type LinuxResizeService struct {
logger log.Logger logger log.Logger
resizer *resizefs.ResizeFs resizer *mount.ResizeFs
} }
func NewLinuxResizeService(logger log.Logger) *LinuxResizeService { func NewLinuxResizeService(logger log.Logger) *LinuxResizeService {
return &LinuxResizeService{ return &LinuxResizeService{
logger: logger, logger: logger,
resizer: resizefs.NewResizeFs(&mount.SafeFormatAndMount{ resizer: mount.NewResizeFs(mount.SafeFormatAndMount{
Interface: mount.New(""), Interface: mount.New(""),
Exec: exec.New(), Exec: exec.New(),
}), }.Exec),
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment