Skip to content

Commit 807be79

Browse files
committed
fallback to standard path for kubebuilder assets
the base dockerfile wasn't setting the path correctly
1 parent a932c01 commit 807be79

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ LOCAL_NAMESPACE := "olm"
2323
export GO111MODULE=on
2424
CONTROLLER_GEN := go run $(MOD_FLAGS) ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen
2525
YQ_INTERNAL := go run $(MOD_FLAGS) ./vendor/github.com/mikefarah/yq/v2/
26-
KUBEBUILDER_ASSETS := $(or $(KUBEBUILDER_ASSETS),$(dir $(shell command -v kubebuilder)))
26+
KUBEBUILDER_ASSETS := $(or $(or $(KUBEBUILDER_ASSETS),$(dir $(shell command -v kubebuilder))), /usr/local/kubebuilder/bin)
2727
export KUBEBUILDER_ASSETS
2828

2929
# ART builds are performed in dist-git, with content (but not commits) copied

base.Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ RUN yum install -y skopeo && \
1111
export PATH=$PATH:/usr/local/kubebuilder/bin && \
1212
echo "Kubebuilder installation complete!"
1313

14+
ENV PATH=$PATH:/usr/local/kubebuilder/bin
15+
ENV KUBEBUILDER_ASSETS=/usr/local/kubebuilder/bin

0 commit comments

Comments
 (0)