diff --git a/.github/workflows/test-add-compiler-matrix.yml b/.github/workflows/test-add-compiler-matrix.yml index 6da1fddc..1abaf36a 100644 --- a/.github/workflows/test-add-compiler-matrix.yml +++ b/.github/workflows/test-add-compiler-matrix.yml @@ -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 diff --git a/.github/workflows/test-add-compiler.yaml b/.github/workflows/test-add-compiler.yaml index 46eeedc4..28440e50 100644 --- a/.github/workflows/test-add-compiler.yaml +++ b/.github/workflows/test-add-compiler.yaml @@ -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 diff --git a/.github/workflows/test-add-replica-matrix.yaml b/.github/workflows/test-add-replica-matrix.yaml index a4cb89f6..2b589a73 100644 --- a/.github/workflows/test-add-replica-matrix.yaml +++ b/.github/workflows/test-add-replica-matrix.yaml @@ -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 diff --git a/.github/workflows/test-add-replica.yaml b/.github/workflows/test-add-replica.yaml index 4ce32630..229e4010 100644 --- a/.github/workflows/test-add-replica.yaml +++ b/.github/workflows/test-add-replica.yaml @@ -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 diff --git a/.github/workflows/test-backup-restore.yaml b/.github/workflows/test-backup-restore.yaml index 2f951632..09fc526e 100644 --- a/.github/workflows/test-backup-restore.yaml +++ b/.github/workflows/test-backup-restore.yaml @@ -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: diff --git a/.github/workflows/test-failover.yaml b/.github/workflows/test-failover.yaml index 139b47ae..3abbb71c 100644 --- a/.github/workflows/test-failover.yaml +++ b/.github/workflows/test-failover.yaml @@ -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 diff --git a/.github/workflows/test-fips-install-matrix.yaml b/.github/workflows/test-fips-install-matrix.yaml index 494459ce..8549ca74 100644 --- a/.github/workflows/test-fips-install-matrix.yaml +++ b/.github/workflows/test-fips-install-matrix.yaml @@ -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: diff --git a/.github/workflows/test-install-matrix.yaml b/.github/workflows/test-install-matrix.yaml index 41d20583..474902f6 100644 --- a/.github/workflows/test-install-matrix.yaml +++ b/.github/workflows/test-install-matrix.yaml @@ -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 diff --git a/.github/workflows/test-install-rhel-9.yaml b/.github/workflows/test-install-rhel-9.yaml index 793eebd1..ea72c8d9 100644 --- a/.github/workflows/test-install-rhel-9.yaml +++ b/.github/workflows/test-install-rhel-9.yaml @@ -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 diff --git a/.github/workflows/test-install.yaml b/.github/workflows/test-install.yaml index 8fd9df7b..0921e03b 100644 --- a/.github/workflows/test-install.yaml +++ b/.github/workflows/test-install.yaml @@ -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 diff --git a/.github/workflows/test-legacy-compilers.yaml b/.github/workflows/test-legacy-compilers.yaml index 254a8b99..5d3abd49 100644 --- a/.github/workflows/test-legacy-compilers.yaml +++ b/.github/workflows/test-legacy-compilers.yaml @@ -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: | diff --git a/.github/workflows/test-legacy-upgrade.yaml b/.github/workflows/test-legacy-upgrade.yaml index 23692fca..58fea105 100644 --- a/.github/workflows/test-legacy-upgrade.yaml +++ b/.github/workflows/test-legacy-upgrade.yaml @@ -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 diff --git a/.github/workflows/test-migration.yaml b/.github/workflows/test-migration.yaml index af5e0149..b210dda2 100644 --- a/.github/workflows/test-migration.yaml +++ b/.github/workflows/test-migration.yaml @@ -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 diff --git a/.github/workflows/test-replace-failed-postgresql.yaml b/.github/workflows/test-replace-failed-postgresql.yaml index 6ecd6978..85fb9761 100644 --- a/.github/workflows/test-replace-failed-postgresql.yaml +++ b/.github/workflows/test-replace-failed-postgresql.yaml @@ -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 diff --git a/.github/workflows/test-upgrade-latest-dev.yaml b/.github/workflows/test-upgrade-latest-dev.yaml index 37ad90a7..26b897b9 100644 --- a/.github/workflows/test-upgrade-latest-dev.yaml +++ b/.github/workflows/test-upgrade-latest-dev.yaml @@ -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 diff --git a/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml b/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml index 0a5ee865..2533adc3 100644 --- a/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml +++ b/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml @@ -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 diff --git a/.github/workflows/test-upgrade-matrix.yaml b/.github/workflows/test-upgrade-matrix.yaml index e59b4cde..8619a441 100644 --- a/.github/workflows/test-upgrade-matrix.yaml +++ b/.github/workflows/test-upgrade-matrix.yaml @@ -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' }} diff --git a/REFERENCE.md b/REFERENCE.md index b7827e8c..1fbd01a3 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -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 @@ -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 @@ -2206,7 +2206,7 @@ Data type: `Peadm::Pe_version` -Default value: `'2023.8.1'` +Default value: `'2023.8.2'` ##### `dns_alt_names` @@ -2312,47 +2312,6 @@ Data type: `String` Default value: `'1y'` -### `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) - -##### `old_primary_host` - -Data type: `Peadm::SingleTargetSpec` - -The existing PE primary server that will be migrated from - -##### `new_primary_host` - -Data type: `Peadm::SingleTargetSpec` - -The new server that will become the PE primary server - -##### `upgrade_version` - -Data type: `Optional[String]` - -Optional version to upgrade to after migration is complete - -Default value: `undef` - -##### `replica_host` - -Data type: `Optional[Peadm::SingleTargetSpec]` - - - -Default value: `undef` - ### `peadm::modify_certificate` Certificates can be modified by adding extensions, removing extensions, or diff --git a/functions/assert_supported_pe_version.pp b/functions/assert_supported_pe_version.pp index a314fca2..68cd45b0 100644 --- a/functions/assert_supported_pe_version.pp +++ b/functions/assert_supported_pe_version.pp @@ -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 { diff --git a/plans/install.pp b/plans/install.pp index a0796266..eccc63e5 100644 --- a/plans/install.pp +++ b/plans/install.pp @@ -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, diff --git a/plans/migrate.pp b/plans/migrate.pp index fdb690b4..30e8f01d 100644 --- a/plans/migrate.pp +++ b/plans/migrate.pp @@ -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 @@ -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, { diff --git a/spec/functions/assert_supported_pe_version_spec.rb b/spec/functions/assert_supported_pe_version_spec.rb index b9999eeb..82656171 100644 --- a/spec/functions/assert_supported_pe_version_spec.rb +++ b/spec/functions/assert_supported_pe_version_spec.rb @@ -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 diff --git a/spec/plans/subplans/install_spec.rb b/spec/plans/subplans/install_spec.rb index cc3eb95d..63f1c6a4 100644 --- a/spec/plans/subplans/install_spec.rb +++ b/spec/plans/subplans/install_spec.rb @@ -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