|
11 | 11 | family: 'Debian',
|
12 | 12 | name: 'Ubuntu',
|
13 | 13 | release: {
|
14 |
| - full: '16.04' |
| 14 | + full: '22.04' |
15 | 15 | },
|
16 | 16 | distro: {
|
17 |
| - codename: 'xenial' |
| 17 | + codename: 'jammy' |
18 | 18 | }
|
19 | 19 | }
|
20 | 20 | }
|
|
31 | 31 | 'kubernetes_yum_baseurl' => 'https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64',
|
32 | 32 | 'kubernetes_yum_gpgkey' => 'https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg',
|
33 | 33 | 'docker_apt_location' => 'https://download.docker.com/linux/ubuntu',
|
34 |
| - 'docker_apt_release' => 'xenial', |
| 34 | + 'docker_apt_release' => 'jammy', |
35 | 35 | 'docker_apt_repos' => 'main',
|
36 | 36 | 'docker_yum_baseurl' => 'https://download.docker.com/linux/centos/7/x86_64/stable',
|
37 | 37 | 'docker_yum_gpgkey' => 'https://download.docker.com/linux/centos/gpg',
|
|
62 | 62 | ensure: 'present',
|
63 | 63 | location: 'https://download.docker.com/linux/ubuntu',
|
64 | 64 | repos: 'main',
|
65 |
| - release: 'xenial', |
| 65 | + release: 'jammy', |
66 | 66 | key: { 'id' => '9DC858229FC7DD38854AE2D88D81803C0EBFCD88', 'source' => 'https://download.docker.com/linux/ubuntu/gpg' },
|
67 | 67 | )
|
68 | 68 | }
|
|
77 | 77 | family: 'Debian',
|
78 | 78 | name: 'Ubuntu',
|
79 | 79 | release: {
|
80 |
| - full: '16.04' |
| 80 | + full: '22.04' |
81 | 81 | },
|
82 | 82 | distro: {
|
83 |
| - codename: 'xenial' |
| 83 | + codename: 'jammy' |
84 | 84 | }
|
85 | 85 | }
|
86 | 86 | }
|
87 | 87 | end
|
88 | 88 | let(:params) do
|
89 | 89 | {
|
90 | 90 | 'container_runtime' => 'docker',
|
91 |
| - 'kubernetes_version' => '1.28.1', |
92 |
| - 'kubernetes_apt_location' => 'http://apt.kubernetes.io', |
93 |
| - 'kubernetes_apt_release' => 'kubernetes-xenial', |
| 91 | + 'kubernetes_version' => '1.29.2', |
| 92 | + 'kubernetes_apt_location' => 'http://myapt.example.org', |
| 93 | + 'kubernetes_apt_release' => 'jammy', |
94 | 94 | 'kubernetes_apt_repos' => 'main',
|
95 | 95 | 'kubernetes_key_id' => '54A647F9048D5688D7DA2ABE6A030B21BA07F4FB',
|
96 | 96 | 'kubernetes_key_source' => 'https://packages.cloud.google.com/apt/doc/apt-key.gpg',
|
97 | 97 | 'kubernetes_yum_baseurl' => 'https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64',
|
98 | 98 | 'kubernetes_yum_gpgkey' => 'https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg',
|
99 | 99 | 'docker_apt_location' => 'https://download.docker.com/linux/ubuntu',
|
100 |
| - 'docker_apt_release' => 'xenial', |
| 100 | + 'docker_apt_release' => 'jammy', |
101 | 101 | 'docker_apt_repos' => 'main',
|
102 | 102 | 'docker_yum_baseurl' => 'https://download.docker.com/linux/centos/7/x86_64/stable',
|
103 | 103 | 'docker_yum_gpgkey' => 'https://download.docker.com/linux/centos/gpg',
|
|
112 | 112 | it {
|
113 | 113 | expect(subject).to contain_apt__source('kubernetes').with(
|
114 | 114 | ensure: 'present',
|
115 |
| - location: 'http://apt.kubernetes.io', |
| 115 | + location: 'http://myapt.example.org', |
116 | 116 | repos: 'main',
|
117 |
| - release: 'kubernetes-xenial', |
| 117 | + release: 'jammy', |
118 | 118 | key: { 'id' => '54A647F9048D5688D7DA2ABE6A030B21BA07F4FB', 'source' => 'https://packages.cloud.google.com/apt/doc/apt-key.gpg' },
|
119 | 119 | )
|
120 | 120 | }
|
|
124 | 124 | ensure: 'present',
|
125 | 125 | location: 'https://download.docker.com/linux/ubuntu',
|
126 | 126 | repos: 'main',
|
127 |
| - release: 'xenial', |
| 127 | + release: 'jammy', |
128 | 128 | key: { 'id' => '9DC858229FC7DD38854AE2D88D81803C0EBFCD88', 'source' => 'https://download.docker.com/linux/ubuntu/gpg' },
|
129 | 129 | )
|
130 | 130 | }
|
|
139 | 139 | family: 'Debian',
|
140 | 140 | name: 'Ubuntu',
|
141 | 141 | release: {
|
142 |
| - full: '16.04' |
| 142 | + full: '22.04' |
143 | 143 | },
|
144 | 144 | distro: {
|
145 |
| - codename: 'xenial' |
| 145 | + codename: 'jammy' |
146 | 146 | }
|
147 | 147 | }
|
148 | 148 | }
|
|
325 | 325 | 'kubernetes_yum_baseurl' => 'https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64',
|
326 | 326 | 'kubernetes_yum_gpgkey' => 'https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg',
|
327 | 327 | 'docker_apt_location' => 'https://download.docker.com/linux/ubuntu',
|
328 |
| - 'docker_apt_release' => 'xenial', |
| 328 | + 'docker_apt_release' => 'jammy', |
329 | 329 | 'docker_apt_repos' => 'main',
|
330 | 330 | 'docker_yum_baseurl' => 'https://download.docker.com/linux/centos/7/x86_64/stable',
|
331 | 331 | 'docker_yum_gpgkey' => 'https://download.docker.com/linux/centos/gpg',
|
|
0 commit comments