diff --git a/kubemarine/resources/configurations/compatibility/internal/kubernetes_images.yaml b/kubemarine/resources/configurations/compatibility/internal/kubernetes_images.yaml index 744c0acc2..d28333de5 100644 --- a/kubemarine/resources/configurations/compatibility/internal/kubernetes_images.yaml +++ b/kubemarine/resources/configurations/compatibility/internal/kubernetes_images.yaml @@ -41,8 +41,6 @@ kube-apiserver: version: v1.30.1 v1.30.3: version: v1.30.3 - v1.31.0: - version: v1.31.0 v1.31.1: version: v1.31.1 kube-controller-manager: @@ -86,8 +84,6 @@ kube-controller-manager: version: v1.30.1 v1.30.3: version: v1.30.3 - v1.31.0: - version: v1.31.0 v1.31.1: version: v1.31.1 kube-scheduler: @@ -131,8 +127,6 @@ kube-scheduler: version: v1.30.1 v1.30.3: version: v1.30.3 - v1.31.0: - version: v1.31.0 v1.31.1: version: v1.31.1 kube-proxy: @@ -176,8 +170,6 @@ kube-proxy: version: v1.30.1 v1.30.3: version: v1.30.3 - v1.31.0: - version: v1.31.0 v1.31.1: version: v1.31.1 pause: @@ -221,8 +213,6 @@ pause: version: '3.9' v1.30.3: version: '3.9' - v1.31.0: - version: '3.10' v1.31.1: version: '3.10' etcd: @@ -266,8 +256,6 @@ etcd: version: 3.5.12-0 v1.30.3: version: 3.5.12-0 - v1.31.0: - version: 3.5.15-0 v1.31.1: version: 3.5.15-0 coredns/coredns: @@ -311,7 +299,5 @@ coredns/coredns: version: v1.11.1 v1.30.3: version: v1.11.1 - v1.31.0: - version: v1.11.1 v1.31.1: version: v1.11.3 diff --git a/kubemarine/resources/configurations/compatibility/internal/packages.yaml b/kubemarine/resources/configurations/compatibility/internal/packages.yaml index 0aa91e072..e34f949c2 100644 --- a/kubemarine/resources/configurations/compatibility/internal/packages.yaml +++ b/kubemarine/resources/configurations/compatibility/internal/packages.yaml @@ -45,8 +45,6 @@ containerd: version_debian: 1.6.* v1.30.3: version_debian: 1.6.* - v1.31.0: - version_debian: 1.6.* v1.31.1: version_debian: 1.6.* containerdio: @@ -130,10 +128,6 @@ containerdio: version_rhel: 1.6* version_rhel8: 1.6* version_rhel9: 1.6* - v1.31.0: - version_rhel: 1.6* - version_rhel8: 1.6* - version_rhel9: 1.6* v1.31.1: version_rhel: 1.6* version_rhel8: 1.6* diff --git a/kubemarine/resources/configurations/compatibility/internal/plugins.yaml b/kubemarine/resources/configurations/compatibility/internal/plugins.yaml index b7b44b3b3..f36c893df 100644 --- a/kubemarine/resources/configurations/compatibility/internal/plugins.yaml +++ b/kubemarine/resources/configurations/compatibility/internal/plugins.yaml @@ -45,8 +45,6 @@ calico: version: v3.27.3 v1.30.3: version: v3.28.1 - v1.31.0: - version: v3.28.1 v1.31.1: version: v3.28.1 nginx-ingress-controller: @@ -110,9 +108,6 @@ nginx-ingress-controller: v1.30.3: version: v1.11.1 webhook-version: v1.4.1 - v1.31.0: - version: v1.11.1 - webhook-version: v1.4.1 v1.31.1: version: v1.11.1 webhook-version: v1.4.1 @@ -177,9 +172,6 @@ kubernetes-dashboard: v1.30.3: version: v2.7.0 metrics-scraper-version: v1.0.8 - v1.31.0: - version: v2.7.0 - metrics-scraper-version: v1.0.8 v1.31.1: version: v2.7.0 metrics-scraper-version: v1.0.8 @@ -244,9 +236,6 @@ local-path-provisioner: v1.30.3: version: v0.0.27 busybox-version: 1.34.1 - v1.31.0: - version: v0.0.27 - busybox-version: 1.34.1 v1.31.1: version: v0.0.27 busybox-version: 1.34.1 diff --git a/kubemarine/resources/configurations/compatibility/internal/thirdparties.yaml b/kubemarine/resources/configurations/compatibility/internal/thirdparties.yaml index f04228d34..8ca725d20 100644 --- a/kubemarine/resources/configurations/compatibility/internal/thirdparties.yaml +++ b/kubemarine/resources/configurations/compatibility/internal/thirdparties.yaml @@ -42,8 +42,6 @@ kubeadm: sha1: 85385f4b78b79bd1cd4d1ad5244422d372d5f758 v1.30.3: sha1: f840e75f5dc1001ebdd7e286c0e87e1090df011b - v1.31.0: - sha1: 3ac8ce4f0f17a21e5531213025b0090c42310d08 v1.31.1: sha1: 0a682af6436ce4e7188f93ddeebff5c2f3be1592 kubelet: @@ -87,8 +85,6 @@ kubelet: sha1: c62da6ab918b8e56d7c9b77e642ffc73ffdbffac v1.30.3: sha1: fbae53efc43ec715a45b05415294ab991ea087a2 - v1.31.0: - sha1: b5cb543e21faaa600a5aac54a2316a9fd5e5b8c6 v1.31.1: sha1: fc7d0a9859c97ec2a2a4ac9ec1814b131e8d875f kubectl: @@ -132,8 +128,6 @@ kubectl: sha1: bced94239f1dbdb04d3a661a067bf9587865b6e8 v1.30.3: sha1: 097d6b02fabb284418a9c95ea81fa86fc3c85bb7 - v1.31.0: - sha1: 34214a4983223aa4e8d29063990a265b220bef5b v1.31.1: sha1: a0fd9dc942f533e2bdeaa4b2691fc408e334f922 calicoctl: @@ -199,9 +193,6 @@ calicoctl: v1.30.3: version: v3.28.1 sha1: 80f164a8248b8fa501f35f12cbcac0b059e665e2 - v1.31.0: - version: v3.28.1 - sha1: 80f164a8248b8fa501f35f12cbcac0b059e665e2 v1.31.1: version: v3.28.1 sha1: 80f164a8248b8fa501f35f12cbcac0b059e665e2 @@ -268,9 +259,6 @@ crictl: v1.30.3: version: v1.30.0 sha1: c81e76d5d4bf64d6b513485490722d2fc0a9a83b - v1.31.0: - version: v1.30.0 - sha1: c81e76d5d4bf64d6b513485490722d2fc0a9a83b v1.31.1: version: v1.30.0 sha1: c81e76d5d4bf64d6b513485490722d2fc0a9a83b diff --git a/test/unit/test_kubernetes_components.py b/test/unit/test_kubernetes_components.py index 476d289d9..012c4279e 100644 --- a/test/unit/test_kubernetes_components.py +++ b/test/unit/test_kubernetes_components.py @@ -133,7 +133,7 @@ def test_kubelet_local_mode_enrichment(self): # Enriched featureGates.ControlPlaneKubeletLocalMode=true for kubernetes 1.31+ inventory = demo.generate_inventory(**demo.ALLINONE) - inventory['services'].setdefault('kubeadm', {})['kubernetesVersion'] = 'v1.31.0' + inventory['services'].setdefault('kubeadm', {})['kubernetesVersion'] = 'v1.31.1' cluster = demo.new_cluster(inventory) kubeadm = cluster.inventory['services']['kubeadm'] self.assertIsNotNone(kubeadm.get('featureGates')) @@ -141,7 +141,7 @@ def test_kubelet_local_mode_enrichment(self): # Enriched featureGates.ControlPlaneKubeletLocalMode=true for kubernetes 1.31+ with not empty featureGates inventory = demo.generate_inventory(**demo.ALLINONE) - inventory['services'].setdefault('kubeadm', {})['kubernetesVersion'] = 'v1.31.0' + inventory['services'].setdefault('kubeadm', {})['kubernetesVersion'] = 'v1.31.1' inventory['services'].setdefault('kubeadm', {}).setdefault('featureGates', {})['foo'] = 'bar' cluster = demo.new_cluster(inventory) kubeadm = cluster.inventory['services']['kubeadm'] @@ -151,7 +151,7 @@ def test_kubelet_local_mode_enrichment(self): # Do not change featureGates.ControlPlaneKubeletLocalMode=true for kubernetes 1.31+ if value is overridden inventory = demo.generate_inventory(**demo.ALLINONE) - inventory['services'].setdefault('kubeadm', {})['kubernetesVersion'] = 'v1.31.0' + inventory['services'].setdefault('kubeadm', {})['kubernetesVersion'] = 'v1.31.1' inventory['services'].setdefault('kubeadm', {}).setdefault('featureGates', {})['ControlPlaneKubeletLocalMode'] = False cluster = demo.new_cluster(inventory) kubeadm = cluster.inventory['services']['kubeadm']