v1.31.1_&_dl.k8s.io_instead_of_storage.googleapis

Netcracker · Oct 15, 2024 · d9cab2b · d9cab2b
1 parent 63f210f
commit d9cab2b
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 14 deletions.
diff --git a/documentation/Installation.md b/documentation/Installation.md
@@ -2094,11 +2094,11 @@ By default, the installer installs the following thirdparties with the following
 services:
   thirdparties:
     /usr/bin/kubeadm:
-      source: 'https://storage.googleapis.com/kubernetes-release/release/{{k8s-version}}/bin/linux/amd64/kubeadm'
+      source: 'https://dl.k8s.io/{{k8s-version}}/bin/linux/amd64/kubeadm'
     /usr/bin/kubelet:
-      source: 'https://storage.googleapis.com/kubernetes-release/release/{{k8s-version}}/bin/linux/amd64/kubelet'
+      source: 'https://dl.k8s.io/{{k8s-version}}/bin/linux/amd64/kubelet'
     /usr/bin/kubectl:
-      source: 'https://storage.googleapis.com/kubernetes-release/release/{{k8s-version}}/bin/linux/amd64/kubectl'
+      source: 'https://dl.k8s.io/{{k8s-version}}/bin/linux/amd64/kubectl'
       group: control-plane
     /usr/bin/calicoctl:
       source: 'https://github.com/projectcalico/calico/releases/download/{{calico-version}}/calicoctl-linux-amd64'

diff --git a/documentation/Maintenance.md b/documentation/Maintenance.md
@@ -752,11 +752,11 @@ The procedure recovers thirdparties based on the `cluster.yaml`. If rpm thirdpar
 restore_plan:
   thirdparties:
     /usr/bin/kubeadm:
-      source: https://storage.googleapis.com/kubernetes-release/release/v1.18.8/bin/linux/amd64/kubeadm
+      source: https://dl.k8s.io/v1.18.8/bin/linux/amd64/kubeadm
     /usr/bin/kubelet:
-      source: https://storage.googleapis.com/kubernetes-release/release/v1.18.8/bin/linux/amd64/kubelet
+      source: https://dl.k8s.io/v1.18.8/bin/linux/amd64/kubelet
     /usr/bin/kubectl:
