Skip to content

Commit 9bc2c68

Browse files
committed
Override 'main' value in apt::source::repo param
1 parent 64f01a5 commit 9bc2c68

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

manifests/repos.pp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,17 @@
6565
if $create_repos {
6666
$parts = split($kubernetes_version, '[.]')
6767
$minor_version = "${parts[0]}.${parts[1]}"
68+
$_repos = $kubernetes_apt_repos ? {
69+
undef => '',
70+
default => $kubernetes_apt_repos
71+
}
6872
case $facts['os']['family'] {
6973
'Debian': {
7074
$codename = fact('os.distro.codename')
7175
apt::source { 'kubernetes':
7276
location => pick($kubernetes_apt_location,"https://pkgs.k8s.io/core:/stable:/v${minor_version}/deb"),
7377
release => pick($kubernetes_apt_release, '/'),
74-
repos => $kubernetes_apt_repos,
78+
repos => $_repos,
7579
key => {
7680
'id' => pick($kubernetes_key_id,'DE15B14486CD377B9E876E1A234654DA9A296436'),
7781
'source' => pick($kubernetes_key_source,"https://pkgs.k8s.io/core:/stable:/v${minor_version}/deb/Release.key"),

spec/classes/repos_spec.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@
5252
)
5353
}
5454

55+
it {
56+
expect(subject).to contain_file('/etc/apt/sources.list.d/kubernetes.list')
57+
.with_content(%r{^deb https://pkgs.k8s.io/core:/stable:/v1.28/deb /\s$})
58+
}
59+
5560
it {
5661
expect(subject).to contain_apt__source('docker').with(
5762
ensure: 'present',

0 commit comments

Comments
 (0)