Upgrade 3rd Party Cookbooks (#2863)

- line-4.5.21 (from line-4.5.13) - nfs-5.1.5 (from nfs-5.1.2) - openssh-2.11.14 (from openssh-2.11.12) - yum-7.4.20 (from yum-7.4.13) - yum-epel-5.0.8 (from yum-epel-5.0.2) Changelog update for 3rd Party Cookbook upgrade Co-authored-by: Himani Anil Deshpande <[email protected]>
aws · Jan 24, 2025 · 5e4aba8 · 5e4aba8
1 parent f0f528f
commit 5e4aba8
Show file tree

Hide file tree

Showing 396 changed files with 1,952 additions and 924 deletions.
diff --git a/Berksfile b/Berksfile
@@ -8,11 +8,11 @@ source chef_repo: "."
 metadata
 
 cookbook "iptables", path: "./cookbooks/third-party/iptables-8.0.0"
-cookbook "line", path: "./cookbooks/third-party/line-4.5.13"
-cookbook "nfs", path: "./cookbooks/third-party/nfs-5.1.2"
-cookbook "openssh", path: "./cookbooks/third-party/openssh-2.11.12"
-cookbook "yum", path: "./cookbooks/third-party/yum-7.4.13"
-cookbook "yum-epel", path: "./cookbooks/third-party/yum-epel-5.0.2"
+cookbook "line", path: "./cookbooks/third-party/line-4.5.21"
+cookbook "nfs", path: "./cookbooks/third-party/nfs-5.1.5"
+cookbook "openssh", path: "./cookbooks/third-party/openssh-2.11.14"
+cookbook "yum", path: "./cookbooks/third-party/yum-7.4.20"
+cookbook "yum-epel", path: "./cookbooks/third-party/yum-epel-5.0.8"
 
 cookbook "aws-parallelcluster-awsbatch", path: "./cookbooks/aws-parallelcluster-awsbatch"
 cookbook "aws-parallelcluster-computefleet", path: "./cookbooks/aws-parallelcluster-computefleet"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,12 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 - Upgrade `aws-cfn-bootstrap` to version 2.0-32.
 - Upgrade amazon-efs-utils to version 2.1.0.
 - Remove third-party cookbook: apt-7.5.22 and pyenv-4.2.3.
+- Upgrade third-party cookbook dependencies:
+  - line-4.5.21 (from line-4.5.13)
+  - nfs-5.1.5 (from nfs-5.1.2)
+  - openssh-2.11.14 (from openssh-2.11.12)
+  - yum-7.4.20 (from yum-7.4.13)
+  - yum-epel-5.0.8 (from yum-epel-5.0.2)
 
 3.12.0
 ------

diff --git a/cookbooks/aws-parallelcluster-awsbatch/Berksfile b/cookbooks/aws-parallelcluster-awsbatch/Berksfile
@@ -13,8 +13,8 @@ cookbook "aws-parallelcluster-tests", path: "../aws-parallelcluster-tests"
 cookbook "aws-parallelcluster-slurm", path: "../aws-parallelcluster-slurm"
 
 cookbook "iptables", path: "../third-party/iptables-8.0.0"
-cookbook "line", path: "../third-party/line-4.5.13"
-cookbook "nfs", path: "../third-party/nfs-5.1.2"
-cookbook "openssh", path: "../third-party/openssh-2.11.12"
-cookbook "yum", path: "../third-party/yum-7.4.13"
-cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"
+cookbook "line", path: "../third-party/line-4.5.21"
+cookbook "nfs", path: "../third-party/nfs-5.1.5"
+cookbook "openssh", path: "../third-party/openssh-2.11.14"
+cookbook "yum", path: "../third-party/yum-7.4.20"
+cookbook "yum-epel", path: "../third-party/yum-epel-5.0.8"
diff --git a/cookbooks/aws-parallelcluster-awsbatch/metadata.rb b/cookbooks/aws-parallelcluster-awsbatch/metadata.rb
@@ -10,9 +10,9 @@
 version '3.13.0'
 
 depends 'iptables', '~> 8.0.0'
-depends 'nfs', '~> 5.1.2'
-depends 'line', '~> 4.5.13'
-depends 'openssh', '~> 2.11.12'
-depends 'yum', '~> 7.4.13'
-depends 'yum-epel', '~> 5.0.2'
+depends 'nfs', '~> 5.1.5'
+depends 'line', '~> 4.5.21'
+depends 'openssh', '~> 2.11.14'
+depends 'yum', '~> 7.4.20'
+depends 'yum-epel', '~> 5.0.8'
 depends 'aws-parallelcluster-shared', '~> 3.13.0'
diff --git a/cookbooks/aws-parallelcluster-computefleet/Berksfile b/cookbooks/aws-parallelcluster-computefleet/Berksfile
@@ -5,5 +5,5 @@ metadata
 cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
 
 # for shared cookbook
-cookbook "yum", path: "../third-party/yum-7.4.13"
-cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"
+cookbook "yum", path: "../third-party/yum-7.4.20"
+cookbook "yum-epel", path: "../third-party/yum-epel-5.0.8"
diff --git a/cookbooks/aws-parallelcluster-entrypoints/Berksfile b/cookbooks/aws-parallelcluster-entrypoints/Berksfile
@@ -10,11 +10,11 @@ cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
 cookbook "aws-parallelcluster-slurm", path: "../aws-parallelcluster-slurm"
 
 cookbook "iptables", path: "../third-party/iptables-8.0.0"
-cookbook "line", path: "../third-party/line-4.5.13"
-cookbook "nfs", path: "../third-party/nfs-5.1.2"
-cookbook "openssh", path: "../third-party/openssh-2.11.12"
-cookbook "yum", path: "../third-party/yum-7.4.13"
-cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"
+cookbook "line", path: "../third-party/line-4.5.21"
+cookbook "nfs", path: "../third-party/nfs-5.1.5"
+cookbook "openssh", path: "../third-party/openssh-2.11.14"
+cookbook "yum", path: "../third-party/yum-7.4.20"
+cookbook "yum-epel", path: "../third-party/yum-epel-5.0.8"
 
 group :integration do
   cookbook 'aws-parallelcluster-tests', path: '../aws-parallelcluster-tests'

diff --git a/cookbooks/aws-parallelcluster-environment/Berksfile b/cookbooks/aws-parallelcluster-environment/Berksfile
@@ -4,11 +4,11 @@ metadata
 
 cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
 
-cookbook "nfs", path: "../third-party/nfs-5.1.2"
+cookbook "nfs", path: "../third-party/nfs-5.1.5"
 
 # dependency od nfs
-cookbook "line", path: "../third-party/line-4.5.13"
+cookbook "line", path: "../third-party/line-4.5.21"
 
 # for shared cookbook
-cookbook "yum", path: "../third-party/yum-7.4.13"
-cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"
+cookbook "yum", path: "../third-party/yum-7.4.20"
+cookbook "yum-epel", path: "../third-party/yum-epel-5.0.8"
diff --git a/cookbooks/aws-parallelcluster-environment/metadata.rb b/cookbooks/aws-parallelcluster-environment/metadata.rb
@@ -9,7 +9,7 @@
 chef_version '>= 18'
 version '3.13.0'
 
-depends 'line', '~> 4.5.13'
-depends 'nfs', '~> 5.1.2'
+depends 'line', '~> 4.5.21'
+depends 'nfs', '~> 5.1.5'
 
 depends 'aws-parallelcluster-shared', '~> 3.13.0'
diff --git a/cookbooks/aws-parallelcluster-platform/Berksfile b/cookbooks/aws-parallelcluster-platform/Berksfile
@@ -4,8 +4,8 @@ metadata
 
 cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
 
-cookbook "line", path: "../third-party/line-4.5.13"
+cookbook "line", path: "../third-party/line-4.5.21"
 
 # for shared cookbook
-cookbook "yum", path: "../third-party/yum-7.4.13"
-cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"
+cookbook "yum", path: "../third-party/yum-7.4.20"
+cookbook "yum-epel", path: "../third-party/yum-epel-5.0.8"
diff --git a/cookbooks/aws-parallelcluster-platform/metadata.rb b/cookbooks/aws-parallelcluster-platform/metadata.rb
@@ -9,6 +9,6 @@
 chef_version '>= 18'
 version '3.13.0'
 
-depends 'line', '~> 4.5.13'
+depends 'line', '~> 4.5.21'
 
 depends 'aws-parallelcluster-shared', '~> 3.13.0'
diff --git a/cookbooks/aws-parallelcluster-shared/Berksfile b/cookbooks/aws-parallelcluster-shared/Berksfile
@@ -4,5 +4,5 @@ source chef_repo: "."
 
 metadata
 
-cookbook "yum", path: "../third-party/yum-7.4.13"
-cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"
+cookbook "yum", path: "../third-party/yum-7.4.20"
+cookbook "yum-epel", path: "../third-party/yum-epel-5.0.8"
diff --git a/cookbooks/aws-parallelcluster-shared/metadata.rb b/cookbooks/aws-parallelcluster-shared/metadata.rb
@@ -9,5 +9,5 @@
 chef_version '>= 18'
 version '3.13.0'
 
-depends 'yum', '~> 7.4.13'
-depends 'yum-epel', '~> 5.0.2'
+depends 'yum', '~> 7.4.20'
+depends 'yum-epel', '~> 5.0.8'
diff --git a/cookbooks/aws-parallelcluster-slurm/Berksfile b/cookbooks/aws-parallelcluster-slurm/Berksfile
@@ -7,8 +7,8 @@ cookbook "aws-parallelcluster-environment", path: "../aws-parallelcluster-enviro
 cookbook "aws-parallelcluster-shared", path: "../aws-parallelcluster-shared"
 
 cookbook "iptables", path: "../third-party/iptables-8.0.0"
-cookbook "line", path: "../third-party/line-4.5.13"
-cookbook "nfs", path: "../third-party/nfs-5.1.2"
-cookbook "openssh", path: "../third-party/openssh-2.11.12"
-cookbook "yum", path: "../third-party/yum-7.4.13"
-cookbook "yum-epel", path: "../third-party/yum-epel-5.0.2"
+cookbook "line", path: "../third-party/line-4.5.21"
+cookbook "nfs", path: "../third-party/nfs-5.1.5"
+cookbook "openssh", path: "../third-party/openssh-2.11.14"
+cookbook "yum", path: "../third-party/yum-7.4.20"
+cookbook "yum-epel", path: "../third-party/yum-epel-5.0.8"
diff --git a/cookbooks/aws-parallelcluster-slurm/metadata.rb b/cookbooks/aws-parallelcluster-slurm/metadata.rb
@@ -10,11 +10,11 @@
 version '3.13.0'
 
 depends 'iptables', '~> 8.0.0'
-depends 'line', '~> 4.5.13'
-depends 'nfs', '~> 5.1.2'
-depends 'openssh', '~> 2.11.12'
-depends 'yum', '~> 7.4.13'
-depends 'yum-epel', '~> 5.0.2'
+depends 'line', '~> 4.5.21'
+depends 'nfs', '~> 5.1.5'
+depends 'openssh', '~> 2.11.14'
+depends 'yum', '~> 7.4.20'
+depends 'yum-epel', '~> 5.0.8'
 depends 'aws-parallelcluster-computefleet', '~> 3.13.0'
 depends 'aws-parallelcluster-environment', '~> 3.13.0'
 depends 'aws-parallelcluster-shared', '~> 3.13.0'
diff --git a/cookbooks/third-party/THIRD-PARTY-LICENSES.txt b/cookbooks/third-party/THIRD-PARTY-LICENSES.txt
@@ -1,10 +1,7 @@
-** apt Cookbook -- https://github.com/sous-chefs/apt
 ** iptables cookbook -- https://github.com/sous-chefs/iptables
 ** line cookbook -- https://github.com/sous-chefs/line
-** NFS cookbook -- https://github.com/atomic-penguin/cookbook-nfs
+** NFS cookbook -- https://github.com/sous-chefs/nfs
 ** openssh cookbook -- https://github.com/sous-chefs/openssh
-** pyenv cookbook -- https://github.com/sous-chefs/pyenv
-** SELinux cookbook -- https://github.com/sous-chefs/selinux
 ** yum cookbook -- https://github.com/sous-chefs/yum
 ** yum-epel cookbook -- https://github.com/sous-chefs/yum-epel
 
@@ -206,8 +203,7 @@ See the License for the specific language governing permissions and
 
 limitations under the License.
 
-* For apt Cookbook see also this required NOTICE:
-    Copyright: 2009-2017, Chef Software, Inc.
+
 * For iptables cookbook see also this required NOTICE:
     Copyright: 2008-2020, Chef Software, Inc.
 * For line cookbook see also this required NOTICE:
@@ -217,11 +213,6 @@ limitations under the License.
     2012, Riot Games Copyright 2012, Sean OMeara
 * For openssh cookbook see also this required NOTICE:
     Copyright: 2008-2019, Chef Software, Inc.
-* For pyenv cookbook see also this required NOTICE:
-    Copyright: 2014-2017, Shane da Silva
-    Copyright: 2017-2018, Darwin D. Wu
-* For SELinux cookbook see also this required NOTICE:
-    Copyright: 2008-2018, Chef Software, Inc.
 * For yum cookbook see also this required NOTICE:
     Copyright:: 2011 Eric G. Wolfe
     Copyright:: 2013-2017 Chef Software, Inc.

diff --git a/cookbooks/third-party/line-4.5.13/renovate.json b/cookbooks/third-party/line-4.5.13/renovate.json
diff --git a/cookbooks/third-party/line-4.5.21/.editorconfig b/cookbooks/third-party/line-4.5.21/.editorconfig
@@ -0,0 +1,19 @@
+# https://EditorConfig.org
+
+# top-most EditorConfig file
+root=true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# 2 space indentation
+indent_style = space
+indent_size = 2
+
+# Avoid issues parsing cookbook files later
+charset = utf-8
+
+# Avoid cookstyle warnings
+trim_trailing_whitespace = true
diff --git a/cookbooks/third-party/line-4.5.21/.envrc b/cookbooks/third-party/line-4.5.21/.envrc
@@ -0,0 +1,2 @@
+use chefworkstation
+export KITCHEN_GLOBAL_YAML=kitchen.global.yml
diff --git a/cookbooks/third-party/line-4.5.21/.gitattributes b/cookbooks/third-party/line-4.5.21/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf
diff --git a/cookbooks/third-party/line-4.5.21/.github/CODEOWNERS b/cookbooks/third-party/line-4.5.21/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @sous-chefs/maintainers
diff --git a/cookbooks/third-party/line-4.5.21/.github/lock.yml b/cookbooks/third-party/line-4.5.21/.github/lock.yml
@@ -0,0 +1,8 @@
+---
+daysUntilLock: 365
+exemptLabels: []
+lockLabel: false
+lockComment: >
+  This thread has been automatically locked since there has not been
+  any recent activity after it was closed. Please open a new issue for
+  related bugs.
diff --git a/cookbooks/third-party/line-4.5.21/.github/workflows/ci.yml b/cookbooks/third-party/line-4.5.21/.github/workflows/ci.yml
@@ -0,0 +1,61 @@
+---
+name: ci
+
+"on":
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  lint-unit:
+    uses: sous-chefs/.github/.github/workflows/[email protected]
+    permissions:
+      actions: write
+      checks: write
+      pull-requests: write
+      statuses: write
+      issues: write
+
+  integration:
+    needs: lint-unit
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os:
+          - "almalinux-8"
+          - "almalinux-9"
+          - "amazonlinux-2023"
+          - "centos-7"
+          - "centos-stream-8"
+          - "centos-stream-9"
+          - "debian-9"
+          - "debian-10"
+          - "debian-11"
+          - "debian-12"
+          - "fedora-latest"
+          - "ubuntu-1804"
+          - "ubuntu-2004"
+          - "ubuntu-2204"
+        suite:
+          - add-to-list
+          - append-if-no-line
+          - delete-from-list
+          - delete-lines
+          - filter-lines
+          - replace-or-add
+      fail-fast: false
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Install Chef
+        uses: actionshub/[email protected]
+      - name: Dokken
+        uses: actionshub/[email protected]
+        env:
+          CHEF_LICENSE: accept-no-persist
+          KITCHEN_LOCAL_YAML: kitchen.dokken.yml
+        with:
+          suite: ${{ matrix.suite }}
+          os: ${{ matrix.os }}
diff --git a/cookbooks/third-party/line-4.5.21/.github/workflows/stale.yml b/cookbooks/third-party/line-4.5.21/.github/workflows/stale.yml
@@ -0,0 +1,25 @@
+---
+name: Mark stale issues and pull requests
+
+"on":
+  schedule: [cron: "0 0 * * *"]
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          close-issue-message: >
+            Closing due to inactivity.
+            If this is still an issue please reopen or open another issue.
+            Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help!
+            Thanks, Sous-Chefs.
+          days-before-close: 7
+          days-before-stale: 365
+          stale-issue-message: >
+            Marking stale due to inactivity.
+            Remove stale label or comment or this will be closed in 7 days.
+            Alternatively drop by the #sous-chefs channel on the [Chef Community Slack](http://community-slack.chef.io/) and we'll be happy to help!
+            Thanks, Sous-Chefs.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		use chefworkstation
		export KITCHEN_GLOBAL_YAML=kitchen.global.yml