diff --git a/api/v1alpha1/tenantcontrolplane_const.go b/api/v1alpha1/tenantcontrolplane_const.go index f4350d6..7920a3e 100644 --- a/api/v1alpha1/tenantcontrolplane_const.go +++ b/api/v1alpha1/tenantcontrolplane_const.go @@ -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" ) diff --git a/config/samples/kamaji_v1alpa_tenantcontrolplane_dualstack.yaml b/config/samples/kamaji_v1alpa_tenantcontrolplane_dualstack.yaml index daee569..e81daab 100644 --- a/config/samples/kamaji_v1alpa_tenantcontrolplane_dualstack.yaml +++ b/config/samples/kamaji_v1alpa_tenantcontrolplane_dualstack.yaml @@ -12,7 +12,7 @@ spec: service: serviceType: LoadBalancer kubernetes: - version: "v1.33.0" + version: "v1.35.7" kubelet: configurationJSONPatches: - op: add diff --git a/config/samples/kamaji_v1alpha1_tenantcontrolplane.yaml b/config/samples/kamaji_v1alpha1_tenantcontrolplane.yaml index 618d40e..455a454 100644 --- a/config/samples/kamaji_v1alpha1_tenantcontrolplane.yaml +++ b/config/samples/kamaji_v1alpha1_tenantcontrolplane.yaml @@ -11,7 +11,7 @@ spec: service: serviceType: LoadBalancer kubernetes: - version: "v1.33.0" + version: "v1.35.7" kubelet: configurationJSONPatches: - op: add diff --git a/config/samples/kamaji_v1alpha1_tenantcontrolplane_gateway.yaml b/config/samples/kamaji_v1alpha1_tenantcontrolplane_gateway.yaml index 0eb3e06..7aacc4d 100644 --- a/config/samples/kamaji_v1alpha1_tenantcontrolplane_gateway.yaml +++ b/config/samples/kamaji_v1alpha1_tenantcontrolplane_gateway.yaml @@ -71,7 +71,7 @@ spec: service: serviceType: ClusterIP kubernetes: - version: v1.32.0 + version: v1.35.7 kubelet: cgroupfs: systemd networkProfile: diff --git a/deploy/kamaji-aws.env b/deploy/kamaji-aws.env index a0f04ed..7d14ce7 100644 --- a/deploy/kamaji-aws.env +++ b/deploy/kamaji-aws.env @@ -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 diff --git a/deploy/kamaji-azure.env b/deploy/kamaji-azure.env index f82f2a8..4778943 100644 --- a/deploy/kamaji-azure.env +++ b/deploy/kamaji-azure.env @@ -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 diff --git a/deploy/kamaji.env b/deploy/kamaji.env index d6ced48..fde0923 100644 --- a/deploy/kamaji.env +++ b/deploy/kamaji.env @@ -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 diff --git a/e2e/tcp_additional_resources_blocked_test.go b/e2e/tcp_additional_resources_blocked_test.go index 08f0660..90cde9a 100644 --- a/e2e/tcp_additional_resources_blocked_test.go +++ b/e2e/tcp_additional_resources_blocked_test.go @@ -99,7 +99,7 @@ var _ = Describe("Deploy a TenantControlPlane resource with additional resources }, }, Kubernetes: kamajiv1alpha1.KubernetesSpec{ - Version: "v1.23.6", + Version: kamajiv1alpha1.DefaultKubernetesVersion, }, }, } diff --git a/e2e/tcp_additional_resources_ready_test.go b/e2e/tcp_additional_resources_ready_test.go index 774001b..4315eb1 100644 --- a/e2e/tcp_additional_resources_ready_test.go +++ b/e2e/tcp_additional_resources_ready_test.go @@ -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", }, diff --git a/e2e/tcp_custom_sa_test.go b/e2e/tcp_custom_sa_test.go index 18150bc..432535e 100644 --- a/e2e/tcp_custom_sa_test.go +++ b/e2e/tcp_custom_sa_test.go @@ -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", }, diff --git a/e2e/tcp_datastore_overrides_test.go b/e2e/tcp_datastore_overrides_test.go index 5b1140b..51f1888 100644 --- a/e2e/tcp_datastore_overrides_test.go +++ b/e2e/tcp_datastore_overrides_test.go @@ -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", }, diff --git a/e2e/tcp_gateway_ready_test.go b/e2e/tcp_gateway_ready_test.go index 5df724e..b26251d 100644 --- a/e2e/tcp_gateway_ready_test.go +++ b/e2e/tcp_gateway_ready_test.go @@ -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", }, diff --git a/e2e/tcp_migration_test.go b/e2e/tcp_migration_test.go index 47c2ec0..2156348 100644 --- a/e2e/tcp_migration_test.go +++ b/e2e/tcp_migration_test.go @@ -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", }, diff --git a/e2e/tcp_mysql_ready_test.go b/e2e/tcp_mysql_ready_test.go index bab7adb..0acf3dc 100644 --- a/e2e/tcp_mysql_ready_test.go +++ b/e2e/tcp_mysql_ready_test.go @@ -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", }, diff --git a/e2e/tcp_nats_ready_no_tls_test.go b/e2e/tcp_nats_ready_no_tls_test.go index f739170..e014547 100644 --- a/e2e/tcp_nats_ready_no_tls_test.go +++ b/e2e/tcp_nats_ready_no_tls_test.go @@ -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", }, diff --git a/e2e/tcp_nats_ready_test.go b/e2e/tcp_nats_ready_test.go index 0b35d81..5e7d55a 100644 --- a/e2e/tcp_nats_ready_test.go +++ b/e2e/tcp_nats_ready_test.go @@ -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", }, diff --git a/e2e/tcp_pod_additional_metadata_test.go b/e2e/tcp_pod_additional_metadata_test.go index 42386e2..8343a76 100644 --- a/e2e/tcp_pod_additional_metadata_test.go +++ b/e2e/tcp_pod_additional_metadata_test.go @@ -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", }, diff --git a/e2e/tcp_postgres_datastore_config_secret_test.go b/e2e/tcp_postgres_datastore_config_secret_test.go index ef6fb6c..5d23319 100644 --- a/e2e/tcp_postgres_datastore_config_secret_test.go +++ b/e2e/tcp_postgres_datastore_config_secret_test.go @@ -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, }, }, } diff --git a/e2e/tcp_postgres_ready_test.go b/e2e/tcp_postgres_ready_test.go index 490abaf..b155bb9 100644 --- a/e2e/tcp_postgres_ready_test.go +++ b/e2e/tcp_postgres_ready_test.go @@ -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", }, diff --git a/e2e/tcp_ready_test.go b/e2e/tcp_ready_test.go index 3f8672f..3772b25 100644 --- a/e2e/tcp_ready_test.go +++ b/e2e/tcp_ready_test.go @@ -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", }, diff --git a/e2e/tcp_scale_test.go b/e2e/tcp_scale_test.go index ea1260c..0742127 100644 --- a/e2e/tcp_scale_test.go +++ b/e2e/tcp_scale_test.go @@ -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", }, diff --git a/e2e/tcp_validation_preferredkubeletaddresstypes_test.go b/e2e/tcp_validation_preferredkubeletaddresstypes_test.go index 2721f23..e6bd5c6 100644 --- a/e2e/tcp_validation_preferredkubeletaddresstypes_test.go +++ b/e2e/tcp_validation_preferredkubeletaddresstypes_test.go @@ -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, diff --git a/e2e/worker_tcp_change_port_test.go b/e2e/worker_tcp_change_port_test.go index 8eeb7a5..240be0b 100644 --- a/e2e/worker_tcp_change_port_test.go +++ b/e2e/worker_tcp_change_port_test.go @@ -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", }, diff --git a/internal/metrics/metrics_test.go b/internal/metrics/metrics_test.go index 9c0dd5b..4b09ad1 100644 --- a/internal/metrics/metrics_test.go +++ b/internal/metrics/metrics_test.go @@ -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,