diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a08eb5858a27b7a822fddeaf6b4bae20461be0a9..11db03dfcb1a9711967307b695ab7a2f37357a36 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,4 +25,4 @@ jobs:
- name: Run tests
run: |
go vet ./...
- go test $(go list ./... | grep -v e2etests) -v
+ go test $(go list ./... | grep -v e2e) -v
diff --git a/.github/workflows/test_e2e.yml b/.github/workflows/test_e2e.yml
index 2e6ca588e7718fc29d9bf384428f4b6a7bf26c14..f92fefcd50dea25f37f712e8615c446c362c725b 100644
--- a/.github/workflows/test_e2e.yml
+++ b/.github/workflows/test_e2e.yml
@@ -2,7 +2,7 @@ name: Run e2e tests
on: [pull_request]
concurrency: ci-${{ github.ref }}
jobs:
- test:
+ test-kubernetes:
runs-on: ubuntu-latest
strategy:
# The e2e tests are flaky and often one of the jobs fails. The default setting
@@ -67,4 +67,4 @@ jobs:
tag=$(skaffold build --tag="e2e-${GITHUB_RUN_ID}-${GITHUB_RUN_NUMBER}" --quiet --output="{{ (index .Builds 0).Tag }}")
skaffold deploy --images=hetznercloud/hcloud-csi-driver=$tag
- e2etests/run-e2e-tests.sh
+ test/e2e/kubernetes/run-e2e-tests.sh
diff --git a/.gitignore b/.gitignore
index e05409bb622759361d47a95cdb997f781bd98de1..02165e3d2e4cd7af2b6ad252bb68b303c8c95b18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,11 @@
# rootfs for docker plugin
deploy/docker-swarm/pkg/plugin
+
+# Tmp files for dev env
hack/.*
+
+# Build output
dist/
+
+# Test binary for integration tests
+test/integration/integration.tests
\ No newline at end of file
diff --git a/README.md b/README.md
index e70d8baf775873b2aff4f3cd833a0e3b88628bdc..51f37b75089fa9e9f00fdef25c16726a58081c40 100644
--- a/README.md
+++ b/README.md
@@ -3,207 +3,36 @@
[](https://github.com/hetznercloud/csi-driver/actions)
This is a [Container Storage Interface](https://github.com/container-storage-interface/spec) driver for Hetzner Cloud
-enabling you to use ReadWriteOnce Volumes within Kubernetes. Please note that this driver **requires Kubernetes 1.19 or newer**.
+enabling you to use ReadWriteOnce Volumes within Kubernetes & other Container
+Orchestrators. Please note that this driver **requires Kubernetes 1.19 or newer**.
## Getting Started
-1. Create a read+write API token in the [Hetzner Cloud Console](https://console.hetzner.cloud/).
+Depending on your Container Orchestrator you need to follow different steps to
+get started with the Hetzner Cloud csi-driver. You can also find other docs
+relevant to that Container Orchestrator behind the link:
-2. Create a secret containing the token:
+### [Kubernetes](./docs/kubernetes/README.md#getting-started)
- ```
- # secret.yml
- apiVersion: v1
- kind: Secret
- metadata:
- name: hcloud
- namespace: kube-system
- stringData:
- token: YOURTOKEN
- ```
-
- and apply it:
- ```
- kubectl apply -f <secret.yml>
- ```
-
-3. Deploy the CSI driver and wait until everything is up and running:
-
- Have a look at our [Version Matrix](README.md#versioning-policy) to pick the correct deployment file.
- ```
- kubectl apply -f https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.2.0/deploy/kubernetes/hcloud-csi.yml
- ```
-
-4. To verify everything is working, create a persistent volume claim and a pod
- which uses that volume:
-
- ```
- apiVersion: v1
- kind: PersistentVolumeClaim
- metadata:
- name: csi-pvc
- spec:
- accessModes:
- - ReadWriteOnce
- resources:
- requests:
- storage: 10Gi
- storageClassName: hcloud-volumes
- ---
- kind: Pod
- apiVersion: v1
- metadata:
- name: my-csi-app
- spec:
- containers:
- - name: my-frontend
- image: busybox
- volumeMounts:
- - mountPath: "/data"
- name: my-csi-volume
- command: [ "sleep", "1000000" ]
- volumes:
- - name: my-csi-volume
- persistentVolumeClaim:
- claimName: csi-pvc
- ```
-
- Once the pod is ready, exec a shell and check that your volume is mounted at `/data`.
-
- ```
- kubectl exec -it my-csi-app -- /bin/sh
- ```
-
-5. To add encryption with LUKS you have to create a dedicate secret containing an encryption passphrase and duplicate the default `hcloud-volumes` storage class with added parameters referencing this secret:
-
- ```
- apiVersion: v1
- kind: Secret
- metadata:
- name: encryption-secret
- namespace: kube-system
- stringData:
- encryption-passphrase: foobar
-
- ---
-
- apiVersion: storage.k8s.io/v1
- kind: StorageClass
- metadata:
- name: hcloud-volumes-encrypted
- provisioner: csi.hetzner.cloud
- reclaimPolicy: Delete
- volumeBindingMode: WaitForFirstConsumer
- allowVolumeExpansion: true
- parameters:
- csi.storage.k8s.io/node-publish-secret-name: encryption-secret
- csi.storage.k8s.io/node-publish-secret-namespace: kube-system
- ```
-
-Your nodes might need to have `cryptsetup` installed to mount the volumes with LUKS.
-
-## Upgrading
-
-To upgrade the csi-driver version, you just need to apply the new manifests to your cluster.
+### [Docker Swarm](./docs/docker-swarm/README.md)️ _⚠ Not officially supported_
-In case of a new major version, there might be manual steps that you need to follow to upgrade the csi-driver. See the following section for a list of major updates and their required steps.
+## Tests
-### From v1 to v2
-
-There are three breaking changes between v1.6 and v2.0 that require user intervention. Please take care to follow these steps, as otherwise the update might fail.
-
-**Before the rollout**:
-
-1. The secret containing the API token was renamed from `hcloud-csi` to `hcloud`. This change was made so both the cloud-controller-manager and the csi-driver can use the same secret. Check that you have a secret `hcloud` in the namespace `kube-system`, and that the secret contains the API token, as described in the section [Getting Started](#getting-started):
-
- ```shell
- $ kubectl get secret -n kube-system hcloud
- ```
-
-2. We added a new field to our `CSIDriver` resource to support [CSI volume fsGroup policy management](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#configure-volume-permission-and-ownership-change-policy-for-pods). This change requires a replacement of the `CSIDriver` object. You need to manually delete the old object:
-
- ```shell
- $ kubectl delete csidriver csi.hetzner.cloud
- ```
-
- The new `CSIDriver` will be installed when you apply the new manifests.
-
-3. Stop the old pods to make sure that only everything is replaced in order and no incompatible pods are running side-by-side:
-
- ```shell
- $ kubectl delete statefulset -n kube-system hcloud-csi-controller
- $ kubectl delete daemonset -n kube-system hcloud-csi-node
- ```
-
-4. We changed the way the device path of mounted volumes is communicated to the node service. This requires changes to the `VolumeAttachment` objects, where we need to add information to the `status.attachmentMetadata` field. Execute the linked script to automatically add the required information. This requires `kubectl` version `v1.24+`, even if your cluster is running v1.23.
-
- ```shell
- $ kubectl version
- $ curl -O https://raw.githubusercontent.com/hetznercloud/csi-driver/main/docs/v2-fix-volumeattachments/fix-volumeattachments.sh
- $ chmod +x ./fix-volumeattachments.sh
- $ ./fix-volumeattachments.sh
- ```
-
-**Rollout the new manifest**:
-
-```shell
-$ kubectl apply -f https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.2.0/deploy/kubernetes/hcloud-csi.yml
-```
-
-**After the rollout**:
-
-1. Delete the now unused secret `hcloud-csi` in the namespace `kube-system`:
-
- ```shell
- $ kubectl delete secret -n kube-system hcloud-csi
- ```
-
-2. Remove old resources that have been replaced:
-
- ```shell
- $ kubectl delete clusterrolebinding hcloud-csi
- $ kubectl delete clusterrole hcloud-csi
- $ kubectl delete serviceaccount -n kube-system hcloud-csi
- ```
-
-## Integration with Root Servers
-
-Root servers can be part of the cluster, but the CSI plugin doesn't work there. Taint the root server as follows to skip that node for the daemonset.
-
-```bash
-kubectl label nodes <node name> instance.hetzner.cloud/is-root-server=true
-```
-
-## Versioning policy
-
-We aim to support the latest three versions of Kubernetes. After a new
-Kubernetes version has been released we will stop supporting the oldest
-previously supported version. This does not necessarily mean that the
-CSI driver does not still work with this version. However, it means that
-we do not test that version anymore. Additionally, we will not fix bugs
-related only to an unsupported version.
-
-| Kubernetes | CSI Driver | Deployment File |
-| ---------- | ---------: | ------------------------------------------------------------------------------------------------: |
-| 1.26 | 2.2.0 | https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.2.0/deploy/kubernetes/hcloud-csi.yml |
-| 1.25 | 2.2.0 | https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.2.0/deploy/kubernetes/hcloud-csi.yml |
-| 1.24 | 2.2.0 | https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.2.0/deploy/kubernetes/hcloud-csi.yml |
-| 1.23 | 2.2.0 | https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.2.0/deploy/kubernetes/hcloud-csi.yml |
-| 1.22 | 1.6.0 | https://raw.githubusercontent.com/hetznercloud/csi-driver/v1.6.0/deploy/kubernetes/hcloud-csi.yml |
-| 1.21 | 1.6.0 | https://raw.githubusercontent.com/hetznercloud/csi-driver/v1.6.0/deploy/kubernetes/hcloud-csi.yml |
-| 1.20 | 1.6.0 | https://raw.githubusercontent.com/hetznercloud/csi-driver/v1.6.0/deploy/kubernetes/hcloud-csi.yml |
-
-## Integration Tests
+### Integration Tests
**Requirements: Docker**
The core operations like publishing and resizing can be tested locally with Docker.
```bash
-go test $(go list ./... | grep integrationtests) -v
+go test $(go list ./... | grep integration) -v
```
-## E2E Tests
+### E2E Tests
+
+> ⚠️ Kubernetes E2E Tests were recently refactored and the docs are now outdated.
+> See the [GitHub Actions workflow](.github/workflows/test_e2e.yml) for an
+> up-to-date script to run the e2e tests.
The Hetzner Cloud CSI Driver was tested against the official k8s e2e
tests for a specific version. You can run the tests with the following
@@ -220,28 +49,35 @@ will create volumes that will be billed.
```bash
export HCLOUD_TOKEN=<specifiy a project token>
export K8S_VERSION=1.21.0 # The specific (latest) version is needed here
- export USE_SSH_KEYS=key1,key2 # Name or IDs of your SSH Keys within the Hetzner Cloud, the servers will be accessable with that keys
+ export USE_SSH_KEYS=key1,key2 # Name or IDs of your SSH Keys within the Hetzner Cloud, the servers will be accessible with that keys
```
2. Run the tests
```bash
- go test $(go list ./... | grep e2etests) -v -timeout 60m
+ go test $(go list ./... | grep e2e) -v -timeout 60m
```
The tests will now run, this will take a while (~30 min).
**If the tests fail, make sure to clean up the project with the Hetzner Cloud Console or the hcloud cli.**
-## Local test setup
+### Local test setup
+
+> ⚠️ Local Kubernetes Dev Setup was recently refactored and the docs are now
+> outdated. Check out the scripts [dev-up.sh](hack/dev-up.sh) &
+> [dev-down.sh](hack/dev-down.sh) for an automatic dev setup.
+
This repository provides [skaffold](https://skaffold.dev/) to easily deploy / debug this driver on demand
-### Requirements
+#### Requirements
1. Install [hcloud-cli](https://github.com/hetznercloud/cli)
2. Install [k3sup](https://github.com/alexellis/k3sup)
3. Install [cilium](https://github.com/cilium/cilium-cli)
4. Install [docker](https://www.docker.com/)
You will also need to set a `HCLOUD_TOKEN` in your shell session
-### Manual Installation guide
+
+#### Manual Installation guide
+
1. Create an SSH key
Assuming you already have created an ssh key via `ssh-keygen`
diff --git a/deploy/docker-swarm/README.md b/docs/docker-swarm/README.md
similarity index 98%
rename from deploy/docker-swarm/README.md
rename to docs/docker-swarm/README.md
index 1c55e72573de8ea41cbdef5096b82224c8b86e7d..50bd5448ee203c2ca16639658b72b33c3914b25b 100644
--- a/deploy/docker-swarm/README.md
+++ b/docs/docker-swarm/README.md
@@ -1,4 +1,4 @@
-# Docker Swarm Hetzner CSI plugin
+# Docker Swarm Hetzner Cloud CSI plugin
Currently in Beta. Please consult the Docker Swarm documentation
for cluster volumes (=CSI) support at https://github.com/moby/moby/blob/master/docs/cluster_volumes.md
diff --git a/docs/kubernetes/README.md b/docs/kubernetes/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..3ad0ed98399460edf9153ac3f7ecef6059554801
--- /dev/null
+++ b/docs/kubernetes/README.md
@@ -0,0 +1,191 @@
+# Kubernetes Hetzner Cloud csi-driver
+
+## Getting Started
+
+1. Create a read+write API token in the [Hetzner Cloud Console](https://console.hetzner.cloud/).
+
+2. Create a secret containing the token:
+
+ ```
+ # secret.yml
+ apiVersion: v1
+ kind: Secret
+ metadata:
+ name: hcloud
+ namespace: kube-system
+ stringData:
+ token: YOURTOKEN
+ ```
+
+ and apply it:
+ ```
+ kubectl apply -f <secret.yml>
+ ```
+
+3. Deploy the CSI driver and wait until everything is up and running:
+
+ Have a look at our [Version Matrix](README.md#versioning-policy) to pick the correct deployment file.
+ ```
+ kubectl apply -f https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.3.2/deploy/kubernetes/hcloud-csi.yml
+ ```
+
+4. To verify everything is working, create a persistent volume claim and a pod
+ which uses that volume:
+
+ ```
+ apiVersion: v1
+ kind: PersistentVolumeClaim
+ metadata:
+ name: csi-pvc
+ spec:
+ accessModes:
+ - ReadWriteOnce
+ resources:
+ requests:
+ storage: 10Gi
+ storageClassName: hcloud-volumes
+ ---
+ kind: Pod
+ apiVersion: v1
+ metadata:
+ name: my-csi-app
+ spec:
+ containers:
+ - name: my-frontend
+ image: busybox
+ volumeMounts:
+ - mountPath: "/data"
+ name: my-csi-volume
+ command: [ "sleep", "1000000" ]
+ volumes:
+ - name: my-csi-volume
+ persistentVolumeClaim:
+ claimName: csi-pvc
+ ```
+
+ Once the pod is ready, exec a shell and check that your volume is mounted at `/data`.
+
+ ```
+ kubectl exec -it my-csi-app -- /bin/sh
+ ```
+
+### Volumes Encrypted with LUKS
+
+To add encryption with LUKS you have to create a dedicate secret containing an encryption passphrase and duplicate the default `hcloud-volumes` storage class with added parameters referencing this secret:
+
+```
+apiVersion: v1
+kind: Secret
+metadata:
+ name: encryption-secret
+ namespace: kube-system
+stringData:
+ encryption-passphrase: foobar
+
+---
+
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+ name: hcloud-volumes-encrypted
+provisioner: csi.hetzner.cloud
+reclaimPolicy: Delete
+volumeBindingMode: WaitForFirstConsumer
+allowVolumeExpansion: true
+parameters:
+ csi.storage.k8s.io/node-publish-secret-name: encryption-secret
+ csi.storage.k8s.io/node-publish-secret-namespace: kube-system
+```
+
+Your nodes might need to have `cryptsetup` installed to mount the volumes with LUKS.
+
+## Upgrading
+
+To upgrade the csi-driver version, you just need to apply the new manifests to your cluster.
+
+In case of a new major version, there might be manual steps that you need to follow to upgrade the csi-driver. See the following section for a list of major updates and their required steps.
+
+### From v1 to v2
+
+There are three breaking changes between v1.6 and v2.0 that require user intervention. Please take care to follow these steps, as otherwise the update might fail.
+
+**Before the rollout**:
+
+1. The secret containing the API token was renamed from `hcloud-csi` to `hcloud`. This change was made so both the cloud-controller-manager and the csi-driver can use the same secret. Check that you have a secret `hcloud` in the namespace `kube-system`, and that the secret contains the API token, as described in the section [Getting Started](#getting-started):
+
+ ```shell
+ $ kubectl get secret -n kube-system hcloud
+ ```
+
+2. We added a new field to our `CSIDriver` resource to support [CSI volume fsGroup policy management](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#configure-volume-permission-and-ownership-change-policy-for-pods). This change requires a replacement of the `CSIDriver` object. You need to manually delete the old object:
+
+ ```shell
+ $ kubectl delete csidriver csi.hetzner.cloud
+ ```
+
+ The new `CSIDriver` will be installed when you apply the new manifests.
+
+3. Stop the old pods to make sure that only everything is replaced in order and no incompatible pods are running side-by-side:
+
+ ```shell
+ $ kubectl delete statefulset -n kube-system hcloud-csi-controller
+ $ kubectl delete daemonset -n kube-system hcloud-csi-node
+ ```
+
+4. We changed the way the device path of mounted volumes is communicated to the node service. This requires changes to the `VolumeAttachment` objects, where we need to add information to the `status.attachmentMetadata` field. Execute the linked script to automatically add the required information. This requires `kubectl` version `v1.24+`, even if your cluster is running v1.23.
+
+ ```shell
+ $ kubectl version
+ $ curl -O https://raw.githubusercontent.com/hetznercloud/csi-driver/main/docs/v2-fix-volumeattachments/fix-volumeattachments.sh
+ $ chmod +x ./fix-volumeattachments.sh
+ $ ./fix-volumeattachments.sh
+ ```
+
+**Rollout the new manifest**:
+
+```shell
+$ kubectl apply -f https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.3.2/deploy/kubernetes/hcloud-csi.yml
+```
+
+**After the rollout**:
+
+1. Delete the now unused secret `hcloud-csi` in the namespace `kube-system`:
+
+ ```shell
+ $ kubectl delete secret -n kube-system hcloud-csi
+ ```
+
+2. Remove old resources that have been replaced:
+
+ ```shell
+ $ kubectl delete clusterrolebinding hcloud-csi
+ $ kubectl delete clusterrole hcloud-csi
+ $ kubectl delete serviceaccount -n kube-system hcloud-csi
+ ```
+
+## Integration with Root Servers
+
+Root servers can be part of the cluster, but the CSI plugin doesn't work there. Taint the root server as follows to skip that node for the daemonset.
+
+```bash
+kubectl label nodes <node name> instance.hetzner.cloud/is-root-server=true
+```
+
+## Versioning policy
+
+We aim to support the latest three versions of Kubernetes. After a new
+Kubernetes version has been released we will stop supporting the oldest
+previously supported version. This does not necessarily mean that the
+CSI driver does not still work with this version. However, it means that
+we do not test that version anymore. Additionally, we will not fix bugs
+related only to an unsupported version.
+
+| Kubernetes | CSI Driver | Deployment File |
+|------------|-----------:|--------------------------------------------------------------------------------------------------:|
+| 1.26 | 2.3.2 | https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.3.2/deploy/kubernetes/hcloud-csi.yml |
+| 1.25 | 2.3.2 | https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.3.2/deploy/kubernetes/hcloud-csi.yml |
+| 1.24 | 2.3.2 | https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.3.2/deploy/kubernetes/hcloud-csi.yml |
+| 1.23 | 2.2.0 | https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.2.0/deploy/kubernetes/hcloud-csi.yml |
+| 1.22 | 1.6.0 | https://raw.githubusercontent.com/hetznercloud/csi-driver/v1.6.0/deploy/kubernetes/hcloud-csi.yml |
+| 1.21 | 1.6.0 | https://raw.githubusercontent.com/hetznercloud/csi-driver/v1.6.0/deploy/kubernetes/hcloud-csi.yml |
+| 1.20 | 1.6.0 | https://raw.githubusercontent.com/hetznercloud/csi-driver/v1.6.0/deploy/kubernetes/hcloud-csi.yml |
\ No newline at end of file
diff --git a/docs/v2.0.0-fix-volume-topology/fix-volume-topology.md b/docs/v2.0.0-fix-volume-topology/fix-volume-topology.md
index 9d936eb3821cc3de62096fada473be7e8746f1a8..654f18949e60c81c36a8fadd1b918e86057c39b6 100644
--- a/docs/v2.0.0-fix-volume-topology/fix-volume-topology.md
+++ b/docs/v2.0.0-fix-volume-topology/fix-volume-topology.md
@@ -4,7 +4,7 @@ This guide is intended for Kubernetes Cluster operators that installed the hclou
The affected `PersistentVolumes` reference a wrong label in the `spec.nodeAffinity.required` fields. The volumes work as they should, but for consistency and future compatibility we recommend that the `PersistentVolumes` should be fixed.
-Unfortunatly the affected field is immutable, so we need to recreate the `PersistentVolume` in Kubernetes, the actual Volume with the data will not be touched, no data loss is expected.
+Unfortunately the affected field is immutable, so we need to recreate the `PersistentVolume` in Kubernetes, the actual Volume with the data will not be touched, no data loss is expected.
This is only possible if it is not attached to a node, so any workload using the `PersistentVolume` needs to be paused for this.
## Pre-requisites
diff --git a/e2etests/.gitignore b/test/e2e/kubernetes/.gitignore
similarity index 100%
rename from e2etests/.gitignore
rename to test/e2e/kubernetes/.gitignore
diff --git a/e2etests/run-e2e-tests.sh b/test/e2e/kubernetes/run-e2e-tests.sh
similarity index 100%
rename from e2etests/run-e2e-tests.sh
rename to test/e2e/kubernetes/run-e2e-tests.sh
diff --git a/e2etests/testdriver-1.23.yaml b/test/e2e/kubernetes/testdriver-1.23.yaml
similarity index 100%
rename from e2etests/testdriver-1.23.yaml
rename to test/e2e/kubernetes/testdriver-1.23.yaml
diff --git a/integrationtests/.gitignore b/test/integration/.gitignore
similarity index 100%
rename from integrationtests/.gitignore
rename to test/integration/.gitignore
diff --git a/integrationtests/Dockerfile b/test/integration/Dockerfile
similarity index 64%
rename from integrationtests/Dockerfile
rename to test/integration/Dockerfile
index c9271612954ae932c32647ad1a01c02a4346cdef..ea868d58c6717533849c626af70abc8b0ffee03c 100644
--- a/integrationtests/Dockerfile
+++ b/test/integration/Dockerfile
@@ -4,5 +4,5 @@ RUN apk add --no-cache ca-certificates e2fsprogs xfsprogs blkid xfsprogs-extra e
RUN apk add --no-cache coreutils
WORKDIR /test
-COPY integrationtests.tests /test/integrationtests.tests
-ENTRYPOINT ["/test/integrationtests.tests"]
+COPY integration.tests /test/integration.tests
+ENTRYPOINT ["/test/integration.tests"]
diff --git a/integrationtests/cryptsetup_test.go b/test/integration/cryptsetup_test.go
similarity index 98%
rename from integrationtests/cryptsetup_test.go
rename to test/integration/cryptsetup_test.go
index 8e8cbef6ed54c61b39d3bbbf397875e556e8353e..76a9944401c32690bdc159b48043cd4291e08602 100644
--- a/integrationtests/cryptsetup_test.go
+++ b/test/integration/cryptsetup_test.go
@@ -1,4 +1,4 @@
-package integrationtests
+package integration
import (
"os"
diff --git a/integrationtests/docker.go b/test/integration/docker.go
similarity index 98%
rename from integrationtests/docker.go
rename to test/integration/docker.go
index 74cb08b847c6dd64beaeaccbc41959d7829c43d3..7909d05c365197f201a717d8bba58e2be00a99e3 100644
--- a/integrationtests/docker.go
+++ b/test/integration/docker.go
@@ -1,4 +1,4 @@
-package integrationtests
+package integration
import (
"fmt"
diff --git a/integrationtests/integration_test.go b/test/integration/integration_test.go
similarity index 97%
rename from integrationtests/integration_test.go
rename to test/integration/integration_test.go
index 04cf4d6d9bf6f7f5c6910ab21f2e38644bc1c09f..64d05f8017c83909bb142490a1717e2becda3815 100644
--- a/integrationtests/integration_test.go
+++ b/test/integration/integration_test.go
@@ -1,4 +1,4 @@
-package integrationtests
+package integration
import (
"fmt"
@@ -26,7 +26,7 @@ func prepareDockerImage() error {
defer os.Unsetenv("GOARCH")
os.Setenv("CGO_ENABLED", "0")
defer os.Unsetenv("CGO_ENABLED")
- if output, err := runCmd("go", "test", "-c", "-o", "integrationtests.tests"); err != nil {
+ if output, err := runCmd("go", "test", "-c", "-o", "integration.tests"); err != nil {
fmt.Printf("Error compiling test binary: %v\n%s\n", err, output)
os.Exit(1)
}
diff --git a/integrationtests/volumes_test.go b/test/integration/volumes_test.go
similarity index 99%
rename from integrationtests/volumes_test.go
rename to test/integration/volumes_test.go
index c5c9ce81c469c1b87f92fd6973fb9d33c1ab4410..0a152b55eb728cfc6abf0549a06609a7ac9a9579 100644
--- a/integrationtests/volumes_test.go
+++ b/test/integration/volumes_test.go
@@ -1,4 +1,4 @@
-package integrationtests
+package integration
import (
"fmt"