Skip to content

Commit

Permalink
Fix development env targets in Makefile
Browse files Browse the repository at this point in the history
Summary: The makefile targets are now consistent with out developement environment setup.

Test Plan: make targets

Reviewers: oazizi, michelle, philkuz, #engineering

Reviewed By: oazizi, #engineering

Differential Revision: https://phab.corp.pixielabs.ai/D1149

GitOrigin-RevId: 3624f14
  • Loading branch information
zasgar committed Jul 10, 2019
1 parent b7c39dd commit e0233ba
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ MINIKUBE := minikube
KUBECTL := kubectl
KUBECTL_FLAGS := -n pl

WORKSPACE := $$(bazel info workspace)

## Skaffold command to use.
SKAFFOLD := skaffold

SKAFFOLD_DIR := $$(bazel info workspace)/skaffold
SKAFFOLD_DIR := $(WORKSPACE)/skaffold

## Active operating system (Linux vs MacOS).
UNAME_S := $(shell uname -s)
Expand Down Expand Up @@ -110,13 +112,8 @@ k8s-load-dev-secrets: #Loads the secrets used by the dev environment. At some po
--from-literal=auth0-client-id=qaAfEHQT7mRt6W0gMd9mcQwNANz9kRup \
--from-literal=auth0-client-secret=_rY9isTWtKgx2saBXNKZmzAf1y9pnKvlm-WdmSVZOFHb9OQtWHEX4Nrh3nWE5NNt

dev-env-start: ## Start dev environment.
$(MINIKUBE) start $(MINIKUBE_START_FLAGS) --cpus 6 --memory 8192 --mount-string="$(HOME):$(HOME)" --mount
$(MAKE) k8s-load-certs
$(MAKE) k8s-load-dev-secrets

dev-docker-start:
@eval $$(minikube docker-env); ./scripts/run_docker.sh --extra_args="$(DEV_DOCKER_EXTRA_ARGS)"
dev-env-start: ## Start K8s dev environment.
$(WORKSPACE)/scripts/setup_dev_k8s.sh

dev-env-stop: ## Stop dev environment.
$(MINIKUBE) stop
Expand Down

0 comments on commit e0233ba

Please sign in to comment.