Skip to content

Commit f9b45f0

Browse files
(PE-40784) Add support for PE 2023.8.2 and 2025.1.0 (#560)
1 parent c8168e9 commit f9b45f0

23 files changed

+39
-75
lines changed

.github/workflows/test-add-compiler-matrix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
architecture: [standard, large, extra-large]
39-
version: [2021.7.9, 2023.8.1, 2025.0.0]
39+
version: [2021.7.9, 2023.8.2, 2025.1.0]
4040
image: [almalinux-cloud/almalinux-8]
4141
steps:
4242
- name: Checkout Source

.github/workflows/test-add-compiler.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
version:
1515
description: PE version to install
1616
required: true
17-
default: 2023.8.1
17+
default: 2023.8.2
1818
ssh-debugging:
1919
description: Boolean; whether or not to pause for ssh debugging
2020
required: true

.github/workflows/test-add-replica-matrix.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
architecture: [standard, standard-with-dr, large, extra-large]
39-
version: [2023.8.1, 2025.0.0]
39+
version: [2023.8.2, 2025.1.0]
4040
image: [almalinux-cloud/almalinux-8]
4141
steps:
4242
- name: Checkout Source

.github/workflows/test-add-replica.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
version:
1515
description: PE version to install
1616
required: true
17-
default: 2023.8.1
17+
default: 2023.8.2
1818
ssh-debugging:
1919
description: Boolean; whether or not to pause for ssh debugging
2020
required: true

.github/workflows/test-backup-restore.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ on:
2424
version:
2525
description: PE version to install
2626
required: true
27-
default: 2025.0.0
27+
default: 2025.1.0
2828
ssh-debugging:
2929
description: Boolean; whether or not to pause for ssh debugging
3030
required: true
3131
default: 'false'
3232
jobs:
3333
backup-restore-test:
34-
name: "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.0.0' }}\
34+
name: "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.1.0' }}\
3535
\ ${{ github.event.inputs.architecture || 'extra-large' }} on ${{ github.event.inputs.image || 'almalinux-cloud/almalinux-8' }}"
3636
runs-on: ubuntu-20.04
3737
env:

.github/workflows/test-failover.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
version_to_upgrade:
1515
description: PE version to upgrade to
1616
required: false
17-
default: 2023.8.1
17+
default: 2023.8.2
1818
ssh-debugging:
1919
description: Boolean; whether or not to pause for ssh debugging
2020
required: true

.github/workflows/test-fips-install-matrix.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
fail-fast: false
3838
matrix:
3939
architecture: [standard-with-dr, large, extra-large-with-dr]
40-
version: [2019.8.12, 2021.7.9, 2023.8.1, 2025.0.0]
40+
version: [2019.8.12, 2021.7.9, 2023.8.2, 2025.1.0]
4141
image: [rhel-8]
4242
fips: [enable]
4343
steps:

.github/workflows/test-install-matrix.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
architecture: [standard-with-dr, large, extra-large-with-dr]
39-
version: [2019.8.12, 2021.7.9, 2023.8.1, 2025.0.0]
39+
version: [2019.8.12, 2021.7.9, 2023.8.2, 2025.1.0]
4040
image: [almalinux-cloud/almalinux-8]
4141
steps:
4242
- name: Checkout Source

.github/workflows/test-install-rhel-9.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
architecture: [standard-with-dr, large, extra-large-with-dr]
39-
version: [2021.7.9, 2023.8.1, 2025.0.0]
39+
version: [2021.7.9, 2023.8.2, 2025.1.0]
4040
image: [rhel-9]
4141
steps:
4242
- name: Checkout Source

.github/workflows/test-install.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
version:
1515
description: PE version to install
1616
required: true
17-
default: 2023.8.1
17+
default: 2023.8.2
1818
ssh-debugging:
1919
description: Boolean; whether or not to pause for ssh debugging
2020
required: true

.github/workflows/test-legacy-compilers.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
--modulepath spec/fixtures/modules \
100100
architecture=large-with-dr \
101101
console_password=${{ secrets.CONSOLE_PASSWORD }} \
102-
version=2025.0.0
102+
version=2025.1.0
103103
- name: Wait as long as the file ${HOME}/pause file is present
104104
if: ${{ always() && github.event.inputs.ssh-debugging == 'true' }}
105105
run: |

.github/workflows/test-legacy-upgrade.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ jobs:
152152
compiler=$(yq '.groups[].targets[] | select(.vars.role == "compiler") | .name' spec/fixtures/litmus_inventory.yaml | head -n 1)
153153
legacy_compiler=$(yq '.groups[].targets[] | select(.vars.role == "compiler") | .name' spec/fixtures/litmus_inventory.yaml | sed -n 2p)
154154
replica=$(yq '.groups[].targets[] | select(.vars.role == "replica") | .name' spec/fixtures/litmus_inventory.yaml)
155-
echo -n '{ "primary_host": "'$primary'", "replica_host": "'$replica'", "compiler_hosts": ["'$compiler'", "'$legacy_compiler'"], "version": "2025.0.0"}' > upgrade_params.json
155+
echo -n '{ "primary_host": "'$primary'", "replica_host": "'$replica'", "compiler_hosts": ["'$compiler'", "'$legacy_compiler'"], "version": "2025.1.0"}' > upgrade_params.json
156156
- name: Upgrade PE with legacy compilers
157157
run: |
158158
echo ::group::upgrade_params.json

.github/workflows/test-migration.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
# - extra-large
4444
# - large-with-dr
4545
# - extra-large-with-dr
46-
version: [2021.7.9, 2023.8.1, 2025.0.0]
46+
version: [2021.7.9, 2023.8.2, 2025.1.0]
4747
image: [almalinux-cloud/almalinux-8]
4848
include:
4949
- architecture: standard

.github/workflows/test-replace-failed-postgresql.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
matrix:
3838
architecture: [extra-large-with-dr-and-spare-replica]
3939
install_architecture: [extra-large-with-dr]
40-
version: [2021.7.9, 2023.8.1, 2025.0.0]
40+
version: [2021.7.9, 2023.8.2, 2025.1.0]
4141
image: [almalinux-cloud/almalinux-8]
4242
steps:
4343
- name: Checkout Source

.github/workflows/test-upgrade-latest-dev.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
type: string
2424
required: true
2525
description: The initial version of PE to install before upgrade
26-
default: 2023.8.1
26+
default: 2023.8.2
2727
ssh-debugging:
2828
description: Boolean; whether or not to pause for ssh debugging
2929
required: true

.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
architecture: [extra-large-with-dr]
19-
version: [2023.8.1]
19+
version: [2023.8.2]
2020
image: [almalinux-cloud/almalinux-8]
2121
steps:
2222
- name: Checkout Source

.github/workflows/test-upgrade-matrix.yaml

+11-9
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,27 @@ jobs:
3737
fail-fast: false
3838
matrix:
3939
architecture: [standard, extra-large-with-dr]
40-
version: [2019.8.12, 2021.7.9, 2023.8.1]
41-
version_to_upgrade: [2021.7.9, 2023.8.1, 2025.0.0]
40+
version: [2019.8.12, 2021.7.9, 2023.8.2]
41+
version_to_upgrade: [2021.7.9, 2023.8.2, 2025.1.0]
4242
image: [almalinux-cloud/almalinux-8]
4343
download_mode: [direct]
4444
exclude:
4545
- version: 2019.8.12
46-
version_to_upgrade: 2023.8.1
46+
version_to_upgrade: 2023.8.2
4747
- version: 2019.8.12
48-
version_to_upgrade: 2025.0.0
48+
version_to_upgrade: 2025.1.0
4949
- version: 2021.7.9
5050
version_to_upgrade: 2021.7.9
5151
- version: 2021.7.9
52-
version_to_upgrade: 2025.0.0
53-
- version: 2023.8.1
54-
version_to_upgrade: 2023.8.1
55-
- version: 2023.8.1
56-
version_to_upgrade: 2025.0.0
52+
version_to_upgrade: 2025.1.0
5753
- version: 2023.8.1
54+
version_to_upgrade: 2023.8.2
55+
- version: 2023.8.2
56+
version_to_upgrade: 2025.1.0
57+
- version: 2023.8.2
5858
version_to_upgrade: 2021.7.9
59+
- version: 2025.0.0
60+
version_to_upgrade: 2025.1.0
5961
steps:
6062
- name: Start SSH session
6163
if: ${{ github.event.inputs.ssh-debugging == 'true' }}

REFERENCE.md

+2-43
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ Supported use cases:
108108
* [`peadm::backup_ca`](#peadm--backup_ca)
109109
* [`peadm::convert`](#peadm--convert): Convert an existing PE cluster to a PEAdm-managed cluster
110110
* [`peadm::install`](#peadm--install): Install a new PE cluster
111-
* [`peadm::migrate`](#peadm--migrate): Migrate a PE primary server to a new host
112111
* [`peadm::modify_certificate`](#peadm--modify_certificate): Modify the certificate of one or more targets
113112
* [`peadm::replace_failed_postgresql`](#peadm--replace_failed_postgresql): Replaces a failed PostgreSQL host
114113
* [`peadm::restore`](#peadm--restore): Restore puppet primary configuration
@@ -120,6 +119,7 @@ Supported use cases:
120119
#### Private Plans
121120

122121
* `peadm::convert_compiler_to_legacy`
122+
* `peadm::migrate`: Migrate a PE primary server to a new host - Note: this plan is a work in progress and it
123123
* `peadm::misc::divert_code_manager`: This plan exists to account for a scenario where a PE XL
124124
* `peadm::modify_cert_extensions`
125125
* `peadm::subplans::component_install`: Install a new PEADM component
@@ -2206,7 +2206,7 @@ Data type: `Peadm::Pe_version`
22062206

22072207

22082208

2209-
Default value: `'2023.8.1'`
2209+
Default value: `'2023.8.2'`
22102210

22112211
##### <a name="-peadm--install--dns_alt_names"></a>`dns_alt_names`
22122212

@@ -2312,47 +2312,6 @@ Data type: `String`
23122312

23132313
Default value: `'1y'`
23142314

2315-
### <a name="peadm--migrate"></a>`peadm::migrate`
2316-
2317-
Migrate a PE primary server to a new host
2318-
2319-
#### Parameters
2320-
2321-
The following parameters are available in the `peadm::migrate` plan:
2322-
2323-
* [`old_primary_host`](#-peadm--migrate--old_primary_host)
2324-
* [`new_primary_host`](#-peadm--migrate--new_primary_host)
2325-
* [`upgrade_version`](#-peadm--migrate--upgrade_version)
2326-
* [`replica_host`](#-peadm--migrate--replica_host)
2327-
2328-
##### <a name="-peadm--migrate--old_primary_host"></a>`old_primary_host`
2329-
2330-
Data type: `Peadm::SingleTargetSpec`
2331-
2332-
The existing PE primary server that will be migrated from
2333-
2334-
##### <a name="-peadm--migrate--new_primary_host"></a>`new_primary_host`
2335-
2336-
Data type: `Peadm::SingleTargetSpec`
2337-
2338-
The new server that will become the PE primary server
2339-
2340-
##### <a name="-peadm--migrate--upgrade_version"></a>`upgrade_version`
2341-
2342-
Data type: `Optional[String]`
2343-
2344-
Optional version to upgrade to after migration is complete
2345-
2346-
Default value: `undef`
2347-
2348-
##### <a name="-peadm--migrate--replica_host"></a>`replica_host`
2349-
2350-
Data type: `Optional[Peadm::SingleTargetSpec]`
2351-
2352-
2353-
2354-
Default value: `undef`
2355-
23562315
### <a name="peadm--modify_certificate"></a>`peadm::modify_certificate`
23572316

23582317
Certificates can be modified by adding extensions, removing extensions, or

functions/assert_supported_pe_version.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ function peadm::assert_supported_pe_version (
66
Boolean $permit_unsafe_versions = false,
77
) >> Struct[{ 'supported' => Boolean }] {
88
$oldest = '2019.7'
9-
$newest = '2025.0'
9+
$newest = '2025.1'
1010
$supported = ($version =~ SemVerRange(">= ${oldest} <= ${newest}"))
1111

1212
if $permit_unsafe_versions {

plans/install.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
# Common Configuration
4848
String $console_password,
49-
Peadm::Pe_version $version = '2023.8.1',
49+
Peadm::Pe_version $version = '2023.8.2',
5050
Optional[Stdlib::HTTPSUrl] $pe_installer_source = undef,
5151
Optional[Array[String]] $dns_alt_names = undef,
5252
Optional[String] $compiler_pool_address = undef,

plans/migrate.pp

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# @summary Migrate a PE primary server to a new host
1+
# @api private
2+
# @summary Migrate a PE primary server to a new host - Note: this plan is a work in progress and it
3+
# is not recommended to be used until it is fully implemented and supported
24
#
35
# @param old_primary_host
46
# The existing PE primary server that will be migrated from
@@ -13,6 +15,7 @@
1315
Optional[String] $upgrade_version = undef,
1416
Optional[Peadm::SingleTargetSpec] $replica_host = undef,
1517
) {
18+
out::message('This plan is a work in progress and it is not recommended to be used until it is fully implemented and supported')
1619
peadm::assert_supported_bolt_version()
1720

1821
$backup_file = run_plan('peadm::backup', $old_primary_host, {

spec/functions/assert_supported_pe_version_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
end
2020

2121
it 'accepts the newest supported version' do
22-
is_expected.to run.with_params('2025.0.0').and_return({ 'supported' => true })
22+
is_expected.to run.with_params('2025.1.0').and_return({ 'supported' => true })
2323
end
2424

2525
it 'accepts a version in the middle' do

spec/plans/subplans/install_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@
8787
expect(run_plan('peadm::subplans::install', params)).to be_ok
8888
end
8989

90-
it 'installs 2023.8.1 with legacy compilers' do
90+
it 'installs 2023.8.2 with legacy compilers' do
9191
params = {
9292
'primary_host' => 'primary',
9393
'console_password' => 'puppetLabs123!',
94-
'version' => '2023.8.1',
94+
'version' => '2023.8.2',
9595
'legacy_compilers' => ['compiler1', 'compiler2'],
9696
}
9797
expect(run_plan('peadm::subplans::install', params)).to be_ok

0 commit comments

Comments
 (0)