Skip to content

Commit c3a9f6a

Browse files
authored
Update BMCLib to a latest commit that includes critical Gofish fixes (#5317)
Signed-off-by: Rahul <rahulbabu95@gmail.com>
1 parent 8dedae7 commit c3a9f6a

File tree

4 files changed

+79
-84
lines changed

4 files changed

+79
-84
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
0df73600bd4b67a955a1a0aa89d2c021bacc026396b09172abdb21ba8f2c0bee _output/bin/tinkerbell/linux-amd64/tink-agent
2-
4b4e6ce48ca6d2a797019a265e134536f33c3a6bdbd63095c4ad1c12ba6bd054 _output/bin/tinkerbell/linux-amd64/tinkerbell
3-
c84de42bfb517e1b266ab04dbbc4c332c14ac39a13a71acc0bf0681a9278c2bd _output/bin/tinkerbell/linux-arm64/tink-agent
4-
6cd2e8fa6cd7bed02465558a321d0f506f020e5012eb026dc44ff24b97e14405 _output/bin/tinkerbell/linux-arm64/tinkerbell
1+
30ca24f28fa6012d97c7ad3295b2d6a75ba37e439673fed7c84bd42d6f66dd66 _output/bin/tinkerbell/linux-amd64/tink-agent
2+
017eac825461d2e86b7f523f3003bbbae36101766bbb02e51c6c7f544091db3f _output/bin/tinkerbell/linux-amd64/tinkerbell
3+
d86f7122ab98ec2ddf2e7c7571c5ab1da6cd5ab360f6913ea4a7b3728bb7c101 _output/bin/tinkerbell/linux-arm64/tink-agent
4+
6e07395bcc363bba07fc4fa95d926e40a539cdd94dd30df54c3d1016a7f5d629 _output/bin/tinkerbell/linux-arm64/tinkerbell

projects/tinkerbell/tinkerbell/patches/0001-Remove-secondstar-service.patch

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ From: Rahul Ganesh <rahulgab@amazon.com>
33
Date: Thu, 22 Jan 2026 16:46:18 -0800
44
Subject: [PATCH 1/6] Remove secondstar service
55

6-
EKS-A does not use the secondstar (SSH over serial) service. Remove it
7-
to reduce binary size and dependencies.
6+
EKS-A does not use the secondstar (SSH over serial) service. Disable it.
87

98
Note: tootles (metadata service, formerly hegel) is kept as EKS-A uses
109
it for machine metadata.
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
From a962913c5d94d44abbe54bc2ac3e6ab9d9dcdf6b Mon Sep 17 00:00:00 2001
2+
From: Rahul Ganesh <rahulgab@amazon.com>
3+
Date: Thu, 16 Apr 2026 18:27:36 -0700
4+
Subject: [PATCH 6/6] Bump bmclib to 3269f94 (gofish v0.21.6)
5+
6+
Update bmclib from fork pin to upstream bmc-toolbox/bmclib@3269f94
7+
which merges all prior fork patches and bumps gofish to v0.21.6.
8+
9+
Key fixes included via gofish v0.21.5/v0.21.6:
10+
- SetBoot tries main System resource before Settings URI,
11+
fixing one-time boot override on iDRAC 7.x-9.x
12+
- Restore HTTP/2 ALPN negotiation on custom TLS transports
13+
- Fix multi-type JSON Schema properties resolving to wrong type
14+
15+
Also removes the rahulbabu95/bmclib fork replace directive since
16+
all fork commits (PRs #433, #434, #435) are now merged upstream.
17+
18+
Signed-off-by: Rahul Ganesh <rahulgab@amazon.com>
19+
---
20+
go.mod | 4 ++--
21+
go.sum | 8 ++++----
22+
2 files changed, 6 insertions(+), 6 deletions(-)
23+
24+
diff --git a/go.mod b/go.mod
25+
index cd60a943..3189dae0 100644
26+
--- a/go.mod
27+
+++ b/go.mod
28+
@@ -7,7 +7,7 @@ require (
29+
github.com/Masterminds/sprig/v3 v3.3.0
30+
github.com/a-h/templ v0.3.977
31+
github.com/avast/retry-go/v4 v4.7.0
32+
- github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20251010091507-63cb571e5597
33+
+ github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20260416064330-3269f94932e9
34+
github.com/ccoveille/go-safecast/v2 v2.0.0
35+
github.com/cenkalti/backoff/v5 v5.0.3
36+
github.com/containerd/containerd/v2 v2.2.1
37+
@@ -214,7 +214,7 @@ require (
38+
github.com/soheilhy/cmux v0.1.5 // indirect
39+
github.com/spf13/cast v1.7.0 // indirect
40+
github.com/spf13/cobra v1.9.1 // indirect
41+
- github.com/stmcginnis/gofish v0.20.0 // indirect
42+
+ github.com/stmcginnis/gofish v0.21.6 // indirect
43+
github.com/stoewer/go-strcase v1.3.0 // indirect
44+
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
45+
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
46+
diff --git a/go.sum b/go.sum
47+
index 56be1b85..35809760 100644
48+
--- a/go.sum
49+
+++ b/go.sum
50+
@@ -49,8 +49,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
51+
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
52+
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
53+
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
54+
-github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20251010091507-63cb571e5597 h1:V8lDpeWcQXhlarTtD5op6++v5Dh6wO4WTBXq8ugNuj4=
55+
-github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20251010091507-63cb571e5597/go.mod h1:2tYJD9JtY1tJxLHhslICrFOZhxE9O4gYMb1nJ5BKI5w=
56+
+github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20260416064330-3269f94932e9 h1:q4Sc06ok4ZDPuu6yYIkXDTJw8DEh5xA4Px9OQD087cg=
57+
+github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20260416064330-3269f94932e9/go.mod h1:NicaxDvwo1RbClp+6XPefZt28svygBT5wofYk/A1Sk0=
58+
github.com/bmc-toolbox/common v0.0.0-20250112191656-b6de52e8303d h1:5c0jhS9jNLm1t3GVEESsWv+p6recFRLGW90zp8HDIDs=
59+
github.com/bmc-toolbox/common v0.0.0-20250112191656-b6de52e8303d/go.mod h1:Cdnkm+edb6C0pVkyCrwh3JTXAe0iUF9diDG/DztPI9I=
60+
github.com/bombsimon/logrusr/v2 v2.0.1 h1:1VgxVNQMCvjirZIYaT9JYn6sAVGVEcNtRE0y4mvaOAM=
61+
@@ -458,8 +458,8 @@ github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wx
62+
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
63+
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
64+
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
65+
-github.com/stmcginnis/gofish v0.20.0 h1:hH2V2Qe898F2wWT1loApnkDUrXXiLKqbSlMaH3Y1n08=
66+
-github.com/stmcginnis/gofish v0.20.0/go.mod h1:PzF5i8ecRG9A2ol8XT64npKUunyraJ+7t0kYMpQAtqU=
67+
+github.com/stmcginnis/gofish v0.21.6 h1:jK3TGD6VANaAHKHypVNfD6io2nPrU+6eF8X4qARsTlY=
68+
+github.com/stmcginnis/gofish v0.21.6/go.mod h1:PzF5i8ecRG9A2ol8XT64npKUunyraJ+7t0kYMpQAtqU=
69+
github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
70+
github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=
71+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
72+
--
73+
2.46.0
74+

projects/tinkerbell/tinkerbell/patches/0006-fix-Replace-bmclib-with-fork-for-iDRAC10-gofish-comp.patch

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

0 commit comments

Comments
 (0)