Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump CAPT and Tink to latest version #4268

Merged
merged 4 commits into from
Feb 4, 2025
Merged

Bump CAPT and Tink to latest version #4268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62cec5d
Bump CAPT to latest version
Jan 29, 2025
3c4f463
Update upstream projects file
Jan 29, 2025
00cbcf6
Bump tink checksums
Jan 31, 2025
6e19a82
Patch tink-controller for reboot actions
Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions UPSTREAM_PROJECTS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ projects:
go_version: "1.21"
- name: cluster-api-provider-tinkerbell
versions:
- tag: v0.6.2
- tag: v0.6.4
go_version: "1.23"
- name: hegel
versions:
Expand All @@ -305,7 +305,7 @@ projects:
go_version: "1.22"
- name: tink
versions:
- tag: v0.12.1
- tag: v0.12.2
go_version: "1.22"
- org: torvalds
repos:
Expand Down
32 changes: 16 additions & 16 deletions projects/tinkerbell/cluster-api-provider-tinkerbell/ATTRIBUTION.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ https://github.com/go-openapi/swag
** github.com/golang/groupcache/lru; version v0.0.0-20210331224755-41bb18bfe9da --
https://github.com/golang/groupcache

** github.com/google/gnostic-models; version v0.6.8 --
** github.com/google/gnostic-models; version v0.6.9 --
https://github.com/google/gnostic-models

** github.com/google/gofuzz; version v1.2.0 --
Expand All @@ -44,13 +44,13 @@ https://github.com/prometheus/common
** github.com/prometheus/procfs; version v0.15.1 --
https://github.com/prometheus/procfs

** github.com/tinkerbell/cluster-api-provider-tinkerbell; version v0.6.2 --
** github.com/tinkerbell/cluster-api-provider-tinkerbell; version v0.6.4 --
https://github.com/tinkerbell/cluster-api-provider-tinkerbell

** github.com/tinkerbell/rufio/api/v1alpha1; version v0.6.1 --
** github.com/tinkerbell/rufio/api/v1alpha1; version v0.6.3 --
https://github.com/tinkerbell/rufio

** github.com/tinkerbell/tink/api/v1alpha1; version v0.12.1 --
** github.com/tinkerbell/tink/api/v1alpha1; version v0.12.2 --
https://github.com/tinkerbell/tink

** gomodules.xyz/jsonpatch/v2; version v2.4.0 --
Expand Down Expand Up @@ -80,10 +80,10 @@ https://github.com/kubernetes/component-base
** k8s.io/klog/v2; version v2.130.1 --
https://github.com/kubernetes/klog

** k8s.io/kube-openapi/pkg; version v0.0.0-20240808142205-8e686545bdb8 --
** k8s.io/kube-openapi/pkg; version v0.0.0-20241212222426-2c72e554b1e7 --
https://github.com/kubernetes/kube-openapi

** k8s.io/kube-openapi/pkg/validation/spec; version v0.0.0-20240808142205-8e686545bdb8 --
** k8s.io/kube-openapi/pkg/validation/spec; version v0.0.0-20241212222426-2c72e554b1e7 --
https://github.com/kubernetes/kube-openapi

** k8s.io/utils; version v0.0.0-20240921022957-49e7df575cb6 --
Expand All @@ -92,13 +92,13 @@ https://github.com/kubernetes/utils
** sigs.k8s.io/cluster-api; version v1.8.5 --
https://github.com/kubernetes-sigs/cluster-api

** sigs.k8s.io/controller-runtime; version v0.19.2 --
** sigs.k8s.io/controller-runtime; version v0.19.4 --
https://github.com/kubernetes-sigs/controller-runtime

** sigs.k8s.io/json; version v0.0.0-20221116044647-bc3834ca7abd --
https://github.com/kubernetes-sigs/json

** sigs.k8s.io/structured-merge-diff/v4; version v4.4.1 --
** sigs.k8s.io/structured-merge-diff/v4; version v4.5.0 --
https://github.com/kubernetes-sigs/structured-merge-diff

** sigs.k8s.io/yaml; version v1.4.0 --
Expand Down Expand Up @@ -523,7 +523,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------

** github.com/golang/protobuf; version v1.5.4 --
** github.com/golang/protobuf/proto; version v1.5.4 --
https://github.com/golang/protobuf

Copyright 2010 The Go Authors. All rights reserved.
Expand Down Expand Up @@ -833,19 +833,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
** golang.org/x/exp/maps; version v0.0.0-20240808152545-0cdaa3abc0fa --
https://golang.org/x/exp

