Bump tink to v0.10.0

UPSTREAM_PROJECTS.yaml

@@ -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

projects/tinkerbell/tink/CHECKSUMS

@@ -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
+de6c562317c312661c47ccfc2083c6d1e55f2f01604194b8f4cce45eef13912f  _output/bin/tink/linux-amd64/tink-controller
+45985bc089791fa88cd2c96d2b89818292757fa19b7c543f97084a294b062260  _output/bin/tink/linux-amd64/tink-server
+3dac4ecc4f69ec8ef680c215407937563476ac478a4b74dad0466c655ec9287b  _output/bin/tink/linux-amd64/tink-worker
+bbf2fd03a08b6a2bb6fd2b6be6750e154f8ac9fbb8aa25cbeefa4f68dcd8e154  _output/bin/tink/linux-arm64/tink-controller
+8ec366ca25a252e762fe27e1dafb9d5e249dc882e8e1b3cc29ef4d9f4492036d  _output/bin/tink/linux-arm64/tink-server
+80cdc1ff7e90ea7c0fef678b70fc703880cd142131fdf2daf4291344806e7879  _output/bin/tink/linux-arm64/tink-worker

projects/tinkerbell/tink/GIT_TAG

@@ -1 +1 @@
-v0.8.0
+v0.10.0

projects/tinkerbell/tink/GOLANG_VERSION

@@ -1 +1 @@
-1.18
+1.21

projects/tinkerbell/tink/Makefile

@@ -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
 

projects/tinkerbell/tink/README.md

@@ -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.

projects/tinkerbell/tink/patches/0001-Remove-.ONESHELL-from-Makefile.patch

@@ -0,0 +1,48 @@
+From f13510723306d174b108f76e6b0bd482905a99f8 Mon Sep 17 00:00:00 2001
+From: Ahree Hong <ahreeh@amazon.com>
+Date: Tue, 16 Apr 2024 17:31:46 -0700
+Subject: [PATCH] Remove .ONESHELL from Makefile
+
+Signed-off-by: Ahree Hong <ahreeh@amazon.com>
+---
+ Makefile | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b29fe5c..bfa60fa 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.
+@@ -159,15 +158,16 @@ out/release/default/kustomization.yaml: config/default/kustomization.yaml
+ 	mkdir -p out/
+ 	cp -a config/ out/release/
+
+-out/release/tink.yaml: generate-manifests out/release/default/kustomization.yaml
+-	(
+-		cd out/release/default && \
+-		$(KUSTOMIZE) edit set image server=$(TINK_SERVER_IMAGE):$(TINK_CONTROLLER_TAG) controller=$(TINK_CONTROLLER_IMAGE):$(TINK_CONTROLLER_TAG) && \
+-		$(KUSTOMIZE) edit set namespace $(NAMESPACE) \
+-	)
++out/release/tink.yaml: generate-manifests out/release/default/kustomization.yaml set-manifest
+ 	$(KUSTOMIZE) build out/release/default -o $@
+ 	prettier --write $@
+
++.PHONY: set-manifest
++set-manifest:
++	cd out/release/default && \
++	$(KUSTOMIZE) edit set image server=$(TINK_SERVER_IMAGE):$(TINK_CONTROLLER_TAG) controller=$(TINK_CONTROLLER_IMAGE):$(TINK_CONTROLLER_TAG) && \
++	$(KUSTOMIZE) edit set namespace $(NAMESPACE)
++
+ .PHONY: release-manifests
+ release-manifests: out/release/tink.yaml ## Builds the manifests to publish with a release.
+
+-- 
+2.40.0
+

projects/tinkerbell/tinkerbell-chart/GIT_TAG

@@ -1 +1 @@
-0.2.4
+0.2.5

projects/tinkerbell/tinkerbell-chart/chart/Chart.yaml

@@ -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

projects/tinkerbell/tinkerbell-chart/chart/templates/tink-server/deployment.yaml

@@ -19,7 +19,6 @@ spec:
       containers:
         - args:
             - --backend=kubernetes
-            - --tls=false
             {{- range .Values.tinkServer.args }}
             - {{ . }}
             {{- end }}

projects/tinkerbell/tinkerbell-chart/helm/sedfile.template

@@ -1 +1 @@
-s,0.2.4,${IMAGE_TAG},g
+s,0.2.5,${IMAGE_TAG},g

tools/version-tracker/buildspecs/upgrade.yml

@@ -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
@@ -590,6 +597,7 @@ batch:
         - replicatedhq_troubleshoot
         - tinkerbell_hegel
         - tinkerbell_rufio
+        - tinkerbell_tink
         - vmware_govmomi
 version: 0.2
 env: