github/kamaji
1
0
Fork 0
mirror of https://github.com/clastix/kamaji.git synced 2026-08-26 00:47:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: update Kubernetes version to 1.35.7 (#1253)

Browse Source 
- Add DefaultKubernetesVersion constant in api/v1alpha1
- Update e2e tests to use the constant
- Update deploy/*.env and config/samples/*.yaml files
This commit is contained in:
Ross Golder
2026-07-27 11:33:57 +02:00
committed by GitHub
parent 31844d6ec9
commit 8a19328903
24 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1alpha1/tenantcontrolplane_const.go
+3
View File
@@ -7,4 +7,7 @@ const (
// PausedReconciliationAnnotation is an annotation that can be applied to
// Tenant Control Plane objects to prevent the controller from processing such a resource.
PausedReconciliationAnnotation = "kamaji.clastix.io/paused"
// DefaultKubernetesVersion is the default Kubernetes version used in e2e tests.
DefaultKubernetesVersion = "v1.35.7"
)
config/samples/kamaji_v1alpa_tenantcontrolplane_dualstack.yaml
+1 -1
View File
@@ -12,7 +12,7 @@ spec:
service:
serviceType: LoadBalancer
kubernetes:
version: "v1.33.0"
version: "v1.35.7"
kubelet:
configurationJSONPatches:
- op: add
config/samples/kamaji_v1alpha1_tenantcontrolplane.yaml
+1 -1
View File
@@ -11,7 +11,7 @@ spec:
service:
serviceType: LoadBalancer
kubernetes:
version: "v1.33.0"
version: "v1.35.7"
kubelet:
configurationJSONPatches:
- op: add
config/samples/kamaji_v1alpha1_tenantcontrolplane_gateway.yaml
+1 -1
View File
@@ -71,7 +71,7 @@ spec:
service:
serviceType: ClusterIP
kubernetes:
version: v1.32.0
version: v1.35.7
kubelet:
cgroupfs: systemd
networkProfile:
deploy/kamaji-aws.env
+1 -1
View File
@@ -18,7 +18,7 @@ export KAMAJI_NAMESPACE=kamaji-system
export TENANT_NAMESPACE=tenant-00
export TENANT_NAME=tenant-00
export TENANT_DOMAIN=internal.kamaji.aws.com
export TENANT_VERSION=v1.31.0
export TENANT_VERSION=v1.35.7
export TENANT_PORT=6443 # port used to expose the tenant api server
export TENANT_PROXY_PORT=8132 # port used to expose the konnectivity server
export TENANT_POD_CIDR=10.36.0.0/16
deploy/kamaji-azure.env
+1 -1
View File
@@ -15,7 +15,7 @@ export KAMAJI_NAMESPACE=kamaji-system
export TENANT_NAMESPACE=default
export TENANT_NAME=tenant-00
export TENANT_DOMAIN=$KAMAJI_REGION.cloudapp.azure.com
export TENANT_VERSION=v1.31.0
export TENANT_VERSION=v1.35.7
export TENANT_PORT=6443 # port used to expose the tenant api server
export TENANT_PROXY_PORT=8132 # port used to expose the konnectivity server
export TENANT_POD_CIDR=10.36.0.0/16
deploy/kamaji.env
+1 -1
View File
@@ -5,7 +5,7 @@ export KAMAJI_NAMESPACE=kamaji-system
export TENANT_NAMESPACE=default
export TENANT_NAME=tenant-00
export TENANT_DOMAIN=clastix.labs
export TENANT_VERSION=v1.31.0
export TENANT_VERSION=v1.35.7
export TENANT_PORT=6443 # port used to expose the tenant api server
export TENANT_PROXY_PORT=8132 # port used to expose the konnectivity server
export TENANT_POD_CIDR=10.36.0.0/16
e2e/tcp_additional_resources_blocked_test.go
+1 -1
View File
@@ -99,7 +99,7 @@ var _ = Describe("Deploy a TenantControlPlane resource with additional resources
},
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
},
},
}
e2e/tcp_additional_resources_ready_test.go
+1 -1
View File
@@ -119,7 +119,7 @@ var _ = Describe("Deploy a TenantControlPlane resource with additional options",
Address: "172.18.0.2",
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
Kubelet: kamajiv1alpha1.KubeletSpec{
CGroupFS: "cgroupfs",
},
e2e/tcp_custom_sa_test.go
+1 -1
View File
@@ -43,7 +43,7 @@ var _ = Describe("Deploy a TenantControlPlane with resource with custom service
Address: "172.18.0.2",
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
Kubelet: kamajiv1alpha1.KubeletSpec{
CGroupFS: "cgroupfs",
},
e2e/tcp_datastore_overrides_test.go
+1 -1
View File
@@ -39,7 +39,7 @@ var _ = Describe("Deploy a TenantControlPlane resource with DataStoreOverrides",
Address: "172.18.0.2",
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
Kubelet: kamajiv1alpha1.KubeletSpec{
CGroupFS: "cgroupfs",
},
e2e/tcp_gateway_ready_test.go
+1 -1
View File
@@ -58,7 +58,7 @@ var _ = Describe("Deploy a TenantControlPlane with Gateway API", func() {
Address: "172.18.0.3",
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
Kubelet: kamajiv1alpha1.KubeletSpec{
CGroupFS: "cgroupfs",
},
e2e/tcp_migration_test.go
+1 -1
View File
@@ -48,7 +48,7 @@ func featureTestMigration(driver string) {
Port: int32(rand.Int63nRange(31000, 32000)),
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
Kubelet: kamajiv1alpha1.KubeletSpec{
CGroupFS: "cgroupfs",
},
e2e/tcp_mysql_ready_test.go
+1 -1
View File
@@ -32,7 +32,7 @@ var _ = Describe("Deploy a TenantControlPlane resource with the MySQL driver", f
},
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
Kubelet: kamajiv1alpha1.KubeletSpec{
CGroupFS: "cgroupfs",
},
e2e/tcp_nats_ready_no_tls_test.go
+1 -1
View File
@@ -32,7 +32,7 @@ var _ = Describe("Deploy a TenantControlPlane resource with the NATS driver with
},
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
Kubelet: kamajiv1alpha1.KubeletSpec{
CGroupFS: "cgroupfs",
},
e2e/tcp_nats_ready_test.go
+1 -1
View File
@@ -32,7 +32,7 @@ var _ = Describe("Deploy a TenantControlPlane resource with the NATS driver", fu
},
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
Kubelet: kamajiv1alpha1.KubeletSpec{
CGroupFS: "cgroupfs",
},
e2e/tcp_pod_additional_metadata_test.go
+1 -1
View File
@@ -44,7 +44,7 @@ var _ = Describe("Deploy a TenantControlPlane resource with additional pod metad
Address: "172.18.0.2",
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
Kubelet: kamajiv1alpha1.KubeletSpec{
CGroupFS: "cgroupfs",
},
e2e/tcp_postgres_datastore_config_secret_test.go
+1 -1
View File
@@ -38,7 +38,7 @@ var _ = Describe("When the datastore-config Secret is corrupted for a PostgreSQL
},
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
},
},
}
e2e/tcp_postgres_ready_test.go
+1 -1
View File
@@ -32,7 +32,7 @@ var _ = Describe("Deploy a TenantControlPlane resource with the PostgreSQL drive
},
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
Kubelet: kamajiv1alpha1.KubeletSpec{
CGroupFS: "cgroupfs",
},
e2e/tcp_ready_test.go
+1 -1
View File
@@ -36,7 +36,7 @@ var _ = Describe("Deploy a TenantControlPlane resource", func() {
Address: "172.18.0.2",
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
Kubelet: kamajiv1alpha1.KubeletSpec{
CGroupFS: "cgroupfs",
},
e2e/tcp_scale_test.go
+1 -1
View File
@@ -34,7 +34,7 @@ var _ = Describe("Scale a TenantControlPlane resource", func() {
Address: "172.18.0.2",
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
Kubelet: kamajiv1alpha1.KubeletSpec{
CGroupFS: "cgroupfs",
},
e2e/tcp_validation_preferredkubeletaddresstypes_test.go
+2 -2
View File
@@ -34,7 +34,7 @@ var _ = Describe("Deploy a TenantControlPlane with wrong preferred kubelet addre
},
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
Kubelet: kamajiv1alpha1.KubeletSpec{
PreferredAddressTypes: []kamajiv1alpha1.KubeletPreferredAddressType{
kamajiv1alpha1.NodeHostName,
@@ -70,7 +70,7 @@ var _ = Describe("Deploy a TenantControlPlane with wrong preferred kubelet addre
},
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
Kubelet: kamajiv1alpha1.KubeletSpec{
PreferredAddressTypes: []kamajiv1alpha1.KubeletPreferredAddressType{
kamajiv1alpha1.NodeHostName,
e2e/worker_tcp_change_port_test.go
+1 -1
View File
@@ -50,7 +50,7 @@ var _ = Describe("validating kubeconfig", func() {
Port: 30001,
},
Kubernetes: kamajiv1alpha1.KubernetesSpec{
Version: "v1.23.6",
Version: kamajiv1alpha1.DefaultKubernetesVersion,
Kubelet: kamajiv1alpha1.KubeletSpec{
CGroupFS: "cgroupfs",
},
internal/metrics/metrics_test.go
+2 -2
View File
@@ -214,7 +214,7 @@ func TestTenantControlPlaneInfoMetric(t *testing.T) {
recorder := testRecorder()
recorder.ResetTenantControlPlaneInfo()
recorder.SetTenantControlPlaneInfo("default", "test", "v1.33.0", string(kamajiv1alpha1.EtcdDriver), "https://203.0.113.10:6443", TenantControlPlaneExposureService)
recorder.SetTenantControlPlaneInfo("default", "test", kamajiv1alpha1.DefaultKubernetesVersion, string(kamajiv1alpha1.EtcdDriver), "https://203.0.113.10:6443", TenantControlPlaneExposureService)
family := mustMetricFamily(t, "kamaji_tenant_control_plane_info")
if len(family.GetMetric()) != 1 {
@@ -224,7 +224,7 @@ func TestTenantControlPlaneInfoMetric(t *testing.T) {
labels := map[string]string{
"tcp_namespace": "default",
"tcp_name": "test",
"kubernetes_version": "v1.33.0",
"kubernetes_version": kamajiv1alpha1.DefaultKubernetesVersion,
"datastore_driver": string(kamajiv1alpha1.EtcdDriver),
"address": "https://203.0.113.10:6443",
"exposure_strategy": TenantControlPlaneExposureService,