Skip to content

(PE-40784) Add support for PE 2023.8.2 and 2025.1.0 #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-add-compiler-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
fail-fast: false
matrix:
architecture: [standard, large, extra-large]
version: [2021.7.9, 2023.8.1, 2025.0.0]
version: [2021.7.9, 2023.8.2, 2025.1.0]
image: [almalinux-cloud/almalinux-8]
steps:
- name: Checkout Source
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-add-compiler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
version:
description: PE version to install
required: true
default: 2023.8.1
default: 2023.8.2
ssh-debugging:
description: Boolean; whether or not to pause for ssh debugging
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-add-replica-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
fail-fast: false
matrix:
architecture: [standard, standard-with-dr, large, extra-large]
version: [2023.8.1, 2025.0.0]
version: [2023.8.2, 2025.1.0]
image: [almalinux-cloud/almalinux-8]
steps:
- name: Checkout Source
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-add-replica.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
version:
description: PE version to install
required: true
default: 2023.8.1
default: 2023.8.2
ssh-debugging:
description: Boolean; whether or not to pause for ssh debugging
required: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-backup-restore.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ on:
version:
description: PE version to install
required: true
default: 2025.0.0
default: 2025.1.0
ssh-debugging:
description: Boolean; whether or not to pause for ssh debugging
required: true
default: 'false'
jobs:
backup-restore-test:
name: "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.0.0' }}\
name: "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.1.0' }}\
\ ${{ github.event.inputs.architecture || 'extra-large' }} on ${{ github.event.inputs.image || 'almalinux-cloud/almalinux-8' }}"
runs-on: ubuntu-20.04
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-failover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
version_to_upgrade:
description: PE version to upgrade to
required: false
default: 2023.8.1
default: 2023.8.2
ssh-debugging:
description: Boolean; whether or not to pause for ssh debugging
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-fips-install-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
fail-fast: false
matrix:
architecture: [standard-with-dr, large, extra-large-with-dr]
version: [2019.8.12, 2021.7.9, 2023.8.1, 2025.0.0]
version: [2019.8.12, 2021.7.9, 2023.8.2, 2025.1.0]
image: [rhel-8]
fips: [enable]
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-install-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
fail-fast: false
matrix:
architecture: [standard-with-dr, large, extra-large-with-dr]
version: [2019.8.12, 2021.7.9, 2023.8.1, 2025.0.0]
version: [2019.8.12, 2021.7.9, 2023.8.2, 2025.1.0]
image: [almalinux-cloud/almalinux-8]
steps:
- name: Checkout Source
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-install-rhel-9.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
fail-fast: false
matrix:
architecture: [standard-with-dr, large, extra-large-with-dr]
version: [2021.7.9, 2023.8.1, 2025.0.0]
version: [2021.7.9, 2023.8.2, 2025.1.0]
image: [rhel-9]
steps:
- name: Checkout Source
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
version:
description: PE version to install
required: true
default: 2023.8.1
default: 2023.8.2
ssh-debugging:
description: Boolean; whether or not to pause for ssh debugging
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-legacy-compilers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
--modulepath spec/fixtures/modules \
architecture=large-with-dr \
console_password=${{ secrets.CONSOLE_PASSWORD }} \
version=2025.0.0
version=2025.1.0
- name: Wait as long as the file ${HOME}/pause file is present
if: ${{ always() && github.event.inputs.ssh-debugging == 'true' }}
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-legacy-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ jobs:
compiler=$(yq '.groups[].targets[] | select(.vars.role == "compiler") | .name' spec/fixtures/litmus_inventory.yaml | head -n 1)
legacy_compiler=$(yq '.groups[].targets[] | select(.vars.role == "compiler") | .name' spec/fixtures/litmus_inventory.yaml | sed -n 2p)
replica=$(yq '.groups[].targets[] | select(.vars.role == "replica") | .name' spec/fixtures/litmus_inventory.yaml)
echo -n '{ "primary_host": "'$primary'", "replica_host": "'$replica'", "compiler_hosts": ["'$compiler'", "'$legacy_compiler'"], "version": "2025.0.0"}' > upgrade_params.json
echo -n '{ "primary_host": "'$primary'", "replica_host": "'$replica'", "compiler_hosts": ["'$compiler'", "'$legacy_compiler'"], "version": "2025.1.0"}' > upgrade_params.json
- name: Upgrade PE with legacy compilers
run: |
echo ::group::upgrade_params.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-migration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
# - extra-large
# - large-with-dr
# - extra-large-with-dr
version: [2021.7.9, 2023.8.1, 2025.0.0]
version: [2021.7.9, 2023.8.2, 2025.1.0]
image: [almalinux-cloud/almalinux-8]
include:
- architecture: standard
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-replace-failed-postgresql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
matrix:
architecture: [extra-large-with-dr-and-spare-replica]
install_architecture: [extra-large-with-dr]
version: [2021.7.9, 2023.8.1, 2025.0.0]
version: [2021.7.9, 2023.8.2, 2025.1.0]
image: [almalinux-cloud/almalinux-8]
steps:
- name: Checkout Source
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-upgrade-latest-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
type: string
required: true
description: The initial version of PE to install before upgrade
default: 2023.8.1
default: 2023.8.2
ssh-debugging:
description: Boolean; whether or not to pause for ssh debugging
required: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: false
matrix:
architecture: [extra-large-with-dr]
version: [2023.8.1]
version: [2023.8.2]
image: [almalinux-cloud/almalinux-8]
steps:
- name: Checkout Source
Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/test-upgrade-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,27 @@ jobs:
fail-fast: false
matrix:
architecture: [standard, extra-large-with-dr]
version: [2019.8.12, 2021.7.9, 2023.8.1]
version_to_upgrade: [2021.7.9, 2023.8.1, 2025.0.0]
version: [2019.8.12, 2021.7.9, 2023.8.2]
version_to_upgrade: [2021.7.9, 2023.8.2, 2025.1.0]
image: [almalinux-cloud/almalinux-8]
download_mode: [direct]
exclude:
- version: 2019.8.12
version_to_upgrade: 2023.8.1
version_to_upgrade: 2023.8.2
- version: 2019.8.12
version_to_upgrade: 2025.0.0
version_to_upgrade: 2025.1.0
- version: 2021.7.9
version_to_upgrade: 2021.7.9
- version: 2021.7.9
version_to_upgrade: 2025.0.0
- version: 2023.8.1
version_to_upgrade: 2023.8.1
- version: 2023.8.1
version_to_upgrade: 2025.0.0
version_to_upgrade: 2025.1.0
- version: 2023.8.1
version_to_upgrade: 2023.8.2
- version: 2023.8.2
version_to_upgrade: 2025.1.0
- version: 2023.8.2
version_to_upgrade: 2021.7.9
- version: 2025.0.0
version_to_upgrade: 2025.1.0
steps:
- name: Start SSH session
if: ${{ github.event.inputs.ssh-debugging == 'true' }}
Expand Down
45 changes: 2 additions & 43 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ Supported use cases:
* [`peadm::backup_ca`](#peadm--backup_ca)
* [`peadm::convert`](#peadm--convert): Convert an existing PE cluster to a PEAdm-managed cluster
* [`peadm::install`](#peadm--install): Install a new PE cluster
* [`peadm::migrate`](#peadm--migrate): Migrate a PE primary server to a new host
* [`peadm::modify_certificate`](#peadm--modify_certificate): Modify the certificate of one or more targets
* [`peadm::replace_failed_postgresql`](#peadm--replace_failed_postgresql): Replaces a failed PostgreSQL host
* [`peadm::restore`](#peadm--restore): Restore puppet primary configuration
Expand All @@ -120,6 +119,7 @@ Supported use cases:
#### Private Plans

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



Default value: `'2023.8.1'`
Default value: `'2023.8.2'`

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

Expand Down Expand Up @@ -2312,47 +2312,6 @@ Data type: `String`

Default value: `'1y'`

### <a name="peadm--migrate"></a>`peadm::migrate`

Migrate a PE primary server to a new host

#### Parameters

The following parameters are available in the `peadm::migrate` plan:

* [`old_primary_host`](#-peadm--migrate--old_primary_host)
* [`new_primary_host`](#-peadm--migrate--new_primary_host)
* [`upgrade_version`](#-peadm--migrate--upgrade_version)
* [`replica_host`](#-peadm--migrate--replica_host)

##### <a name="-peadm--migrate--old_primary_host"></a>`old_primary_host`

Data type: `Peadm::SingleTargetSpec`

The existing PE primary server that will be migrated from

##### <a name="-peadm--migrate--new_primary_host"></a>`new_primary_host`

Data type: `Peadm::SingleTargetSpec`

The new server that will become the PE primary server

##### <a name="-peadm--migrate--upgrade_version"></a>`upgrade_version`

Data type: `Optional[String]`

Optional version to upgrade to after migration is complete

Default value: `undef`

##### <a name="-peadm--migrate--replica_host"></a>`replica_host`

Data type: `Optional[Peadm::SingleTargetSpec]`



Default value: `undef`

### <a name="peadm--modify_certificate"></a>`peadm::modify_certificate`

Certificates can be modified by adding extensions, removing extensions, or
Expand Down
2 changes: 1 addition & 1 deletion functions/assert_supported_pe_version.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function peadm::assert_supported_pe_version (
Boolean $permit_unsafe_versions = false,
) >> Struct[{ 'supported' => Boolean }] {
$oldest = '2019.7'
$newest = '2025.0'
$newest = '2025.1'
$supported = ($version =~ SemVerRange(">= ${oldest} <= ${newest}"))

if $permit_unsafe_versions {
Expand Down
2 changes: 1 addition & 1 deletion plans/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

# Common Configuration
String $console_password,
Peadm::Pe_version $version = '2023.8.1',
Peadm::Pe_version $version = '2023.8.2',
Optional[Stdlib::HTTPSUrl] $pe_installer_source = undef,
Optional[Array[String]] $dns_alt_names = undef,
Optional[String] $compiler_pool_address = undef,
Expand Down
5 changes: 4 additions & 1 deletion plans/migrate.pp
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# @summary Migrate a PE primary server to a new host
# @api private
# @summary Migrate a PE primary server to a new host - Note: this plan is a work in progress and it
# is not recommended to be used until it is fully implemented and supported
#
# @param old_primary_host
# The existing PE primary server that will be migrated from
Expand All @@ -13,6 +15,7 @@
Optional[String] $upgrade_version = undef,
Optional[Peadm::SingleTargetSpec] $replica_host = undef,
) {
out::message('This plan is a work in progress and it is not recommended to be used until it is fully implemented and supported')
peadm::assert_supported_bolt_version()

$backup_file = run_plan('peadm::backup', $old_primary_host, {
Expand Down
2 changes: 1 addition & 1 deletion spec/functions/assert_supported_pe_version_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
end

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

it 'accepts a version in the middle' do
Expand Down
4 changes: 2 additions & 2 deletions spec/plans/subplans/install_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@
expect(run_plan('peadm::subplans::install', params)).to be_ok
end

it 'installs 2023.8.1 with legacy compilers' do
it 'installs 2023.8.2 with legacy compilers' do
params = {
'primary_host' => 'primary',
'console_password' => 'puppetLabs123!',
'version' => '2023.8.1',
'version' => '2023.8.2',
'legacy_compilers' => ['compiler1', 'compiler2'],
}
expect(run_plan('peadm::subplans::install', params)).to be_ok
Expand Down
Loading