From f596b3582c01f9ab78d9724f6ade8263a39f4a7f Mon Sep 17 00:00:00 2001 From: enxebre Date: Thu, 12 Dec 2024 13:04:33 +0100 Subject: [PATCH] Include karpenter-operator binary within HO image --- Dockerfile | 3 ++- Makefile | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5932426662..ca2b00cc11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,12 +4,13 @@ WORKDIR /hypershift COPY . . -RUN make hypershift hypershift-operator product-cli +RUN make hypershift hypershift-operator product-cli karpenter-operator FROM registry.access.redhat.com/ubi9:latest COPY --from=builder /hypershift/bin/hypershift \ /hypershift/bin/hcp \ /hypershift/bin/hypershift-operator \ + /hypershift/bin/karpenter-operator \ /usr/bin/ ENTRYPOINT ["/usr/bin/hypershift"] diff --git a/Makefile b/Makefile index 0bf255ec11..650a7f8fb5 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ OUT_DIR ?= bin # run the HO locally HYPERSHIFT_INSTALL_AWS := ./hack/dev/aws/hypershft-install-aws.sh -RUN_OPERATOR_LOCALLY_AWS := ./hack/dev/aws/run-operator-locally-aws.sh +RUN_OPERATOR_LOCALLY_AWS := ./hack/dev/aws/run-operator-locally-aws-dev.sh # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) @@ -89,6 +89,10 @@ tests: hypershift-operator: $(GO_BUILD_RECIPE) -o $(OUT_DIR)/hypershift-operator ./hypershift-operator +.PHONY: karpenter-operator +karpenter-operator: + $(GO_BUILD_RECIPE) -o $(OUT_DIR)/karpenter-operator ./karpenter-operator + .PHONY: control-plane-operator control-plane-operator: $(GO_BUILD_RECIPE) -o $(OUT_DIR)/control-plane-operator ./control-plane-operator