Skip to content

Commit

Permalink
feat: test against Kubernetes 1.28 and drop 1.24 (#491)
Browse files Browse the repository at this point in the history
  • Loading branch information
apricote committed Sep 12, 2023
1 parent 8888edc commit b331348
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/test_e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ jobs:
fail-fast: false
matrix:
include:
- k3s: v1.24
k8s-test: v1.24.13
- k3s: v1.25
k8s-test: v1.25.9
k8s-test: v1.25.13
- k3s: v1.26
k8s-test: v1.26.4
k8s-test: v1.26.8
- k3s: v1.27
k8s-test: v1.27.1
k8s-test: v1.27.5
- k3s: v1.28
k8s-test: v1.28.1
steps:
- uses: actions/setup-go@v4
with:
Expand All @@ -44,7 +44,7 @@ jobs:
kubectl
skaffold
helm: v3.11.2
kubectl: v1.26.3
kubectl: v1.28.1
skaffold: v2.3.0

- name: Run tests
Expand Down
11 changes: 6 additions & 5 deletions docs/kubernetes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ $ kubectl apply -f https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.

## 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.
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
Expand All @@ -182,10 +182,11 @@ related only to an unsupported version.

| Kubernetes | CSI Driver | Deployment File |
|------------|-----------:|--------------------------------------------------------------------------------------------------:|
| 1.27 | 2.3.2 | https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.3.2/deploy/kubernetes/hcloud-csi.yml |
| 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.28 | 2.4.0+ | https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.4.0/deploy/kubernetes/hcloud-csi.yml |
| 1.27 | 2.4.0+ | https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.4.0/deploy/kubernetes/hcloud-csi.yml |
| 1.26 | 2.4.0+ | https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.4.0/deploy/kubernetes/hcloud-csi.yml |
| 1.25 | 2.4.0+ | https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.4.0/deploy/kubernetes/hcloud-csi.yml |
| 1.24 | 2.4.0 | https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.4.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 |
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/kubernetes/run-e2e-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -uex -o pipefail
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"

k8s_test_version="${K8S_TEST_VERSION:-v1.26.3}"
k8s_test_version="${K8S_TEST_VERSION:-v1.28.1}"

mkdir -p "${SCRIPT_DIR}/test-binaries"
# TODO: Read linux-amd64 from env
Expand All @@ -13,7 +13,7 @@ ginkgo="${SCRIPT_DIR}/test-binaries/ginkgo"
ginkgo_flags="-v --flakeAttempts=2"

e2e="${SCRIPT_DIR}/test-binaries/e2e.test"
e2e_flags="-storage.testdriver=${SCRIPT_DIR}/testdriver-1.23.yaml"
e2e_flags="-storage.testdriver=${SCRIPT_DIR}/testdriver-1.25.yaml"

echo "Executing parallel tests"
${ginkgo} ${ginkgo_flags} \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ DriverInfo:
Capabilities:
# Available capabilities are defined in the kubernetes repositories, make
# sure to select the corresponding k8s version:
# https://github.com/kubernetes/kubernetes/blob/release-1.23/test/e2e/storage/framework/testdriver.go#L150
# https://github.com/kubernetes/kubernetes/blob/release-1.25/test/e2e/storage/framework/testdriver.go#L150
persistence: true
block: true
fsGroup: true
Expand All @@ -21,6 +21,7 @@ DriverInfo:
controllerExpansion: true
nodeExpansion: true
onlineExpansion: false
offlineExpansion: true
volumeLimits: false
singleNodeVolume: true
topology: true
Expand Down

0 comments on commit b331348

Please sign in to comment.