CHEF-32187: Bump knife 18.8.68 -> 19.0.105 and knife-ec-backup 3.0.5 -> 3.0.8#4183
Open
lbakerchef wants to merge 7 commits into
Open
CHEF-32187: Bump knife 18.8.68 -> 19.0.105 and knife-ec-backup 3.0.5 -> 3.0.8#4183lbakerchef wants to merge 7 commits into
lbakerchef wants to merge 7 commits into
Conversation
👷 Deploy Preview for chef-server processing.
|
lbakerchef
force-pushed
the
CHEF-32187/lbaker
branch
from
5ea0d8f to
29d1f79
Compare
The prior PR (#4175) was merged with the omnibus submodule pointing to the PRE-MERGE INSTRUCTIONS commit (024146f) rather than the actual omnibus-config main HEAD after the rebuild/CHEF-32135 PR merged. Advance submodule pointer to 939f4c9 (Merge pull request #5 from chef/rebuild/CHEF-32135-lbaker-20260430-092319). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Lincoln Baker <51833247+lbakerchef@users.noreply.github.com>
Signed-off-by: Lincoln Baker <51833247+lbakerchef@users.noreply.github.com>
lbakerchef
force-pushed
the
CHEF-32187/lbaker
branch
from
29d1f79 to
71ed65c
Compare
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
lbakerchef
changed the title
lbakerchef
force-pushed
the
CHEF-32187/lbaker
branch
4 times, most recently
from
43c77e9 to
84d6996
Compare
…nibus-config - Cherry-pick chef 18.10.17 bump from CHEF-32186/lbaker - Add config/software/chef.rb override (default_version 'v18.10.17') - Comment out override :chef in omnibus_overrides.rb - Fix knife appbundle: use appbundle 'chef-server-ctl', gem: 'knife' (was incorrectly using 'knife' as the source project name) - Advance omnibus submodule to a1b1de6 (CHEF-32187/lbaker) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
lbakerchef
force-pushed
the
CHEF-32187/lbaker
branch
from
84d6996 to
435e38c
Compare
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
Author
|
Build #8280 ✅ — all 7 builds + all 10 verify jobs passed: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Bumps knife-family gems and cherry-picks chef 18.10.17 per CHEF-32187:
~> 18.8.68→~> 19.0.105~> 3.0.5→~> 3.0.8~> 18.8.46→~> 18.10.17(cherry-picked from CHEF-32186/lbaker)Changes
chef-server
src/chef-server-ctl/Gemfile: updated knife, knife-ec-backup, and chef constraintssrc/chef-server-ctl/Gemfile.lock: regenerated; pinsuri (1.0.4)to resolve conflict (see below)omnibus_overrides.rb: chef version override commented out (moved to omnibus-configchef.rb)omnibus(submodule): advanced to CHEF-32187/lbaker on chef-server-omnibus-configchef-server-omnibus-config (via submodule)
config/software/private-chef-ctl.rb: addedappbundle "chef-server-ctl", gem: "knife"+delete/linkto replace the bare RubyGems binstub atembedded/bin/knifewith the Bundler-aware appbundler wrapperconfig/software/opensearch.rb: reverted from tuxcare 1.0.3 back to tuxcare 1.0.2 (1.0.3 had a startup regression in verify tests)config/software/chef.rb: added, pinsdefault_version "v18.10.17"Root Cause of the URI Conflict
knife 19.0.105 switched from
faraday-racktofaraday-net_http, which requiresnet-http 0.9.1, which requiresuri >= 0.11.1. Ruby 3.1.7 shipsuri-1.1.1as a default gem. When the bare RubyGems binstub atembedded/bin/knifeis invoked, unguided RubyGems resolution activatesuri-1.1.1, which then conflicts with chef'suri (~> 1.0.4)constraint.The fix is not to change the path constant — it is to replace the bare binstub with an appbundler-generated wrapper that uses the chef-server-ctl Gemfile.lock. That lockfile pins
uri (1.0.4), which satisfies both constraints, and Bundler enforces it at load time.Testing
Build #8280: ✅ all 7 build jobs passed, all 10 verify/test jobs passed across all platforms (rocky-9, sles-12, sles-15, ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, el-8, el-9, amazon-2, amazon-2023).
Jira
CHEF-32187