** golang.org/x/net; version v0.31.0 --
** golang.org/x/net; version v0.34.0 --
https://golang.org/x/net

** golang.org/x/oauth2; version v0.22.0 --
https://golang.org/x/oauth2

** golang.org/x/sys/unix; version v0.27.0 --
** golang.org/x/sys/unix; version v0.29.0 --
https://golang.org/x/sys

** golang.org/x/term; version v0.26.0 --
** golang.org/x/term; version v0.28.0 --
https://golang.org/x/term

** golang.org/x/text; version v0.20.0 --
** golang.org/x/text; version v0.21.0 --
https://golang.org/x/text

** golang.org/x/time/rate; version v0.6.0 --
Expand Down Expand Up @@ -881,7 +881,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------

** google.golang.org/protobuf; version v1.35.1 --
** google.golang.org/protobuf; version v1.36.1 --
https://go.googlesource.com/protobuf

Copyright (c) 2018 The Go Authors. All rights reserved.
Expand Down Expand Up @@ -948,7 +948,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------

** k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json; version v0.0.0-20240808142205-8e686545bdb8 --
** k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json; version v0.0.0-20241212222426-2c72e554b1e7 --
https://github.com/kubernetes/kube-openapi

Copyright (c) 2020 The Go Authors. All rights reserved.
Expand Down Expand Up @@ -1083,7 +1083,7 @@ Copyright (c) 2016 Yasuhiro Matsumoto
https://github.com/mattn/go-isatty
Copyright (c) Yasuhiro MATSUMOTO <[email protected]>

** github.com/onsi/gomega; version v1.36.0 --
** github.com/onsi/gomega; version v1.36.2 --
https://github.com/onsi/gomega
Copyright (c) 2013-2014 Onsi Fakhouri

