Merge pull request #435 from puppetlabs/maint_release_2021.7.8

cathal41 · web-flow · commit 3b862ee89d51 · 2024-05-08T17:31:00.000Z
(MAINT) Update PEADM with 2023.7.0 support
diff --git a/.github/workflows/test-add-compiler.yaml b/.github/workflows/test-add-compiler.yaml
@@ -15,7 +15,7 @@ on:
       version:
         description: 'PE version to install'
         required: true
-        default: '2021.7.7'
+        default: '2021.7.8'
       ssh-debugging:
         description: 'Boolean; whether or not to pause for ssh debugging'
         required: true
diff --git a/.github/workflows/test-add-replica.yaml b/.github/workflows/test-add-replica.yaml
@@ -15,7 +15,7 @@ on:
       version:
         description: 'PE version to install'
         required: true
-        default: '2021.7.7'
+        default: '2021.7.8'
       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
@@ -15,7 +15,7 @@ on:
       version:
         description: 'PE version to install'
         required: true
-        default: '2021.7.7'
+        default: '2021.7.8'
       ssh-debugging:
         description: 'Boolean; whether or not to pause for ssh debugging'
         required: true
diff --git a/.github/workflows/test-failover.yaml b/.github/workflows/test-failover.yaml
@@ -15,7 +15,7 @@ on:
       version_to_upgrade:
         description: 'PE version to upgrade to'
         required: false
-        default: '2021.7.7'
+        default: '2021.7.8'
       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
@@ -43,8 +43,8 @@ jobs:
           - extra-large-with-dr
         version:
           - 2019.8.12
-          - 2021.7.7
-          - 2023.6.0
+          - 2021.7.8
+          - 2023.7.0
         image:
           - rhel-8
         fips:
diff --git a/.github/workflows/test-install-matrix.yaml b/.github/workflows/test-install-matrix.yaml
@@ -43,8 +43,8 @@ jobs:
           - extra-large-with-dr
         version:
           - 2019.8.12
-          - 2021.7.7
-          - 2023.6.0
+          - 2021.7.8
+          - 2023.7.0
         image:
           - centos-7
           - almalinux-cloud/almalinux-8
diff --git a/.github/workflows/test-install-rhel-9.yaml b/.github/workflows/test-install-rhel-9.yaml
@@ -42,8 +42,8 @@ jobs:
           - large
           - extra-large-with-dr
         version:
-          - 2021.7.7
-          - 2023.6.0
+          - 2021.7.8
+          - 2023.7.0
         image:
           - rhel-9
     steps:
diff --git a/.github/workflows/test-install.yaml b/.github/workflows/test-install.yaml
@@ -15,7 +15,7 @@ on:
       version:
         description: 'PE version to install'
         required: true
-        default: '2021.7.7'
+        default: '2021.7.8'
       ssh-debugging:
         description: 'Boolean; whether or not to pause for ssh debugging'
         required: true
diff --git a/.github/workflows/test-upgrade-latest-dev.yaml b/.github/workflows/test-upgrade-latest-dev.yaml
@@ -24,7 +24,7 @@ on:
         type: string
         required: true
         description: "The initial version of PE to install before upgrade"
-        default: "2021.7.7"
+        default: "2021.7.8"
       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
@@ -19,7 +19,7 @@ jobs:
         architecture:
           - "extra-large-with-dr"
         version:
-          - "2021.7.7"
+          - "2021.7.8"
         image:
           - "almalinux-cloud/almalinux-8"
 
diff --git a/.github/workflows/test-upgrade-matrix.yaml b/.github/workflows/test-upgrade-matrix.yaml
@@ -44,7 +44,7 @@ jobs:
         version:
           - '2019.8.12'
         version_to_upgrade:
-          - '2021.7.7'
+          - '2021.7.8'
         image:
           - 'almalinux-cloud/almalinux-8'
         download_mode:
diff --git a/.github/workflows/test-upgrade.yaml b/.github/workflows/test-upgrade.yaml
@@ -27,7 +27,7 @@ on:
       upgrade_version:
         description: 'PE version to upgrade to'
         required: true
-        default: '2021.7.7'
+        default: '2021.7.8'
       ssh-debugging:
         description: 'Boolean; whether or not to pause for ssh debugging'
         required: true
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -1838,7 +1838,7 @@ Data type: `Peadm::Pe_version`
 
 
 
-Default value: `'2021.7.7'`
+Default value: `'2021.7.8'`
 
 ##### <a name="-peadm--install--dns_alt_names"></a>`dns_alt_names`
 
