Skip to content

Commit 1278480

Browse files
authored
remove hacky make targets in favor of tilt (#1923)
Signed-off-by: Kent Rancourt <kent.rancourt@microsoft.com>
1 parent 6ab4d20 commit 1278480

File tree

1 file changed

+2
-57
lines changed

1 file changed

+2
-57
lines changed

Makefile

Lines changed: 2 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ validate-examples:
259259
################################################################################
260260

261261
.PHONY: build
262-
build: build-brigadier build-images build-cli
262+
build: build-brigadier push-images build-cli
263263

264264
.PHONY: build-brigadier
265265
build-brigadier:
@@ -270,9 +270,6 @@ build-brigadier:
270270
yarn build-docs \
271271
'
272272

273-
.PHONY: build-images
274-
build-images: build-apiserver build-artemis build-git-initializer build-logger build-observer build-scheduler build-worker
275-
276273
.PHONY: build-git-initializer-windows
277274
build-git-initializer-windows:
278275
docker build \
@@ -293,17 +290,6 @@ build-logger-windows:
293290
--build-arg COMMIT=$(GIT_VERSION) \
294291
.
295292

296-
.PHONY: build-%
297-
build-%:
298-
docker buildx build \
299-
-f v2/$*/Dockerfile \
300-
-t $(DOCKER_IMAGE_PREFIX)$*:$(IMMUTABLE_DOCKER_TAG) \
301-
-t $(DOCKER_IMAGE_PREFIX)$*:$(MUTABLE_DOCKER_TAG) \
302-
--build-arg VERSION=$(VERSION) \
303-
--build-arg COMMIT=$(GIT_VERSION) \
304-
--platform linux/amd64,linux/arm64 \
305-
.
306-
307293
.PHONY: build-cli
308294
build-cli:
309295
$(GO_DOCKER_CMD) sh -c ' \
@@ -438,18 +424,6 @@ hack-kind-up:
438424
hack-kind-down:
439425
ctlptl delete -f hack/kind/cluster.yaml
440426

441-
.PHONY: hack-build-images
442-
hack-build-images: hack-build-apiserver hack-build-artemis hack-build-git-initializer hack-build-logger hack-build-observer hack-build-scheduler hack-build-worker
443-
444-
.PHONY: hack-build-%
445-
hack-build-%:
446-
docker build \
447-
-f v2/$*/Dockerfile \
448-
-t $(DOCKER_IMAGE_PREFIX)$*:$(IMMUTABLE_DOCKER_TAG) \
449-
--build-arg VERSION='$(VERSION)' \
450-
--build-arg COMMIT='$(GIT_VERSION)' \
451-
.
452-
453427
.PHONY: hack-build-cli
454428
hack-build-cli:
455429
$(GO_DOCKER_CMD) sh -c ' \
@@ -461,15 +435,6 @@ hack-build-cli:
461435
../scripts/build-cli.sh \
462436
'
463437

464-
.PHONY: hack-push-images
465-
hack-push-images: hack-push-artemis hack-push-apiserver hack-push-scheduler hack-push-observer hack-push-logger hack-push-git-initializer hack-push-worker
466-
467-
.PHONY: hack-push-%
468-
hack-push-%: hack-build-%
469-
docker push $(DOCKER_IMAGE_PREFIX)$*:$(IMMUTABLE_DOCKER_TAG)
470-
471-
IMAGE_PULL_POLICY ?= Always
472-
473438
.PHONY: hack-deploy
474439
hack-deploy:
475440
kubectl get namespace brigade || kubectl create namespace brigade
@@ -481,32 +446,21 @@ hack-deploy:
481446
--timeout 600s \
482447
--set artemis.image.repository=$(DOCKER_IMAGE_PREFIX)artemis \
483448
--set artemis.image.tag=$(IMMUTABLE_DOCKER_TAG) \
484-
--set artemis.image.pullPolicy=$(IMAGE_PULL_POLICY) \
485449
--set apiserver.image.repository=$(DOCKER_IMAGE_PREFIX)apiserver \
486450
--set apiserver.image.tag=$(IMMUTABLE_DOCKER_TAG) \
487-
--set apiserver.image.pullPolicy=$(IMAGE_PULL_POLICY) \
488451
--set apiserver.service.type=NodePort \
489452
--set apiserver.service.nodePort=31600 \
490453
--set apiserver.rootUser.password="${APISERVER_ROOT_PASSWORD}" \
491454
--set scheduler.image.repository=$(DOCKER_IMAGE_PREFIX)scheduler \
492455
--set scheduler.image.tag=$(IMMUTABLE_DOCKER_TAG) \
493-
--set scheduler.image.pullPolicy=$(IMAGE_PULL_POLICY) \
494456
--set observer.image.repository=$(DOCKER_IMAGE_PREFIX)observer \
495457
--set observer.image.tag=$(IMMUTABLE_DOCKER_TAG) \
496-
--set observer.image.pullPolicy=$(IMAGE_PULL_POLICY) \
497458
--set worker.image.repository=$(DOCKER_IMAGE_PREFIX)worker \
498459
--set worker.image.tag=$(IMMUTABLE_DOCKER_TAG) \
499-
--set worker.image.pullPolicy=$(IMAGE_PULL_POLICY) \
500460
--set gitInitializer.linux.image.repository=$(DOCKER_IMAGE_PREFIX)git-initializer \
501461
--set gitInitializer.linux.image.tag=$(IMMUTABLE_DOCKER_TAG) \
502-
--set gitInitializer.linux.image.pullPolicy=$(IMAGE_PULL_POLICY) \
503462
--set logger.linux.image.repository=$(DOCKER_IMAGE_PREFIX)logger\
504-
--set logger.linux.image.tag=$(IMMUTABLE_DOCKER_TAG) \
505-
--set logger.linux.image.pullPolicy=$(IMAGE_PULL_POLICY)
506-
507-
.PHONY: hack
508-
hack: hack-push-images hack-build-cli hack-deploy
509-
463+
--set logger.linux.image.tag=$(IMMUTABLE_DOCKER_TAG)
510464
.PHONY: hack-expose-apiserver
511465
hack-expose-apiserver:
512466
@kubectl --namespace brigade port-forward service/brigade-apiserver 7000:443 &>/dev/null & \
@@ -516,15 +470,6 @@ hack-expose-apiserver:
516470
hack-unexpose-apiserver:
517471
@kill -TERM $$(cat /tmp/brigade-apiserver.PID)
518472

519-
# Convenience targets for loading images into a KinD cluster
520-
.PHONY: hack-load-images
521-
hack-load-images: load-artemis load-apiserver load-scheduler load-observer load-logger load-git-initializer load-worker
522-
523-
load-%:
524-
@echo "Loading $(DOCKER_IMAGE_PREFIX)$*:$(IMMUTABLE_DOCKER_TAG)"
525-
@kind load docker-image $(DOCKER_IMAGE_PREFIX)$*:$(IMMUTABLE_DOCKER_TAG) \
526-
|| echo >&2 "kind not installed or error loading image: $(DOCKER_IMAGE_PREFIX)$*:$(IMMUTABLE_DOCKER_TAG)"
527-
528473
################################################################################
529474
# Docs Preview targets. #
530475
################################################################################

0 commit comments

Comments
 (0)