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

run the container-selinux installation on centos 7 as part of the 'install' step #5311

Merged
merged 1 commit into from
Aug 7, 2024
Merged

run the container-selinux installation on centos 7 as part of the 'install' step #5311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion addons/containerd/1.6.33/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ function containerd_install() {

containerd_migrate_from_docker

containerd_install_container_selinux_if_missing
install_host_packages "$src" containerd.io

chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
Expand Down Expand Up @@ -109,7 +110,6 @@ function containerd_install() {
function containerd_host_init() {
require_centos8_containerd
containerd_install_libzstd_if_missing
containerd_install_container_selinux_if_missing
}

function containerd_install_libzstd_if_missing() {
Expand Down
2 changes: 1 addition & 1 deletion addons/containerd/template/base/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ function containerd_install() {

containerd_migrate_from_docker

containerd_install_container_selinux_if_missing
install_host_packages "$src" containerd.io

chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc
Expand Down Expand Up @@ -109,7 +110,6 @@ function containerd_install() {
function containerd_host_init() {
require_centos8_containerd
containerd_install_libzstd_if_missing
containerd_install_container_selinux_if_missing
}

function containerd_install_libzstd_if_missing() {
Expand Down
14 changes: 14 additions & 0 deletions addons/containerd/template/testgrid/k8s-ctrd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,3 +373,17 @@
validate_read_write_object_store postupgrade upgradefile.txt
containerd --version
containerd --version | grep "__testver__"

- name: "flannel latest multinode"
installerSpec:
kubernetes:
version: "1.30.x"
flannel:
version: "latest"
containerd:
version: "__testver__"
s3Override: "__testdist__"
goldpinger:
version: "latest"
numPrimaryNodes: 1
numSecondaryNodes: 2
Loading