Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for k8s 1.30 #226

Merged
merged 4 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/tests-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
- kubespray
- k3s
k8s:
- v1.28.10
- v1.29.5
- v1.29.7
- v1.30.4
distro:
- ubuntu22
networkPlugin:
Expand Down Expand Up @@ -66,8 +66,8 @@ jobs:
- k3s
- kubespray
k8sVersion:
- v1.28.10
- v1.29.5
- v1.29.7
- v1.30.4
distro:
- ubuntu22
networkPlugin:
Expand Down Expand Up @@ -109,9 +109,9 @@ jobs:
- k3s
- kubespray
k8sVersion:
- v1.27.14
- v1.28.10
- v1.29.5
- v1.28.12
- v1.29.7
- v1.30.4
distro:
- ubuntu22
- debian12
Expand Down
11 changes: 5 additions & 6 deletions docs/user-guide/configuration/kubernetes.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ kubernetes:
version: v1.28.6
```

The supported Kubernetes versions include `v1.27`, `v1.28`, and `v1.29`.
The supported Kubernetes versions include `v1.28`, `v1.29`, and `v1.30`.

### Kubernetes network plugin

Expand All @@ -69,10 +69,6 @@ The following table shows the compatibility matrix of supported network plugins

| Kubernetes Version | Operating system | Calico | Cilium | Flannel | KubeRouter |
|--------------------|:-----------------|:----------------:|:----------------:|:----------------:|:----------------:|
| **1.27** | Ubuntu | :material-check: | :material-check: | :material-check: | :material-check: |
| **1.27** | Debian | :material-check: | :material-check: | :material-check: | :material-check: |
| **1.27** | CentOS | :material-check: | :material-check: | :material-check: | :material-check: |
| **1.27** | RockyLinux | :material-check: | :material-check: | :material-check: | :material-check: |
| **1.28** | Ubuntu | :material-check: | :material-check: | :material-check: | :material-check: |
| **1.28** | Debian | :material-check: | :material-check: | :material-check: | :material-check: |
| **1.28** | CentOS | :material-check: | :material-check: | :material-check: | :material-check: |
Expand All @@ -81,7 +77,10 @@ The following table shows the compatibility matrix of supported network plugins
| **1.29** | Debian | :material-check: | :material-check: | :material-check: | :material-check: |
| **1.29** | CentOS | :material-check: | :material-check: | :material-check: | :material-check: |
| **1.29** | RockyLinux | :material-check: | :material-check: | :material-check: | :material-check: |

| **1.30** | Ubuntu | :material-check: | :material-check: | :material-check: | :material-check: |
| **1.30** | Debian | :material-check: | :material-check: | :material-check: | :material-check: |
| **1.30** | CentOS | :material-check: | :material-check: | :material-check: | :material-check: |
| **1.30** | RockyLinux | :material-check: | :material-check: | :material-check: | :material-check: |

!!! note "Note"

Expand Down
10 changes: 5 additions & 5 deletions pkg/env/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ const (
ConstK3sURL = "https://github.com/MusicDin/k3s-ansible"
ConstK3sVersion = "v0.0.1"
ConstKubesprayUrl = "https://github.com/kubernetes-sigs/kubespray"
ConstKubesprayVersion = "v2.25.0"
ConstKubernetesVersion = "v1.28.6"
ConstKubesprayVersion = "v2.26.0"
ConstKubernetesVersion = "v1.30.4"
ConstTerraformVersion = "1.5.2"
)

Expand All @@ -39,9 +39,9 @@ var ProjectApplyActions = [...]string{

// ProjectK8sVersions define supported Kubernetes versions.
var ProjectK8sVersions = []string{
"v1.29.0 - v1.29.5",
"v1.28.0 - v1.28.10",
"v1.27.0 - v1.27.14",
"v1.30.0 - v1.30.4",
"v1.29.0 - v1.29.7",
"v1.28.0 - v1.28.12",
}

// ProjectOsPresets is a list of available OS distros.
Expand Down
5 changes: 1 addition & 4 deletions pkg/models/config/kubernetes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ import (
)

func TestKubernetesVersion(t *testing.T) {
assert.NoError(t, KubernetesVersion("v1.27.0").Validate())
assert.NoError(t, KubernetesVersion("v1.27.5").Validate())
assert.NoError(t, KubernetesVersion("v1.28.0").Validate())
assert.NoError(t, KubernetesVersion("v1.28.5").Validate())
assert.NoError(t, KubernetesVersion("v1.30.0").Validate())
assert.ErrorContains(t, KubernetesVersion("v1.1.1").Validate(), "Unsupported Kubernetes version")
assert.ErrorContains(t, KubernetesVersion("v1.28.100").Validate(), "Unsupported Kubernetes version")
}
Expand Down