Expand Down
4 changes: 2 additions & 2 deletions projects/tinkerbell/cluster-api-provider-tinkerbell/CHECKSUMS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
e01b2425f619b3b7506e82c61ea025b33e639d8dbe8d1c8b14dc0e7ee7a1b608 _output/bin/cluster-api-provider-tinkerbell/linux-amd64/manager
1f3678d8009bd958a1e47ea04688295f679ddf87a07cc9548c29591e3e2001ea _output/bin/cluster-api-provider-tinkerbell/linux-arm64/manager
d44bbd21d00b720a7f6efec4a9a8ae8123b97e177cddad16cf86c35f5984aa1f _output/bin/cluster-api-provider-tinkerbell/linux-amd64/manager
93b5cd30a41321dad88ff69512b21c5f972dc0aafb24ea4b5164ea7a2eef2c99 _output/bin/cluster-api-provider-tinkerbell/linux-arm64/manager
2 changes: 1 addition & 1 deletion projects/tinkerbell/cluster-api-provider-tinkerbell/GIT_TAG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.6.2
v0.6.4
2 changes: 1 addition & 1 deletion projects/tinkerbell/cluster-api-provider-tinkerbell/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## **Cluster API Provider for Tinkerbell**
![Version](https://img.shields.io/badge/version-v0.6.2-blue)
![Version](https://img.shields.io/badge/version-v0.6.4-blue)
![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiZ2VEbkM5dXBVeFZhSE5IR2UvdjlNanY1RVo5S29zd0E2M1hiaCtNSEd5U3F2VUdCbkViWHVlclg5a093WVgrRUdqNnJLYUtpWjhqUWJaT0NJb3RaWWFjPSIsIml2UGFyYW1ldGVyU3BlYyI6ImtvQnZHalpsVjBCRk5jN2IiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)

[Cluster API Provider Tinkerbell (CAPT)](https://github.com/tinkerbell/cluster-api-provider-tinkerbell) is an implementation of the Cluster API for Tinkerbell, which supports declarative infrastructure for Kubernetes cluster creation, configuration and management on Tinkerbell infrastructure. CAPT is designed to allow customers to bootstrap workload clusters using hardware managed by Tinkerbell. These clusters can be enhanced externally with remote power management and secure de-provisioning of instances using [Rufio](https://github.com/tinkerbell/rufio).
Expand Down
12 changes: 6 additions & 6 deletions projects/tinkerbell/tink/CHECKSUMS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
6b63ef97c09f95de756220592f240657c545759df24cb77d1feb22e6c299dbc3 _output/bin/tink/linux-amd64/tink-controller
4b71ec5fdbf5ee35aece32cfe57df5ecb7e45f67243459f9e6a955b3995f39e2 _output/bin/tink/linux-amd64/tink-server
61cbb5a54525979309f7b4b63aa62a541747b6e0fa818d67c3e6e488842c9b43 _output/bin/tink/linux-amd64/tink-worker
685f0b57078a766f7e471b4bb653ffc999ad2cef3dc8a41dbce0cf08003719d6 _output/bin/tink/linux-arm64/tink-controller
4b9a28b95c70af00759450d5008b1457217db4c629667a6f241ee8fb60291d42 _output/bin/tink/linux-arm64/tink-server
1de578cb7d619701043ea511d15c9d1c61fdcf56b2149eed8ccfd28f3331ee73 _output/bin/tink/linux-arm64/tink-worker
418592ee5d003d94576f94beed747bb3ae2a947ba2f0d9ca674e4124cacb85d7 _output/bin/tink/linux-amd64/tink-controller
6f9f5613150bfca9810aee04721ecb8a3a013dfe6251789b65d77de4ec2af3f4 _output/bin/tink/linux-amd64/tink-server
c500bafb05dd2c69a494c3fd7906223f815809de9ea2de511ea73f3cef5d81cf _output/bin/tink/linux-amd64/tink-worker
5da0562be919eb259a48d69e0588b1ec257ad47c76c20b01cbd174717ecfd3cc _output/bin/tink/linux-arm64/tink-controller
e2ef3f102b87e7f1f375953613b71e9f9a53d41f2b86d53548f8f644c62cab52 _output/bin/tink/linux-arm64/tink-server
f576b4b8e6753f36623625bc1d48f6266ad1b32a304c3e992478aadcccba7efe _output/bin/tink/linux-arm64/tink-worker
2 changes: 1 addition & 1 deletion projects/tinkerbell/tink/GIT_TAG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.12.1
v0.12.2
2 changes: 1 addition & 1 deletion projects/tinkerbell/tink/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## **Tink**
![Version](https://img.shields.io/badge/version-v0.12.1-blue)
![Version](https://img.shields.io/badge/version-v0.12.2-blue)
![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiUmxrMmd4b2N6dk02TDRPVlVXQ1N3aEhsRzAxWFBtZ1Y1VVNXWEtVZlVNS0tkQlZ4MHFuNXJiWld0ZFMvVzVmMzZxWjhKK3FERWdQeEV6RWd6WFZBcGM0PSIsIml2UGFyYW1ldGVyU3BlYyI6ImEvZEhCemJsQXJWZXVmc2kiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)

[Tink](https://github.com/tinkerbell/tink) consists of the tink-server, tink-controller and tink-worker. The tink-worker and tink-server communicate over gRPC, and are responsible for processing workflows. Tink-controller is Kubernetes controller that is responsible for reconciling Tinkerbell hardwares, templates and workflows. The CLI is the user-interactive piece for creating workflows and their building blocks, templates and hardware data.
Expand Down
37 changes: 37 additions & 0 deletions ...s/tinkerbell/tink/patches/0001-Patch-tink-controller-to-update-reboot-action-to-suc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From c1c3437f78511a64ef97d8e9e64aa449f48e1201 Mon Sep 17 00:00:00 2001
From: Rahul Ganesh <[email protected]>
Date: Tue, 4 Feb 2025 20:54:26 +0000
Subject: [PATCH] Patch tink-controller to update reboot action to success by
default

In reboot action, sometimes the power off happens too fast before the
tink-worker is able to report the status back to the server. This causes
the workflow to never proceed to successful state even when the reboot
happens successfully. Patch controller to default to success state if
the action is reboot.

Signed-off-by: Rahul Ganesh <[email protected]>
---
internal/deprecated/workflow/reconciler.go | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/internal/deprecated/workflow/reconciler.go b/internal/deprecated/workflow/reconciler.go
index 5922fa6..ecd552d 100644
--- a/internal/deprecated/workflow/reconciler.go
+++ b/internal/deprecated/workflow/reconciler.go
@@ -295,6 +295,12 @@ func (r *Reconciler) processRunningWorkflow(stored *v1alpha1.Workflow) {
if action.Status == v1alpha1.WorkflowStateRunning && stored.Status.CurrentAction != action.Name {
stored.Status.CurrentAction = action.Name
}
+
+ if action.Name == "reboot" && action.Status == v1alpha1.WorkflowStateRunning {
+ stored.Status.Tasks[ti].Actions[ai].Status = v1alpha1.WorkflowStateSuccess
+ stored.Status.Tasks[ti].Actions[ai].Seconds = int64(r.nowFunc().Sub(action.StartedAt.Time).Seconds())
+ stored.Status.State = v1alpha1.WorkflowStatePost
+ }
}
}
}
--
2.40.1