diff --git a/.fixtures.yml b/.fixtures.yml index 0702e5146..433fd8f15 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -24,12 +24,12 @@ fixtures: logrotate: {"repo": "puppet/logrotate", "ref": "7.1.0" } nginx: {"repo": "puppet/nginx", "ref": "6.0.1" } php: {"repo": "puppet/php", "ref": "10.2.0"} - unattended_upgrades: {"repo": "puppet/unattended_upgrades", "ref": "8.1.0" } - apt: {"repo": "puppetlabs/apt", "ref": "9.4.0" } + unattended_upgrades: {"repo": "puppet/unattended_upgrades", "ref": "8.2.0" } + apt: {"repo": "puppetlabs/apt", "ref": "10.0.0"} augeas_core: {"repo": "puppetlabs/augeas_core", "ref": "1.5.0" } concat: {"repo": "puppetlabs/concat", "ref": "9.0.2" } cron_core: {"repo": "puppetlabs/cron_core", "ref": "1.3.0" } - docker: {"repo": "puppetlabs/docker", "ref": "10.0.1"} + docker: {"repo": "puppetlabs/docker", "ref": "10.1.0"} firewall: {"repo": "puppetlabs/firewall", "ref": "8.1.1" } host_core: {"repo": "puppetlabs/host_core", "ref": "1.3.0" } inifile: {"repo": "puppetlabs/inifile", "ref": "6.1.1" } diff --git a/manifests/profile/kubernetes/apt.pp b/manifests/profile/kubernetes/apt.pp index fc384653d..78a6126a5 100644 --- a/manifests/profile/kubernetes/apt.pp +++ b/manifests/profile/kubernetes/apt.pp @@ -10,7 +10,6 @@ apt::source { 'kubernetes': location => $location, release => '/', - repos => '', key => { 'name' => 'k8s.io.asc', 'source' => 'puppet:///modules/nebula/apt/keyrings/k8s.io.asc', diff --git a/metadata.json b/metadata.json index 0610f6119..d802f1a5f 100644 --- a/metadata.json +++ b/metadata.json @@ -13,13 +13,13 @@ {"name": "puppet/letsencrypt", "version_requirement": ">= 11.1.0 < 12.0.0"}, {"name": "puppet/logrotate", "version_requirement": ">= 7.1.0 < 8.0.0" }, {"name": "puppet/nginx", "version_requirement": ">= 6.0.1 < 7.0.0" }, - {"name": "puppet/php", "version_requirement": ">= 10.2.0 < 11.0.0"}, - {"name": "puppet/unattended_upgrades", "version_requirement": ">= 8.1.0 < 9.0.0" }, - {"name": "puppetlabs/apt", "version_requirement": ">= 9.4.0 < 10.0.0"}, +/* {"name": "puppet/php", "version_requirement": ">= 10.2.0 < 11.0.0"}, */ + {"name": "puppet/unattended_upgrades", "version_requirement": ">= 8.2.0 < 9.0.0" }, + {"name": "puppetlabs/apt", "version_requirement": ">= 10.0.0 < 11.0.0"}, {"name": "puppetlabs/augeas_core", "version_requirement": ">= 1.5.0 < 2.0.0" }, {"name": "puppetlabs/concat", "version_requirement": ">= 9.0.2 < 10.0.0"}, {"name": "puppetlabs/cron_core", "version_requirement": ">= 1.3.0 < 2.0.0" }, - {"name": "puppetlabs/docker", "version_requirement": ">= 10.0.1 < 11.0.0"}, +/* {"name": "puppetlabs/docker", "version_requirement": ">= 10.1.0 < 11.0.0"}, */ {"name": "puppetlabs/firewall", "version_requirement": ">= 8.1.1 < 9.0.0" }, {"name": "puppetlabs/host_core", "version_requirement": ">= 1.3.0 < 2.0.0" }, {"name": "puppetlabs/inifile", "version_requirement": ">= 6.1.1 < 7.0.0" }, diff --git a/spec/classes/profile/kubernetes/kubelet_spec.rb b/spec/classes/profile/kubernetes/kubelet_spec.rb index 879e7b0d4..b8d1c3d74 100644 --- a/spec/classes/profile/kubernetes/kubelet_spec.rb +++ b/spec/classes/profile/kubernetes/kubelet_spec.rb @@ -78,7 +78,6 @@ expect(subject).to contain_apt__source("kubernetes").with( location: "https://pkgs.k8s.io/core:/stable:/v1.29/deb/", release: "/", - repos: "", key: { "name" => "k8s.io.asc", "source" => "puppet:///modules/nebula/apt/keyrings/k8s.io.asc"