Browse Source

Some update for the deploy on fedora coreos: (#10030)

- Test with new version: 37.20230322.3.0. Both containerd and
  cri-o is tested
- bugfix: when we use crio and the var bin_dir is changed,
  there will be some error about the new bin dir.
pull/10086/head
qlijin 1 year ago
committed by GitHub
parent
commit
b7a9217d77
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
  1. 2
      docs/fcos.md
  2. 7
      roles/container-engine/cri-o/tasks/main.yaml
  3. 4
      roles/container-engine/cri-o/templates/crio.conf.j2

2
docs/fcos.md

@ -1,6 +1,6 @@
# Fedora CoreOS
Tested with stable version 34.20210611.3.0
Tested with stable version 37.20230322.3.0
Because package installation with `rpm-ostree` requires a reboot, playbook may fail while bootstrap.
Restart playbook again.

7
roles/container-engine/cri-o/tasks/main.yaml

@ -90,6 +90,13 @@
remote_src: true
notify: restart crio
- name: cri-o | update the bin dir for crio.service file
replace:
dest: /etc/systemd/system/crio.service
regexp: "/usr/local/bin/crio"
replace: "{{ bin_dir }}/crio"
notify: restart crio
- name: cri-o | copy default policy
copy:
src: "{{ local_release_dir }}/cri-o/contrib/policy.json"

4
roles/container-engine/cri-o/templates/crio.conf.j2

@ -269,7 +269,11 @@ manage_ns_lifecycle = false
namespaces_dir = "/var/run"
# pinns_path is the path to find the pinns binary, which is needed to manage namespace lifecycle
{% if bin_dir == "/usr/local/bin" %}
pinns_path = ""
{% else %}
pinns_path = "{{ bin_dir }}/pinns"
{% endif %}
# The "crio.runtime.runtimes" table defines a list of OCI compatible runtimes.
# The runtime to use is picked based on the runtime_handler provided by the CRI.

Loading…
Cancel
Save