Use the fixed version (1.25.0) of cri-tools (#3314)

hitachienergy · Jan 24, 2023 · 81d28c1 · 81d28c1
1 parent 03f16dc
commit 81d28c1
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 3 deletions.
diff --git a/ansible/playbooks/roles/kubernetes_common/tasks/install-packages.yml b/ansible/playbooks/roles/kubernetes_common/tasks/install-packages.yml
@@ -29,10 +29,12 @@
         - kubectl={{ specification.version }}-00
         - kubeadm={{ specification.version }}-00
         - kubernetes-cni={{ specification.cni_version }}-00
+        - cri-tools={{ specification.cri_tools_version }}-00
       RedHat:
         - kubelet-{{ specification.version }}-0
         - kubectl-{{ specification.version }}-0
         - kubeadm-{{ specification.version }}-0
         - kubernetes-cni-{{ specification.cni_version }}-0
+        - cri-tools-{{ specification.cri_tools_version }}-0
   module_defaults:
     yum: {lock_timeout: "{{ yum_lock_timeout }}"}
diff --git a/...oks/roles/repository/files/download-requirements/requirements/aarch64/redhat/packages.yml b/...oks/roles/repository/files/download-requirements/requirements/aarch64/redhat/packages.yml
@@ -28,7 +28,7 @@ packages:
     - 'containerd.io-1.5.11'
     - 'container-selinux'
     - 'copy-jdk-configs'  # for java-1.8.0-openjdk-headless
-    - 'cri-tools'
+    - 'cri-tools-1.25.0'
     - 'cups-libs'  # for java-1.8.0-openjdk-headless
     - 'curl'
     - 'dejavu-sans-fonts'  # for grafana

diff --git a/...pository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml b/...pository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml
@@ -8,7 +8,7 @@ packages:
     - 'ca-certificates'
     - 'cifs-utils'
     - 'containerd.io=1.5.11*'
-    - 'cri-tools=1.13.0*'
+    - 'cri-tools=1.25.0*'
     - 'curl'
     - 'docker-ce=5:20.10.8*'
     - 'docker-ce-cli=5:20.10.8*'

diff --git a/...ooks/roles/repository/files/download-requirements/requirements/x86_64/redhat/packages.yml b/...ooks/roles/repository/files/download-requirements/requirements/x86_64/redhat/packages.yml
@@ -29,7 +29,7 @@ packages:
     - 'containerd.io-1.5.11'
     - 'container-selinux'
     - 'copy-jdk-configs'  # for java-1.8.0-openjdk-headless
-    - 'cri-tools'
+    - 'cri-tools-1.25.0'
     - 'cups-libs'  # for java-1.8.0-openjdk-headless
     - 'curl'
     - 'dejavu-sans-fonts'  # for grafana

diff --git a/docs/changelogs/CHANGELOG-2.0.md b/docs/changelogs/CHANGELOG-2.0.md
@@ -1,6 +1,12 @@
 <!-- markdownlint-disable-file no-duplicate-header -->
 # Changelog 2.0
 
+## [2.0.4] YYYY-MM-DD
+
+### Fixed
+
+- [#3315](https://github.com/epiphany-platform/epiphany/issues/3315) - Failed to initialize Kubernetes cluster: CRI v1 runtime API is not implemented
+
 ## [2.0.3] 2023-01-04
 
 ### Fixed

diff --git a/schema/common/defaults/configuration/kubernetes-master.yml b/schema/common/defaults/configuration/kubernetes-master.yml
@@ -5,6 +5,7 @@ name: default
 specification:
   version: 1.22.4
   cni_version: 0.8.7
+  cri_tools_version: 1.25.0
   cluster_name: "kubernetes-epiphany"
   allow_pods_on_master: False
   storage:

diff --git a/schema/common/defaults/configuration/kubernetes-node.yml b/schema/common/defaults/configuration/kubernetes-node.yml
@@ -5,4 +5,5 @@ name: default
 specification:
   version: 1.22.4
   cni_version: 0.8.7
+  cri_tools_version: 1.25.0
   node_labels: "node-type=epiphany"
diff --git a/schema/common/validation/configuration/kubernetes-master.yml b/schema/common/validation/configuration/kubernetes-master.yml
@@ -8,6 +8,8 @@ properties:
     type: string
   cni_version:
     type: string
+  cri_tools_version:
+    type: string
   cluster_name:
     type: string
   allow_pods_on_master:
@@ -149,6 +151,7 @@ properties:
 required:
 - version
 - cni_version
+- cri_tools_version
 - cluster_name
 - allow_pods_on_master
 - storage

diff --git a/schema/common/validation/configuration/kubernetes-node.yml b/schema/common/validation/configuration/kubernetes-node.yml
@@ -8,5 +8,7 @@ properties:
     type: string
   cni_version:
     type: string
+  cri_tools_version:
+    type: string
   node_labels:
     type: string