Skip to content

Commit

Permalink
Bump tink to v0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ahreehong committed Apr 16, 2024
1 parent a2da570 commit 9db9658
Show file tree
Hide file tree
Showing 12 changed files with 306 additions and 303 deletions.
4 changes: 2 additions & 2 deletions UPSTREAM_PROJECTS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,8 @@ projects:
go_version: "1.21"
- name: tink
versions:
- tag: v0.8.0
go_version: "1.18"
- tag: v0.10.0
go_version: "1.21"
- org: torvalds
repos:
- name: linux
Expand Down
524 changes: 261 additions & 263 deletions projects/tinkerbell/tink/ATTRIBUTION.txt

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions projects/tinkerbell/tink/CHECKSUMS
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
3893559a553a18127be05e43b0bfd368e851ab1340780857fb65b47d4755be06 _output/bin/tink/linux-amd64/tink-controller
df2796a3e795a8fce5c8fef21836e08eafdac30f07c91942f48c6d76d49371b8 _output/bin/tink/linux-amd64/tink-server
9a27167b56c9427535f4f03c334c549eec2659097d068fb47a3adac6631d7954 _output/bin/tink/linux-amd64/tink-worker
bd0bc8d8057d3de7a3313800b148a4dda808108d491ea2f7ff474476c628155d _output/bin/tink/linux-arm64/tink-controller
3c0ae4230ab42acdd86b27b8289648216060f04bc428d86fa28853076c924842 _output/bin/tink/linux-arm64/tink-server
51b571956a06aeecbfd6de67022812455e9e6deee68800773c24d79c6c8913b5 _output/bin/tink/linux-arm64/tink-worker
76c006fd763dd3679972e222bf9c0780a6357c8b577315488eb5474b725aee9c _output/bin/tink/linux-amd64/tink-controller
514c41c24f0e40061efd4f45e3a5fce6195d3b26021425b2e3351ce723370363 _output/bin/tink/linux-amd64/tink-server
c2435808b2b38ad2a145f8db3dacdac4a7ab57f68eff3282e1dfac0d692d47bc _output/bin/tink/linux-amd64/tink-worker
4777d0715eb327a3e6875b5baf6a3aff487c5a6ea38c970b066cfbd5616d7eb1 _output/bin/tink/linux-arm64/tink-controller
871f8eff4a1ab04de296aee1d5243f207ad2ce517c4990ca2e3dc82180fc437c _output/bin/tink/linux-arm64/tink-server
e222fc18bfd495f568779f6d685b1c7a1bf68137b22a9510b04e2b0fa77c433f _output/bin/tink/linux-arm64/tink-worker
2 changes: 1 addition & 1 deletion projects/tinkerbell/tink/GIT_TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.8.0
v0.10.0
2 changes: 1 addition & 1 deletion projects/tinkerbell/tink/GOLANG_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.18
1.21
1 change: 0 additions & 1 deletion projects/tinkerbell/tink/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ VERSION?=$(shell git -C $(REPO) rev-parse --short HEAD)
EXTRA_GO_LDFLAGS=-X main.version=$(VERSION)

HAS_S3_ARTIFACTS=true
EXCLUDE_FROM_UPGRADE_BUILDSPEC=true

include $(BASE_DIRECTORY)/Common.mk

Expand Down
2 changes: 1 addition & 1 deletion projects/tinkerbell/tink/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## **Tink**
![Version](https://img.shields.io/badge/version-v0.8.0-blue)
![Version](https://img.shields.io/badge/version-v0.10.0-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
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From c876def043d2039ba2ad4bb40076e0404dec6fb4 Mon Sep 17 00:00:00 2001
From: Ahree Hong <ahreeh@amazon.com>
Date: Tue, 16 Apr 2024 13:52:26 -0700
Subject: [PATCH] Remove .ONESHELL from Makefile

Signed-off-by: Ahree Hong <ahreeh@amazon.com>
---
Makefile | 1 -
1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index b29fe5c..1e07f9d 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,6 @@ PATH := $(PATH):$(PWD)/bin
# Use bash instead of plain sh and treat the shell as one shell script invocation.
SHELL := bash
.SHELLFLAGS := -o pipefail -euc
-.ONESHELL:

# Second expansion is used by the image targets to depend on their respective binaries. It is
# necessary because automatic variables are not set on first expansion.
--
2.40.0

This file was deleted.

2 changes: 1 addition & 1 deletion projects/tinkerbell/tinkerbell-chart/chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.2.4
version: 0.2.5

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ spec:
containers:
- args:
- --backend=kubernetes
- --tls=false
{{- range .Values.tinkServer.args }}
- {{ . }}
{{- end }}
Expand Down
8 changes: 8 additions & 0 deletions tools/version-tracker/buildspecs/upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,13 @@ batch:
variables:
PROJECT_PATH: projects/tinkerbell/rufio
CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.rufio
- identifier: tinkerbell_tink
env:
type: ARM_CONTAINER
compute-type: BUILD_GENERAL1_SMALL
variables:
PROJECT_PATH: projects/tinkerbell/tink
CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/tinkerbell.tink
- identifier: vmware_govmomi
env:
type: ARM_CONTAINER
Expand Down Expand Up @@ -590,6 +597,7 @@ batch:
- replicatedhq_troubleshoot
- tinkerbell_hegel
- tinkerbell_rufio
- tinkerbell_tink
- vmware_govmomi
version: 0.2
env:
Expand Down

0 comments on commit 9db9658

Please sign in to comment.