Support for Triton discovery #18
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| [submodule "test/testing"] | ||
| path = test/testing | ||
| url = git@github.com:autopilotpattern/testing.git |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| # Makefile for shipping and testing the container image. | ||
|
|
||
| MAKEFLAGS += --warn-undefined-variables | ||
| .DEFAULT_GOAL := build | ||
| .PHONY: * | ||
|
|
||
| # we get these from CI environment if available, otherwise from git | ||
| GIT_COMMIT ?= $(shell git rev-parse --short HEAD) | ||
| GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD) | ||
| WORKSPACE ?= $(shell pwd) | ||
|
|
||
| namespace ?= autopilotpattern | ||
| tag := branch-$(shell basename $(GIT_BRANCH)) | ||
| image := $(namespace)/prometheus | ||
| testImage := $(namespace)/prometheus-testrunner | ||
|
|
||
| #dockerLocal := DOCKER_HOST= DOCKER_TLS_VERIFY= DOCKER_CERT_PATH= docker | ||
|
Contributor
Author
There was a problem hiding this comment. This does not work on my Mac with Docker Machine. Replacing it with Error is:
Contributor
There was a problem hiding this comment. Hm, that's unfortunate and is because Docker Machine uses This will effect every blueprint where we're doing testing this way. I'm certainly open to new suggestions on how to tackle it though.
Contributor
Author
There was a problem hiding this comment. This is now fixed by using https://github.com/joyent/triton-docker-cli, though the code here hasn't been updated. |
||
| dockerLocal := docker | ||
| #composeLocal := DOCKER_HOST= DOCKER_TLS_VERIFY= DOCKER_CERT_PATH= docker-compose | ||
| composeLocal := docker-compose | ||
|
|
||
| ## Display this help message | ||
| help: | ||
| @awk '/^##.*$$/,/[a-zA-Z_-]+:/' $(MAKEFILE_LIST) | awk '!(NR%2){print $$0p}{p=$$0}' | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' | sort | ||
|
|
||
|
|
||
| # ------------------------------------------------ | ||
| # Container builds | ||
|
|
||
| ## Builds the application container image locally | ||
| build: test-runner | ||
| $(dockerLocal) build -t=$(image):$(tag) . | ||
|
|
||
| ## Build the test running container | ||
| test-runner: | ||
| $(dockerLocal) build -f test/Dockerfile -t=$(testImage):$(tag) . | ||
|
|
||
| ## Push the current application container images to the Docker Hub | ||
| push: | ||
| $(dockerLocal) push $(image):$(tag) | ||
| $(dockerLocal) push $(testImage):$(tag) | ||
|
|
||
| ## Tag the current images as 'latest' | ||
| tag: | ||
| $(dockerLocal) tag $(testImage):$(tag) $(testImage):latest | ||
| $(dockerLocal) tag $(image):$(tag) $(image):latest | ||
|
|
||
| ## Push latest tag(s) to the Docker Hub | ||
| ship: tag | ||
| $(dockerLocal) push $(image):$(tag) | ||
| $(dockerLocal) push $(image):latest | ||
|
|
||
|
|
||
| # ------------------------------------------------ | ||
| # Test running | ||
|
|
||
| ## Pull the container images from the Docker Hub | ||
| pull: | ||
| $(dockerLocal) pull $(image):$(tag) | ||
| $(dockerLocal) pull $(testImage):$(tag) | ||
|
|
||
| $(DOCKER_CERT_PATH)/key.pub: | ||
| ssh-keygen -y -f $(DOCKER_CERT_PATH)/key.pem > $(DOCKER_CERT_PATH)/key.pub | ||
|
|
||
| # For Jenkins test runner only: make sure we have public keys available | ||
| SDC_KEYS_VOL ?= -v $(DOCKER_CERT_PATH):$(DOCKER_CERT_PATH) | ||
| keys: $(DOCKER_CERT_PATH)/key.pub | ||
|
|
||
| run-local: | ||
| cd examples/compose && TAG=$(tag) $(composeLocal) -p prometheus up -d | ||
|
|
||
| stop-local: | ||
| cd examples/compose && TAG=$(tag) $(composeLocal) -p prometheus stop || true | ||
| cd examples/compose && TAG=$(tag) $(composeLocal) -p prometheus rm -f || true | ||
|
|
||
| run: | ||
| $(call check_var, TRITON_PROFILE \ | ||
| required to run the example on Triton.) | ||
| cd examples/triton && TAG=$(tag) docker-compose -p prometheus up -d | ||
|
|
||
| stop: | ||
| $(call check_var, TRITON_PROFILE \ | ||
| required to run the example on Triton.) | ||
| cd examples/compose && TAG=$(tag) docker-compose -p prometheus stop || true | ||
| cd examples/compose && TAG=$(tag) docker-compose -p prometheus rm -f || true | ||
|
|
||
| test-image: | ||
| $(dockerLocal) build -f test/Dockerfile . | ||
|
|
||
| run-test-image-local: | ||
| $(dockerLocal) run -it --rm \ | ||
| -v /var/run/docker.sock:/var/run/docker.sock \ | ||
| -e TAG=$(tag) \ | ||
| -e COMPOSE_FILE=compose/docker-compose.yml \ | ||
| -e COMPOSE_HTTP_TIMEOUT=300 \ | ||
| -w /src \ | ||
| `docker build -f test/Dockerfile . | tail -n 1 | awk '{print $$3}'` \ | ||
| sh | ||
|
|
||
| run-test-image: | ||
| $(call check_var, TRITON_ACCOUNT TRITON_DC, \ | ||
| required to run integration tests on Triton.) | ||
| $(dockerLocal) run -it --rm \ | ||
| -e TAG=$(tag) \ | ||
| -e COMPOSE_FILE=triton/docker-compose.yml \ | ||
| -e COMPOSE_HTTP_TIMEOUT=300 \ | ||
| -e DOCKER_HOST=$(DOCKER_HOST) \ | ||
| -e DOCKER_TLS_VERIFY=1 \ | ||
| -e DOCKER_CERT_PATH=$(DOCKER_CERT_PATH) \ | ||
| -e TRITON_ACCOUNT=$(TRITON_ACCOUNT) \ | ||
| -e TRITON_DC=$(TRITON_DC) \ | ||
| $(SDC_KEYS_VOL) -w /src \ | ||
| $(testImage):$(tag) sh | ||
|
|
||
| ## Run integration tests against local Docker daemon | ||
| test-local: | ||
| $(dockerLocal) run -it --rm \ | ||
| -v /var/run/docker.sock:/var/run/docker.sock \ | ||
| -e TAG=$(tag) \ | ||
| -e COMPOSE_FILE=compose/docker-compose.yml \ | ||
| -e COMPOSE_HTTP_TIMEOUT=300 \ | ||
| -w /src \ | ||
| `docker build -f test/Dockerfile . | tail -n 1 | awk '{print $$3}'` \ | ||
| python3 tests.py | ||
|
|
||
| ## Run the integration test runner locally but target Triton | ||
| test: | ||
| $(call check_var, TRITON_ACCOUNT TRITON_DC, \ | ||
| required to run integration tests on Triton.) | ||
| $(dockerLocal) run --rm \ | ||
| -e TAG=$(tag) \ | ||
| -e COMPOSE_FILE=triton/docker-compose.yml \ | ||
| -e COMPOSE_HTTP_TIMEOUT=300 \ | ||
| -e DOCKER_HOST=$(DOCKER_HOST) \ | ||
| -e DOCKER_TLS_VERIFY=1 \ | ||
| -e DOCKER_CERT_PATH=$(DOCKER_CERT_PATH) \ | ||
| -e TRITON_ACCOUNT=$(TRITON_ACCOUNT) \ | ||
| -e TRITON_DC=$(TRITON_DC) \ | ||
| $(SDC_KEYS_VOL) -w /src \ | ||
| $(testImage):$(tag) sh tests.sh | ||
|
|
||
| ## Print environment for build debugging | ||
| debug: | ||
| @echo WORKSPACE=$(WORKSPACE) | ||
| @echo GIT_COMMIT=$(GIT_COMMIT) | ||
| @echo GIT_BRANCH=$(GIT_BRANCH) | ||
| @echo namespace=$(namespace) | ||
| @echo tag=$(tag) | ||
| @echo image=$(image) | ||
| @echo testImage=$(testImage) | ||
|
|
||
| # ------------------------------------------------------- | ||
| # helper functions for testing if variables are defined | ||
| # | ||
| check_var = $(foreach 1,$1,$(__check_var)) | ||
| __check_var = $(if $(value $1),,\ | ||
| $(error Missing $1 $(if $(value 2),$(strip $2)))) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Do we have env vars for Triton discovery? | ||
| # Copy creds from env vars to files on disk | ||
| if [ -n ${!TRITON_CREDS_PATH} ] \ | ||
| && [ -n ${!TRITON_CA} ] \ | ||
| && [ -n ${!TRITON_CERT} ] \ | ||
| && [ -n ${!TRITON_KEY} ] | ||
| then | ||
| mkdir -p ${TRITON_CREDS_PATH} | ||
| echo -e "${TRITON_CA}" | tr '#' '\n' > ${TRITON_CREDS_PATH}/ca.pem | ||
| echo -e "${TRITON_CERT}" | tr '#' '\n' > ${TRITON_CREDS_PATH}/cert.pem | ||
| echo -e "${TRITON_KEY}" | tr '#' '\n' > ${TRITON_CREDS_PATH}/key.pem | ||
| fi | ||
|
|
||
| # Are we on Triton? Do we _not_ have a user-defined DC? | ||
| # Set the DC automatically from mdata | ||
| if [ -n ${TRITON_DC} ] \ | ||
|
|
||
| && [ -f "/native/usr/sbin/mdata-get" ] | ||
| then | ||
| export TRITON_DC=$(/native/usr/sbin/mdata-get sdc:datacenter_name) | ||
| fi | ||
|
|
||
| # Create Prometheus config | ||
| consul-template -once -consul-addr ${CONSUL}:8500 -template /etc/prometheus/prometheus.yml.ctmpl:/etc/prometheus/prometheus.yml | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,26 @@ | ||
| { | ||
| "consul": "{{ .CONSUL }}:8500", | ||
| "preStart": "prestart.sh", | ||
| "services": [ | ||
| { | ||
| "name": "prometheus", | ||
| "port": 9090, | ||
| "health": ["curl", "-fso", "/dev/null", "http://localhost:9090/metrics"], | ||
|
Contributor
Author
There was a problem hiding this comment. We expect if the request fails that |
||
| "poll": 10, | ||
| "ttl": 25 | ||
| } | ||
| ], | ||
| "coprocesses": [{{ if .CONSUL_AGENT }} | ||
|
|
||
| { | ||
| "name": "consul-agent (host:{{ .CONSUL }})", | ||
| "command": ["/usr/local/bin/consul", "agent", | ||
| "-data-dir=/var/lib/consul", | ||
| "-config-dir=/etc/consul", | ||
|
Contributor
Author
There was a problem hiding this comment. The alignment of these two dirs with the dirs created in the Dockerfile is frustratingly important. |
||
| "-rejoin", | ||
| "-retry-join", "{{ .CONSUL }}", | ||
| "-retry-max", "10", | ||
| "-retry-interval", "10s"], | ||
| "restarts": "unlimited" | ||
| }{{ end }} | ||
| ] | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It turns out the
-ntest in theprestart.shis bash-specific. Of all the choices I had to fix it, I decided to add bash.