diff --git a/documentation/install.md b/documentation/install.md
@@ -114,7 +114,7 @@ Example params.json Bolt parameters file (shown: Standard):
   "primary_host": "pe-xl-core-0.lab1.puppet.vm",
   "console_password": "puppetlabs",
   "dns_alt_names": [ "puppet", "puppet.lab1.puppet.vm" ],
-  "version": "2021.7.7"
+  "version": "2021.7.8"
 }
 ```
 
diff --git a/documentation/upgrade.md b/documentation/upgrade.md
@@ -8,11 +8,11 @@ The `peadm::upgrade` plan requires as input the version of PE to upgrade to, and
 
 Please note that when upgrading from before 2023.4 to 2023.4 or above and you are using code manager, it is nessesary to provide known hosts for r10k. r10k_known_hosts is an optional parameter and is only required one time when upgrading to 2023.4 or beyond. But if you currently use the SSH protocol to allow r10k to access your remote Git repository, your Code manager or r10k code management tool cannot function until you define the r10k_known_hosts parameter. Subsequent upgrades will already have this and it won't be required again. Please refer to the Puppet Enterprise 2023.4 Upgrade cautions for more details.
 
-The following is an example parameters file for upgrading an Extra Large architecture deployment of PE 2023.2.0 to PE 2023.6.0.
+The following is an example parameters file for upgrading an Extra Large architecture deployment of PE 2023.2.0 to PE 2023.7.0.
 
 ```json
 {
-  "version": "2023.6.0",
+  "version": "2023.7.0",
   "primary_host": "pe-master-09a40c-0.us-west1-a.c.reidmv-peadm.internal",
   "primary_postgresql_host": "pe-psql-09a40c-0.us-west1-a.c.reidmv-peadm.internal",
   "replica_host": "pe-master-09a40c-1.us-west1-b.c.reidmv-peadm.internal",
diff --git 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 = '2023.6'
+  $newest = '2023.7'
   $supported = ($version =~ SemVerRange(">= ${oldest} <= ${newest}"))
 
   if $permit_unsafe_versions {
diff --git a/plans/install.pp b/plans/install.pp
@@ -45,7 +45,7 @@
 
   # Common Configuration
   String                            $console_password,
-  Peadm::Pe_version                 $version                          = '2021.7.7',
+  Peadm::Pe_version                 $version                          = '2021.7.8',
   Optional[String]                  $pe_installer_source              = undef,
   Optional[Array[String]]           $dns_alt_names                    = undef,
   Optional[String]                  $compiler_pool_address            = undef,
diff --git 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('2021.7.7').and_return({ 'supported' => true })
+      is_expected.to run.with_params('2021.7.8').and_return({ 'supported' => true })
     end
 
     it 'accepts a version in the middle' do
diff --git a/spec/plans/convert_spec.rb b/spec/plans/convert_spec.rb
@@ -19,7 +19,7 @@
     allow_apply
 
     expect_task('peadm::cert_data').return_for_targets('primary' => trustedjson)
-    expect_task('peadm::read_file').always_return({ 'content' => '2021.7.7' })
+    expect_task('peadm::read_file').always_return({ 'content' => '2021.7.8' })
 
     # For some reason, expect_plan() was not working??
     allow_plan('peadm::modify_certificate').always_return({})
diff --git a/spec/plans/install_spec.rb b/spec/plans/install_spec.rb
@@ -7,7 +7,7 @@
     it 'runs successfully with the minimum required parameters' do
       expect_plan('peadm::subplans::install')
       expect_plan('peadm::subplans::configure')
-      expect(run_plan('peadm::install', 'primary_host' => 'primary', 'console_password' => 'puppetLabs123!', 'version' => '2021.7.7')).to be_ok
+      expect(run_plan('peadm::install', 'primary_host' => 'primary', 'console_password' => 'puppetLabs123!', 'version' => '2021.7.8')).to be_ok
     end
   end
 end
diff --git a/spec/plans/upgrade_spec.rb b/spec/plans/upgrade_spec.rb
@@ -31,7 +31,7 @@ def allow_standard_non_returning_calls
 
     expect(run_plan('peadm::upgrade',
                     'primary_host' => 'primary',
-                    'version' => '2021.7.7')).to be_ok
+                    'version' => '2021.7.8')).to be_ok
   end
 
   it 'runs with a primary, compilers, but no replica' do
@@ -47,7 +47,7 @@ def allow_standard_non_returning_calls
     expect(run_plan('peadm::upgrade',
                     'primary_host' => 'primary',
                     'compiler_hosts' => 'compiler',
-                    'version' => '2021.7.7')).to be_ok
+                    'version' => '2021.7.8')).to be_ok
   end
 
   it 'fails if the primary uses the pcp transport' do
