Skip to content
2 changes: 1 addition & 1 deletion docs/input-manifest/api-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ Collection of data used to define a Kubernetes cluster.

Kubernetes version of the cluster.

Version should be defined in format `vX.Y`. In terms of supported versions of Kubernetes, Claudie follows `kubeone` releases and their supported versions. The current `kubeone` version used in Claudie is `1.8`. To see the list of supported versions, please refer to `kubeone` [documentation](https://docs.kubermatic.com/kubeone/v1.8/architecture/compatibility/supported-versions/#supported-kubernetes-versions).
Version should be defined in format `vX.Y`. In terms of supported versions of Kubernetes, Claudie follows `kubeone` releases and their supported versions. The current `kubeone` version used in Claudie is `1.10.0`. To see the list of supported versions, please refer to `kubeone` [documentation](https://docs.kubermatic.com/kubeone/v1.10/architecture/compatibility/supported-versions/).

- `network`

Expand Down
2 changes: 1 addition & 1 deletion internal/manifest/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func prettyPrintValidationError(err error) error {
case "cidrv4":
nerr = fmt.Errorf("field '%s' is required to have a valid CIDRv4 value", err.StructField())
case "ver":
nerr = fmt.Errorf("field '%s' is required to have a kubernetes version of: 1.29.x, 1.30.x, 1.31.x", err.StructField())
nerr = fmt.Errorf("field '%s' is required to have a kubernetes version of: 1.30.x, 1.31.x, 1.32.x", err.StructField())
case "proxyMode":
nerr = fmt.Errorf("field '%s' is required to have a valid proxy mode value of \"on\", \"off\", \"default\"", err.StructField())
case "semver2":
Expand Down
2 changes: 1 addition & 1 deletion internal/manifest/validate_kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var (
// NOTE:
// first/second capturing group MUST be changed whenever new kubeone version is introduced in Claudie
// so validation will catch unsupported versions
kubernetesVersionRegexString = `^(1)\.(29|30|31)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$`
kubernetesVersionRegexString = `^(1)\.(30|31|32)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$`

// semverRegex is a regex using the semverRegexString.
// It's used to verify the version inside the manifest,
Expand Down
18 changes: 9 additions & 9 deletions internal/manifest/validate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

var (
testManifest = &Manifest{NodePools: NodePool{Dynamic: []DynamicNodePool{{Name: "np1"}}}}
testClusterVersionPass = &Kubernetes{Clusters: []Cluster{{Name: "cluster1", Network: "10.0.0.0/8", Version: "v1.29.0", Pools: Pool{Control: []string{"np1"}}}}}
testClusterVersionPass = &Kubernetes{Clusters: []Cluster{{Name: "cluster1", Network: "10.0.0.0/8", Version: "v1.30.0", Pools: Pool{Control: []string{"np1"}}}}}
testClusterVersionFailMinor = &Kubernetes{Clusters: []Cluster{{Name: "cluster1", Network: "10.0.0.0/8", Version: "v1.21.0", Pools: Pool{Control: []string{"np1"}}}}}
testClusterVersionFailMajor = &Kubernetes{Clusters: []Cluster{{Name: "cluster1", Network: "10.0.0.0/8", Version: "v2.22.0", Pools: Pool{Control: []string{"np1"}}}}}

Expand Down Expand Up @@ -39,7 +39,7 @@ var (
Control: []string{"np1"},
},
Network: "10.0.0.0/8",
Version: "v1.29.0",
Version: "v1.30.0",
InstallationProxy: &InstallationProxy{
Mode: "Off",
Endpoint: "http://proxy.claudie.io:8880",
Expand All @@ -53,7 +53,7 @@ var (
Control: []string{"np1"},
},
Network: "10.0.0.0/8",
Version: "v1.29.0",
Version: "v1.30.0",
InstallationProxy: &InstallationProxy{
Mode: "On",
Endpoint: "http://proxy.claudie.io:8880",
Expand All @@ -67,7 +67,7 @@ var (
Control: []string{"np1"},
},
Network: "10.0.0.0/8",
Version: "v1.29.0",
Version: "v1.30.0",
InstallationProxy: &InstallationProxy{
Mode: "",
Endpoint: "http://proxy.claudie.io:8880",
Expand All @@ -81,7 +81,7 @@ var (
Control: []string{"np1"},
},
Network: "10.0.0.0/8",
Version: "v1.29.0",
Version: "v1.30.0",
InstallationProxy: &InstallationProxy{
Mode: "Default",
Endpoint: "http://proxy.claudie.io:8880",
Expand All @@ -95,7 +95,7 @@ var (
Control: []string{"np1"},
},
Network: "10.0.0.0/8",
Version: "v1.29.0",
Version: "v1.30.0",
InstallationProxy: &InstallationProxy{
Mode: "on",
Endpoint: "http://proxy.claudie.io:8880",
Expand All @@ -109,7 +109,7 @@ var (
Control: []string{"np1"},
},
Network: "10.0.0.0/8",
Version: "v1.29.0",
Version: "v1.30.0",
InstallationProxy: &InstallationProxy{
Mode: "off",
Endpoint: "http://proxy.claudie.io:8880",
Expand All @@ -123,7 +123,7 @@ var (
Control: []string{"np1"},
},
Network: "10.0.0.0/8",
Version: "v1.29.0",
Version: "v1.30.0",
InstallationProxy: &InstallationProxy{
Mode: "default",
Endpoint: "http://proxy.claudie.io:8880",
Expand Down Expand Up @@ -165,7 +165,7 @@ var (
Clusters: []Cluster{
{
Name: "foooo",
Version: "v1.29.2",
Version: "v1.30.2",
Network: "192.168.1.0/24",
Pools: Pool{
Control: []string{"control-1", "control-2"},
Expand Down
16 changes: 8 additions & 8 deletions manifests/claudie/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,18 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: ghcr.io/berops/claudie/ansibler
newTag: 7f6dbe0-3397
newTag: f18c618-3399
- name: ghcr.io/berops/claudie/autoscaler-adapter
newTag: 1797ff8-3398
newTag: f18c618-3399
- name: ghcr.io/berops/claudie/builder
newTag: 7f6dbe0-3397
newTag: f18c618-3399
- name: ghcr.io/berops/claudie/claudie-operator
newTag: 7f6dbe0-3397
newTag: f18c618-3399
- name: ghcr.io/berops/claudie/kube-eleven
newTag: 7f6dbe0-3397
newTag: f18c618-3399
- name: ghcr.io/berops/claudie/kuber
newTag: 1797ff8-3398
newTag: f18c618-3399
- name: ghcr.io/berops/claudie/manager
newTag: 1797ff8-3398
newTag: f18c618-3399
- name: ghcr.io/berops/claudie/terraformer
newTag: 7f6dbe0-3397
newTag: f18c618-3399
2 changes: 1 addition & 1 deletion manifests/testing-framework/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ secretGenerator:

images:
- name: ghcr.io/berops/claudie/testing-framework
newTag: 7f6dbe0-3397
newTag: f18c618-3399
6 changes: 3 additions & 3 deletions manifests/testing-framework/test-sets/autoscaling-1/1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
zone: europe-west1-c
count: 1
serverType: e2-medium
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
storageDiskSize: 50
- name: gcp-cmpt-nodes
providerSpec:
Expand All @@ -42,7 +42,7 @@ spec:
min: 1
max: 5
serverType: e2-small
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
storageDiskSize: 50
labels:
test-set: autoscaling-1
Expand All @@ -52,7 +52,7 @@ spec:
kubernetes:
clusters:
- name: autoscaling-cluster-test-set
version: 1.29.0
version: 1.30.0
network: 192.168.2.0/24
pools:
control:
Expand Down
6 changes: 3 additions & 3 deletions manifests/testing-framework/test-sets/autoscaling-1/2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
zone: europe-west1-c
count: 1
serverType: e2-medium
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
storageDiskSize: 50
- name: gcp-cmpt-nodes
providerSpec:
Expand All @@ -40,7 +40,7 @@ spec:
zone: europe-west2-a
count: 1
serverType: e2-small
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
storageDiskSize: 50
labels:
test-set: autoscaling-1-new
Expand All @@ -50,7 +50,7 @@ spec:
kubernetes:
clusters:
- name: autoscaling-cluster-test-set
version: 1.29.0
version: 1.30.0
network: 192.168.2.0/24
pools:
control:
Expand Down
6 changes: 3 additions & 3 deletions manifests/testing-framework/test-sets/autoscaling-1/3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
zone: europe-west1-c
count: 1
serverType: e2-medium
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
storageDiskSize: 50
- name: gcp-cmpt-nodes
providerSpec:
Expand All @@ -42,13 +42,13 @@ spec:
min: 1
max: 5
serverType: e2-small
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
storageDiskSize: 50

kubernetes:
clusters:
- name: autoscaling-cluster-test-set
version: 1.29.0
version: 1.30.0
network: 192.168.2.0/24
pools:
control:
Expand Down
2 changes: 1 addition & 1 deletion manifests/testing-framework/test-sets/autoscaling-2/1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
kubernetes:
clusters:
- name: autoscaling-cluster-test-002
version: 1.30.0
version: 1.31.0
network: 192.168.2.0/24
pools:
control:
Expand Down
2 changes: 1 addition & 1 deletion manifests/testing-framework/test-sets/autoscaling-2/2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
kubernetes:
clusters:
- name: autoscaling-cluster-test-002
version: 1.30.0
version: 1.31.0
network: 192.168.2.0/24
pools:
control:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
zone: europe-west1-b
count: 1
serverType: e2-small
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
storageDiskSize: 50
labels:
test-set: proxy-with-hetzner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
zone: europe-west1-b
count: 2
serverType: e2-small
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
storageDiskSize: 50
labels:
test-set: proxy-with-hetzner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
zone: europe-west1-b
count: 2
serverType: e2-small
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
storageDiskSize: 50
labels:
test-set: proxy-with-hetzner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
zone: europe-west2-c
count: 1
serverType: e2-medium
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
labels:
test-set: proxy-without-hetzner
annotations:
Expand All @@ -35,7 +35,7 @@ spec:
zone: europe-west1-b
count: 1
serverType: e2-small
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
storageDiskSize: 50
labels:
test-set: proxy-without-hetzner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
zone: europe-west2-c
count: 1
serverType: e2-medium
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
labels:
test-set: proxy-without-hetzner
annotations:
Expand All @@ -35,7 +35,7 @@ spec:
zone: europe-west1-b
count: 2
serverType: e2-small
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
storageDiskSize: 50
labels:
test-set: proxy-without-hetzner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
zone: europe-west2-c
count: 1
serverType: e2-medium
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
labels:
test-set: proxy-without-hetzner
annotations:
Expand All @@ -35,7 +35,7 @@ spec:
zone: europe-west1-b
count: 1
serverType: e2-small
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
storageDiskSize: 50
labels:
test-set: proxy-without-hetzner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
zone: europe-west2-c
count: 1
serverType: e2-medium
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
labels:
test-set: proxy-without-hetzner
annotations:
Expand All @@ -35,7 +35,7 @@ spec:
zone: europe-west1-b
count: 1
serverType: e2-small
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
storageDiskSize: 50
labels:
test-set: proxy-without-hetzner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
zone: europe-west2-c
count: 1
serverType: e2-medium
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
labels:
test-set: proxy-without-hetzner
annotations:
Expand All @@ -35,7 +35,7 @@ spec:
zone: europe-west1-b
count: 1
serverType: e2-small
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
storageDiskSize: 50
labels:
test-set: proxy-without-hetzner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
zone: europe-west2-c
count: 1
serverType: e2-medium
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
labels:
test-set: proxy-without-hetzner
annotations:
Expand All @@ -35,7 +35,7 @@ spec:
zone: europe-west1-b
count: 1
serverType: e2-small
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
storageDiskSize: 50
labels:
test-set: proxy-without-hetzner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
zone: europe-west2-c
count: 1
serverType: e2-medium
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
labels:
test-set: proxy-without-hetzner
annotations:
Expand All @@ -35,7 +35,7 @@ spec:
zone: europe-west1-b
count: 2
serverType: e2-small
image: ubuntu-minimal-2404-noble-amd64-v20241116
image: ubuntu-2404-noble-amd64-v20250313
storageDiskSize: 50
labels:
test-set: proxy-without-hetzner
Expand Down
Loading