Skip to content

Commit 3f41879

Browse files
committed
Fix crio package repository, allow data adjustment
Add slashes after variable for consistency
1 parent 2396e8f commit 3f41879

File tree

2 files changed

+28
-6
lines changed

2 files changed

+28
-6
lines changed

REFERENCE.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -971,6 +971,8 @@ The following parameters are available in the `k8s::repo` class:
971971
* [`manage_container_manager`](#-k8s--repo--manage_container_manager)
972972
* [`container_manager`](#-k8s--repo--container_manager)
973973
* [`major_version`](#-k8s--repo--major_version)
974+
* [`core_package_base`](#-k8s--repo--core_package_base)
975+
* [`crio_package_base`](#-k8s--repo--crio_package_base)
974976

975977
##### <a name="-k8s--repo--manage_container_manager"></a>`manage_container_manager`
976978

@@ -996,6 +998,22 @@ The major version of Kubernetes to deploy repos for
996998

997999
Default value: `$k8s::version.split('\.')[0, 2].join('.')`
9981000

1001+
##### <a name="-k8s--repo--core_package_base"></a>`core_package_base`
1002+
1003+
Data type: `String[1]`
1004+
1005+
1006+
1007+
Default value: `'https://pkgs.k8s.io/core:/stable'`
1008+
1009+
##### <a name="-k8s--repo--crio_package_base"></a>`crio_package_base`
1010+
1011+
Data type: `String[1]`
1012+
1013+
1014+
1015+
Default value: `'https://download.opensuse.org/repositories/isv'`
1016+
9991017
### <a name="k8s--server"></a>`k8s::server`
10001018

10011019
Sets up a Kubernetes server instance

manifests/repo.pp

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,20 @@
33
# @param manage_container_manager Whether to add the CRI-o repository or not
44
# @param container_manager The name of the container manager
55
# @param major_version The major version of Kubernetes to deploy repos for
6+
# @param core_package_base The url base of the k8s core packages
7+
# @param crio_package_base The url base of the cri-o packages
68
#
79
class k8s::repo (
810
Boolean $manage_container_manager = $k8s::manage_container_manager,
911
K8s::Container_runtimes $container_manager = $k8s::container_manager,
1012
String[1] $major_version = $k8s::version.split('\.')[0, 2].join('.'),
13+
String[1] $core_package_base = 'https://pkgs.k8s.io/core:/stable',
14+
String[1] $crio_package_base = 'https://download.opensuse.org/repositories/isv:/cri-o:/stable',
1115
) {
1216
case fact('os.family') {
1317
'Debian': {
14-
$core_url = "https://pkgs.k8s.io/core:/stable:/v${major_version}/deb"
15-
$crio_url = "https://pkgs.k8s.io/addons:/cri-o:/stable:/v${major_version}/deb"
18+
$core_url = "${core_package_base}:/v${major_version}/deb"
19+
$crio_url = "${crio_package_base}:/v${major_version}/deb"
1620

1721
apt::source { 'libcontainers:stable':
1822
ensure => absent,
@@ -49,8 +53,8 @@
4953
}
5054
}
5155
'RedHat': {
52-
$core_url = "https://pkgs.k8s.io/core:/stable:/v${major_version}/rpm"
53-
$crio_url = "https://pkgs.k8s.io/addons:/cri-o:/stable:/v${major_version}/rpm"
56+
$core_url = "${core_package_base}:/v${major_version}/rpm"
57+
$crio_url = "${crio_package_base}:/v${major_version}/rpm"
5458

5559
yumrepo { 'libcontainers:stable':
5660
ensure => absent,
@@ -59,7 +63,7 @@
5963
descr => 'Stable releases of Kubernetes',
6064
baseurl => $core_url,
6165
gpgcheck => 1,
62-
gpgkey => "${core_url}repodata/repomd.xml.key",
66+
gpgkey => "${core_url}/repodata/repomd.xml.key",
6367
}
6468

6569
if $manage_container_manager {
@@ -72,7 +76,7 @@
7276
descr => 'Stable releases of CRI-o',
7377
baseurl => $crio_url,
7478
gpgcheck => 1,
75-
gpgkey => "${crio_url}repodata/repomd.xml.key",
79+
gpgkey => "${crio_url}/repodata/repomd.xml.key",
7680
}
7781
}
7882
'containerd': {

0 commit comments

Comments
 (0)