Skip to content

Commit 8ad6dbc

Browse files
Update hook os build to use tink worker from mono repo (#5131)
1 parent a122831 commit 8ad6dbc

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

projects/tinkerbell/hook/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ IMAGE_BUILD_ARGS=
8585
BUILDSPECS=$(BUILDSPECS_FOR_COMBINE_IMAGES)
8686
BUILDSPEC_1_COMPUTE_TYPE=BUILD_GENERAL1_LARGE
8787

88-
PROJECT_DEPENDENCIES=eksa/containerd/containerd eksa/tinkerbell/actions eksa/tinkerbell/tink eksa/linuxkit/linuxkit
88+
PROJECT_DEPENDENCIES=eksa/containerd/containerd eksa/tinkerbell/actions eksa/tinkerbell/tinkerbell eksa/linuxkit/linuxkit
8989

9090
# Since we build the arm and amd binaries on difference instances in codebuild
9191
# we do not want to delete missing files when s3 sync-ing from local to the bucket
@@ -204,7 +204,7 @@ $(OUTPUT_DIR)/hook-embedded/linux-%/images: IMAGE_TAG_SUFFIX=
204204
$(OUTPUT_DIR)/hook-embedded/linux-%/images: DIND_IMAGE=$(shell $(MAKE) var-value-LATEST_IMAGE IMAGE_NAME=hook-dind)
205205
$(OUTPUT_DIR)/hook-embedded/linux-%/images: $(GIT_PATCH_TARGET)
206206
mkdir -p $(@D)
207-
echo "$$($(MAKE) -C $(MAKE_ROOT)/../tink var-value-LATEST_IMAGE IMAGE_NAME=tink-worker) 127.0.0.1/embedded/tink-worker true" > $@.txt
207+
echo "$$($(MAKE) -C $(MAKE_ROOT)/../tinkerbell var-value-LATEST_IMAGE IMAGE_NAME=tink-agent) 127.0.0.1/embedded/tink-worker true" > $@.txt
208208
for action in cexec kexec image2disk oci2disk writefile reboot; do \
209209
echo "$$($(MAKE) -C $(MAKE_ROOT)/../actions var-value-LATEST_IMAGE IMAGE_NAME=$$action) 127.0.0.1/embedded/$$action true" >> $@.txt; \
210210
done

release/staging-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ batch:
725725
- containerd_containerd_1_35_linux_amd64
726726
- containerd_containerd_1_35_linux_arm64
727727
- tinkerbell_actions
728-
- tinkerbell_tink_combine_images
728+
- tinkerbell_tinkerbell_combine_images
729729
- linuxkit_linuxkit_combine_images
730730
env:
731731
type: LINUX_CONTAINER
@@ -753,7 +753,7 @@ batch:
753753
- containerd_containerd_1_35_linux_amd64
754754
- containerd_containerd_1_35_linux_arm64
755755
- tinkerbell_actions
756-
- tinkerbell_tink_combine_images
756+
- tinkerbell_tinkerbell_combine_images
757757
- linuxkit_linuxkit_combine_images
758758
env:
759759
type: ARM_CONTAINER

0 commit comments

Comments
 (0)