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

Update k8s/cri-o repositories #94

Closed
wants to merge 1 commit into from
Closed

Update k8s/cri-o repositories #94

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
46 changes: 1 addition & 45 deletions manifests/install/container_runtime.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,51 +21,7 @@
) {
case $container_manager {
'crio': {
if fact('os.family') == 'Debian' {
$_crio_version = $k8s_version.split('\.')[0, 2].join('.')
if versioncmp($_crio_version, '1.17') < 0 {
$pkg = pick($crio_package, "cri-o-${_crio_version}")
} else {
$pkg = pick($crio_package, 'cri-o')
}

# This is needed by cri-o, but it is not a dependency of the package
package { 'runc':
ensure => $runc_version,
}

# Avoid a potential issue with some CRI-o versions
file { ['/usr/lib/cri-o-runc/sbin', '/usr/lib/cri-o-runc']:
ensure => directory,
}

file { '/usr/lib/cri-o-runc/sbin/runc':
ensure => link,
target => '/usr/sbin/runc',
replace => false,
}
} else {
$pkg = pick($crio_package, 'cri-o')
}

file { '/usr/libexec/crio/conmon':
ensure => link,
target => '/usr/bin/conmon',
replace => false,
require => Package['k8s container manager'],
}

file { '/etc/cni/net.d/100-crio-bridge.conf':
ensure => absent,
require => Package['k8s container manager'],
}

file_line { 'K8s crio cgroup manager':
path => '/etc/crio/crio.conf',
line => 'cgroup_manager = "systemd"',
match => '^cgroup_manager',
require => Package['k8s container manager'],
}
$pkg = pick($crio_package, 'cri-o')
}
'containerd': {
file { '/etc/containerd':
Expand Down
36 changes: 23 additions & 13 deletions manifests/repo.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,13 @@
Boolean $manage_container_manager = $k8s::manage_container_manager,
K8s::Container_runtimes $container_manager = $k8s::container_manager,
String[1] $crio_version = $k8s::version.split('\.')[0, 2].join('.'),
Boolean $use_kubic_repos = false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please document the new parameter with puppet-strings

Copy link
Author

@jorhett jorhett May 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy to do all the tidy bits once I get consensus that this is an approach ya'all agree with. If I can get pre-approval that going this direction is agreeable (dropping all obsolete k8s version support, etc) I'm happy to invest a few hours making it perfect.

So this is only intended to hit the target of "should work for you if you want to test it" and "something for us to discuss"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personally not against dropping kubic entirely, optionally even with a catalog fail condition on Kubernetes <1.24 versions, since those versions are long since deprecated.
Unfortunately the migration from kubic to the new isv:kubernetes repos can be difficult to automate, since some packages have migrated concerns between them.

On Debian, a complete uninstall of cri-o and conmon is necessary before the isv:kubernetes cri-o package can be installed - as one example.

) {
case fact('os.family') {
'Debian': {
case fact('os.name') {
'Debian': {
if versioncmp($crio_version, '1.19') >= 0 {
$release_name = "Debian_${fact('os.release.major')}"
} else {
$release_name = 'Debian_Testing'
}
$release_name = "Debian_${fact('os.release.major')}"
}
'Ubuntu': {
$release_name = "xUbuntu_${fact('os.release.full')}"
Expand All @@ -28,26 +25,39 @@
default: {}
}

$libcontainers_url = "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/${release_name}"
$crio_url = "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/${crio_version}/${release_name}"
if $use_kubic_repos {
$kubernames_name = 'libcontainers:stable'
$kubernames_repo = "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/${release_name}"
$kubernetes_key = '2472D6D0D2F66AF87ABA8DA34D64390375060AA4',
$crio_name = 'libcontainers:stable:cri-o'
$crio_url = "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/${crio_version}/${release_name}"
$crio_key = '2472D6D0D2F66AF87ABA8DA34D64390375060AA4',
} else {
$kubernetes_name = 'kubernetes'
$kubernetes_repo = "https://pkgs.k8s.io/core:/stable:/v${crio_version}/deb"
$kubernetes_key = 'kubernetes-apt-keyring.gpg'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be kubernetes-apt-keyring.asc

$crio_name = 'cri-o'
$crio_url = "https://pkgs.k8s.io/addons:/cri-o:/stable:/v${crio_version}/deb"
$crio_key = 'cri-o-apt-keyring.gpg'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be cri-o-apt-keyring.asc

}

apt::source { 'libcontainers:stable':
location => $libcontainers_url,
apt::source { $kubernames_name:
location => $kubernetes_repo,
repos => '/',
release => '',
key => {
id => '2472D6D0D2F66AF87ABA8DA34D64390375060AA4',
source => "${libcontainers_url}/Release.key",
name => $kubernetes_key,
source => "${kubernetes_repo}/Release.key",
},
}

if $manage_container_manager and $container_manager == 'crio' {
apt::source { 'libcontainers:stable:cri-o':
apt::source { $crio_name:
location => $crio_url,
repos => '/',
release => '',
key => {
id => '2472D6D0D2F66AF87ABA8DA34D64390375060AA4',
name => $crio_key,
source => "${crio_url}/Release.key",
},
}
Expand Down
Loading