-      source: https://storage.googleapis.com/kubernetes-release/release/v1.18.8/bin/linux/amd64/kubectl
+      source: https://dl.k8s.io/v1.18.8/bin/linux/amd64/kubectl
     /usr/bin/calicoctl:
       source: https://github.com/projectcalico/calicoctl/releases/download/v3.14.1/calicoctl-linux-amd64
 ```

diff --git a/examples/procedure.yaml/full-restore.yaml b/examples/procedure.yaml/full-restore.yaml
@@ -12,11 +12,11 @@ restore_plan:
       peer_cacert: /etc/kubernetes/pki/etcd/ca.crt
   thirdparties:
     /usr/bin/kubeadm:
-      source: https://storage.googleapis.com/kubernetes-release/release/v1.18.8/bin/linux/amd64/kubeadm
+      source: https://dl.k8s.io/v1.18.8/bin/linux/amd64/kubeadm
     /usr/bin/kubelet:
-      source: https://storage.googleapis.com/kubernetes-release/release/v1.18.8/bin/linux/amd64/kubelet
+      source: https://dl.k8s.io/v1.18.8/bin/linux/amd64/kubelet
     /usr/bin/kubectl:
-      source: https://storage.googleapis.com/kubernetes-release/release/v1.18.8/bin/linux/amd64/kubectl
+      source: https://dl.k8s.io/v1.18.8/bin/linux/amd64/kubectl
     /opt/cni/cni-plugins-linux.tgz:
       source: https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz
     /usr/bin/calicoctl:

diff --git a/kubemarine/resources/configurations/compatibility/internal/kubernetes_images.yaml b/kubemarine/resources/configurations/compatibility/internal/kubernetes_images.yaml
@@ -43,6 +43,8 @@ kube-apiserver:
     version: v1.30.3
   v1.31.0:
     version: v1.31.0
+  v1.31.1:
+    version: v1.31.1
 kube-controller-manager:
   v1.26.3:
     version: v1.26.3
@@ -86,6 +88,8 @@ kube-controller-manager:
     version: v1.30.3
   v1.31.0:
     version: v1.31.0
+  v1.31.1:
+    version: v1.31.1
 kube-scheduler:
   v1.26.3:
     version: v1.26.3
@@ -129,6 +133,8 @@ kube-scheduler:
     version: v1.30.3
   v1.31.0:
     version: v1.31.0
+  v1.31.1:
+    version: v1.31.1
 kube-proxy:
   v1.26.3:
     version: v1.26.3
@@ -172,6 +178,8 @@ kube-proxy:
     version: v1.30.3
   v1.31.0:
     version: v1.31.0
+  v1.31.1:
+    version: v1.31.1
 pause:
   v1.26.3:
     version: '3.9'
@@ -215,6 +223,8 @@ pause:
     version: '3.9'
   v1.31.0:
     version: '3.10'
+  v1.31.1:
+    version: '3.10'
 etcd:
   v1.26.3:
     version: 3.5.6-0
@@ -258,6 +268,8 @@ etcd:
     version: 3.5.12-0
   v1.31.0:
     version: 3.5.15-0
+  v1.31.1:
+    version: 3.5.15-0
 coredns/coredns:
   v1.26.3:
     version: v1.9.3
@@ -301,3 +313,5 @@ coredns/coredns:
     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
@@ -47,6 +47,8 @@ containerd:
     version_debian: 1.6.*
   v1.31.0:
     version_debian: 1.6.*
+  v1.31.1:
+    version_debian: 1.6.*
 containerdio:
   v1.26.3:
     version_rhel: 1.6*
@@ -132,6 +134,10 @@ containerdio:
     version_rhel: 1.6*
     version_rhel8: 1.6*
     version_rhel9: 1.6*
+  v1.31.1:
+    version_rhel: 1.6*
+    version_rhel8: 1.6*
+    version_rhel9: 1.6*
 haproxy:
   version_rhel: 1.8*
   version_rhel8: 1.8*

diff --git a/kubemarine/resources/configurations/compatibility/internal/plugins.yaml b/kubemarine/resources/configurations/compatibility/internal/plugins.yaml
@@ -47,6 +47,8 @@ calico:
     version: v3.28.1
   v1.31.0:
     version: v3.28.1
+  v1.31.1:
+    version: v3.28.1
 nginx-ingress-controller:
   v1.26.3:
     version: v1.4.0
@@ -111,6 +113,9 @@ nginx-ingress-controller:
   v1.31.0:
     version: v1.11.1
     webhook-version: v1.4.1
+  v1.31.1:
+    version: v1.11.1
+    webhook-version: v1.4.1
 kubernetes-dashboard:
   v1.26.3:
     version: v2.7.0
@@ -175,6 +180,9 @@ kubernetes-dashboard:
   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
 local-path-provisioner:
   v1.26.3:
     version: v0.0.23
@@ -239,3 +247,6 @@ local-path-provisioner:
   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
@@ -44,6 +44,8 @@ kubeadm:
     sha1: f840e75f5dc1001ebdd7e286c0e87e1090df011b
   v1.31.0:
     sha1: 3ac8ce4f0f17a21e5531213025b0090c42310d08
+  v1.31.1:
+    sha1: 0a682af6436ce4e7188f93ddeebff5c2f3be1592
 kubelet:
   v1.26.3:
     sha1: 5fe320fedaabb91d3770da19135412b7454bb28b
@@ -87,6 +89,8 @@ kubelet:
     sha1: fbae53efc43ec715a45b05415294ab991ea087a2
   v1.31.0:
     sha1: b5cb543e21faaa600a5aac54a2316a9fd5e5b8c6
+  v1.31.1:
+    sha1: fc7d0a9859c97ec2a2a4ac9ec1814b131e8d875f
 kubectl:
   v1.26.3:
     sha1: 56916d87c3caef05489db932fd9e48d32ebdf634
@@ -130,6 +134,8 @@ kubectl:
     sha1: 097d6b02fabb284418a9c95ea81fa86fc3c85bb7
   v1.31.0:
     sha1: 34214a4983223aa4e8d29063990a265b220bef5b
+  v1.31.1:
+    sha1: a0fd9dc942f533e2bdeaa4b2691fc408e334f922
 calicoctl:
 # calicoctl version is duplicated from kubemarine/resources/configurations/compatibility/kubernetes_versions.yaml
 # It also corresponds to the plugin version in kubemarine/resources/configurations/compatibility/internal/plugins.yaml
@@ -196,6 +202,9 @@ calicoctl:
   v1.31.0:
     version: v3.28.1
     sha1: 80f164a8248b8fa501f35f12cbcac0b059e665e2
+  v1.31.1:
+    version: v3.28.1
+    sha1: 80f164a8248b8fa501f35f12cbcac0b059e665e2
 crictl:
 # crictl version is duplicated from kubemarine/resources/configurations/compatibility/kubernetes_versions.yaml
 # for backward compatibility with clusters in a private environment.
@@ -262,3 +271,6 @@ crictl:
   v1.31.0:
     version: v1.30.0
     sha1: c81e76d5d4bf64d6b513485490722d2fc0a9a83b
+  v1.31.1:
+    version: v1.30.0
+    sha1: c81e76d5d4bf64d6b513485490722d2fc0a9a83b
diff --git a/kubemarine/resources/configurations/compatibility/kubernetes_versions.yaml b/kubemarine/resources/configurations/compatibility/kubernetes_versions.yaml
@@ -140,6 +140,12 @@ compatibility_map:
     kubernetes-dashboard: v2.7.0
     local-path-provisioner: v0.0.27
     crictl: v1.30.0
+  v1.31.1:
+    calico: v3.28.1
+    nginx-ingress-controller: v1.11.1
+    kubernetes-dashboard: v2.7.0
+    local-path-provisioner: v0.0.27
+    crictl: v1.30.0
 # After any change, please run scripts/thirdparties/sync.py
 
 # The following optional keys are supported in addition to the 5 required software keys:

diff --git a/kubemarine/resources/configurations/globals.yaml b/kubemarine/resources/configurations/globals.yaml
@@ -128,19 +128,19 @@ thirdparties:
   /usr/bin/kubeadm:
     software_name: kubeadm
     source_prefix:
-      public: https://storage.googleapis.com/kubernetes-release/release
+      public: https://dl.k8s.io
       private: '{registry}/kubernetes/kubeadm'
     relative_path: '{version}/bin/linux/amd64/kubeadm'
   /usr/bin/kubelet:
     software_name: kubelet
     source_prefix:
-      public: https://storage.googleapis.com/kubernetes-release/release
+      public: https://dl.k8s.io
       private: '{registry}/kubernetes/kubelet'
     relative_path: '{version}/bin/linux/amd64/kubelet'
   /usr/bin/kubectl:
     software_name: kubectl
     source_prefix:
-      public: https://storage.googleapis.com/kubernetes-release/release
+      public: https://dl.k8s.io
       private: '{registry}/kubernetes/kubectl'
     relative_path: '{version}/bin/linux/amd64/kubectl'
   /usr/bin/calicoctl:

diff --git a/test/unit/core/test_env.py b/test/unit/core/test_env.py
@@ -156,7 +156,7 @@ def test_kubernetes_version_env_variable(self):
 
         inventory = self.resources.working_inventory
         self.assertEqual(kubernetes_version, inventory['services']['kubeadm']['kubernetesVersion'])
-        expected_source = (f'https://storage.googleapis.com/kubernetes-release/release/'
+        expected_source = (f'https://dl.k8s.io/'
                            f'{kubernetes_version}/bin/linux/amd64/kubeadm')
         self.assertEqual(expected_source,
                          inventory['services']['thirdparties']['/usr/bin/kubeadm']['source'])
@@ -183,7 +183,7 @@ def test_kubernetes_version_upgrade_env_variable(self):
 
         inventory = self.resources.working_inventory
         self.assertEqual(after, inventory['services']['kubeadm']['kubernetesVersion'])
-        self.assertEqual(f'https://storage.googleapis.com/kubernetes-release/release/{after}/bin/linux/amd64/kubeadm',
+        self.assertEqual(f'https://dl.k8s.io/{after}/bin/linux/amd64/kubeadm',
                          inventory['services']['thirdparties']['/usr/bin/kubeadm']['source'])
         self.assertEqual('containerd_new',
                          inventory['services']['packages']['associations']['rhel']['containerd']['package_name'])