Skip to content

Commit 2b978d6

Browse files
Remove berkshelf
Berkshelf is a dependency manager for Chef cookbooks. With it, you can depend on community cookbooks and include them in your workflow. Berkshelf is not useful when all cookbooks are local. ParallelCluster cookbook has all third party cookbooks ready locally. Reducing software we depend on improves stability of the product. (e.g we have one known issue related to berkshelf https://github.com/aws/aws-parallelcluster/wiki/(3.8.0-%E2%80%90-3.9.3)-ParallelCluster-Build-Image-Failing-during-Installation-of-Minitar-Ruby-Gem-Dependency) Signed-off-by: Hanwen <[email protected]>
1 parent 9b768ad commit 2b978d6

File tree

19 files changed

+2
-151
lines changed

19 files changed

+2
-151
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
.idea
33
*.iml
44
.vagrant
5-
Berksfile.lock
65
*~
76
*#
87
.#*

Berksfile

Lines changed: 0 additions & 24 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste
1313
- Ubuntu 20.04 is no longer supported.
1414
- Upgrade Slurm to version 24.11.5.
1515
- Upgrade DCV to version 2024.0-19030.
16+
- Remove `berkshelf`. All cookbooks are local and do not need `berkshelf` dependency management.
1617

1718
3.13.2
1819
------

Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
source 'https://rubygems.org'
44

5-
gem 'berkshelf'
6-
75
group :style do
86
gem 'cookstyle', '~> 7.25.9'
97
gem 'rake', '~> 13.0.1'

README.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ This repo contains the AWS ParallelCluster Chef cookbook used in AWS ParallelClu
88

99
# Code structure
1010

11-
The root folder of the cookbook repository can be considered the main cookbook, since it contains two files: `Berksfile` and `metadata.rb`.
12-
These files are used by the CLI (build image time) and `user-data.sh` code to [vendor](https://docs.chef.io/workstation/berkshelf/#berks-vendor)
13-
the other sub-cookbooks and third party cookbooks.
11+
The root folder of the cookbook repository can be considered the main cookbook.
1412

1513
The main cookbook does not contain any recipe, attribute or library. They are distributed in the functional cookbooks under the `cookbooks` folder
1614
defined as follows:
@@ -391,15 +389,6 @@ If you interrupt it and try to run `kitchen verify`, you see authentication fail
391389
This happens because Ubuntu22 does not accept authentication via RSA key. You need to re-create a key pair
392390
using `ED25519` key type.
393391

394-
### Known issues with Berks
395-
396-
#### Kitchen doesn't see your changes
397-
398-
If Kitchen doesn't detect your changes, try
399-
```
400-
berks shelf uninstall ${COOKBOOK_NAME}
401-
```
402-
403392
## About python tests
404393

405394
Python tests are configured in `tox.ini` file, including paths to python files.

cookbooks/aws-parallelcluster-awsbatch/Berksfile

Lines changed: 0 additions & 20 deletions
This file was deleted.

cookbooks/aws-parallelcluster-computefleet/Berksfile

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
require 'chefspec'
2-
require 'chefspec/berkshelf'
32

43
require_relative '../../aws-parallelcluster-shared/spec/spec_helper'

cookbooks/aws-parallelcluster-entrypoints/Berksfile

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
require 'chefspec'
2-
require 'chefspec/berkshelf'
32

43
require_relative '../../aws-parallelcluster-shared/spec/spec_helper'

0 commit comments

Comments
 (0)