Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from
Jan 24, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7b1656
Use the fixed version (1.25.0) of cri-tools
przemyslavic Jan 23, 2023
8753c1c
Rename variable cri-tools_version to cri_tools_version
przemyslavic Jan 23, 2023
66ca602
Fix for RHEL and AlmaLinux
przemyslavic Jan 23, 2023
b8f78d7
Add changelog
przemyslavic Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ansible/playbooks/roles/kubernetes_common/tasks/install-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"}
2 changes: 1 addition & 1 deletion ...oks/roles/repository/files/download-requirements/requirements/aarch64/redhat/packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...pository/files/download-requirements/requirements/x86_64/debian/ubuntu-20.04/packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*'
Expand Down
2 changes: 1 addition & 1 deletion ...ooks/roles/repository/files/download-requirements/requirements/x86_64/redhat/packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions docs/changelogs/CHANGELOG-2.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions schema/common/defaults/configuration/kubernetes-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions schema/common/defaults/configuration/kubernetes-node.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
3 changes: 3 additions & 0 deletions schema/common/validation/configuration/kubernetes-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ properties:
type: string
cni_version:
type: string
cri_tools_version:
type: string
cluster_name:
type: string
allow_pods_on_master:
Expand Down Expand Up @@ -149,6 +151,7 @@ properties:
required:
- version
- cni_version
- cri_tools_version
- cluster_name
- allow_pods_on_master
- storage
Expand Down
2 changes: 2 additions & 0 deletions schema/common/validation/configuration/kubernetes-node.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@ properties:
type: string
cni_version:
type: string
cri_tools_version:
type: string
node_labels:
type: string