Skip to content

Commit 75877f1

Browse files
committed
fix makefilke
1 parent ba1cb49 commit 75877f1

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ginkgo: ## Download ginkgo locally if necessary.
5858

5959
INTEGRATION_TARGET ?= ./test/integration/...
6060

61-
BASE_IMAGE ?= gcr.io/distroless/static:nonroot
61+
BASE_IMAGE ?= m.daocloud.io/gcr.io/distroless/static:nonroot
6262
DOCKER_BUILDX_CMD ?= docker buildx
6363
IMAGE_BUILD_CMD ?= $(DOCKER_BUILDX_CMD) build
6464
IMAGE_BUILD_EXTRA_OPTS ?=
@@ -67,8 +67,11 @@ IMAGE_NAME ?= llmaz
6767
IMAGE_REPO := $(IMAGE_REGISTRY)/$(IMAGE_NAME)
6868
GIT_TAG ?= $(shell git describe --tags --dirty --always)
6969
GOPROXY=${GOPROXY:-""}
70+
ifeq ($(origin GOPROXY), undefined)
71+
unexport GOPROXY
72+
endif
7073
IMG ?= $(IMAGE_REPO):$(GIT_TAG)
71-
BUILDER_IMAGE ?= golang:$(GO_VERSION)
74+
BUILDER_IMAGE ?= m.daocloud.io/docker.io/library/golang:$(GO_VERSION)
7275
KIND_CLUSTER_NAME ?= kind
7376
CGO_ENABLED ?= 0
7477

@@ -226,7 +229,7 @@ endif
226229

227230
.PHONY: install
228231
install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
229-
$(KUSTOMIZE) build config/crd | $(KUBECTL) apply -f -
232+
$(KUSTOMIZE) build config/crd | $(KUBECTL) apply --server-side --force-conflicts -f -
230233

231234
.PHONY: uninstall
232235
uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.

0 commit comments

Comments
 (0)