Skip to content

Commit

Permalink
make: remove unrequired configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
v1v committed Oct 12, 2022
1 parent 6f2e53f commit 5b6eaa2
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions .k8s/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ GIT_USERNAME ?= $(shell git config user.name | tr -d ' '| tr '[:upper:]' '[:lowe

.SILENT:

# Whether to run all the python versions from the whole support matrix
FULL ?= false
# TODO: allow dynamism so the cluster is defined in Vault maybe?
K8S_CLUSTER ?= observability-ci-test-k8s
K8S_NAMESPACE ?= $(GIT_USERNAME)
Expand All @@ -25,15 +23,6 @@ GCLOUD_K8S_CLUSTER_REGION ?= us-central1-c
GCLOUD_K8S_CLUSTER_PROJECT ?= elastic-observability
DEFAULT_REPO ?= docker.elastic.co/beats-dev

EXCLUDE = .ci/.jenkins_exclude.yml
ifeq ($(FULL), true)
FRAMEWORKS = .ci/.jenkins_framework_full.yml
VERSIONS = .ci/.jenkins_python_full.yml
else
FRAMEWORKS = .ci/.jenkins_framework.yml
VERSIONS = .ci/.jenkins_python.yml
endif


################################
## Helper function
Expand All @@ -42,8 +31,6 @@ endif
help:
@echo "Environment variables:"
@echo ""
@echo 'VAULT_TOKEN=$$(cat $${HOME}/.vault-token) this token is needed for local operations'
@echo ""
@echo "Main targets:"
@echo ""
@grep '^## @help' Makefile|cut -d ":" -f 2-3|( (sort|column -s ":" -t) || (sort|tr ":" "\t") || (tr ":" "\t"))
Expand All @@ -65,6 +52,7 @@ bin/skaffold: bin
chmod +x "$(SKAFFOLD)"

setup: bin/kubectl bin/skaffold
pip3 install -r requirements.txt

################################
## K8s specific helper functions
Expand Down

0 comments on commit 5b6eaa2

Please sign in to comment.