Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jaeger: use ops node label constraint #823

Merged
merged 1 commit into from
Sep 25, 2024
Merged

jaeger: use ops node label constraint #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions services/jaeger/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,14 @@ up-letsencrypt-dns: .init .env ${TEMP_COMPOSE}-letsencrypt-dns
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-letsencrypt-dns ${STACK_NAME}

.PHONY: up-dalco ## Deploys jaeger stack for Dalco Cluster
up-dalco: .init .env ${TEMP_COMPOSE}-dalco
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-dalco ${STACK_NAME}
up-dalco: up

.PHONY: up-aws ## Deploys jaeger stack for aws
up-aws: .init .env ${TEMP_COMPOSE}-aws ## Deploys jaeger stack in aws
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-aws ${STACK_NAME}

.PHONY: up-master ## Deploys jaeger stack for master Cluster
up-master: .init .env ${TEMP_COMPOSE}-master
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-master ${STACK_NAME}
up-master: up

.PHONY: up-public ## Deploys jaeger stack for public acess deploy
up-public: up-dalco
Expand All @@ -55,14 +53,6 @@ ${TEMP_COMPOSE}-letsencrypt-http: docker-compose.yml docker-compose.letsencrypt.
${TEMP_COMPOSE}-letsencrypt-dns: docker-compose.yml docker-compose.letsencrypt.dns.yml
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash $< docker-compose.letsencrypt.dns.yml > $@

.PHONY: ${TEMP_COMPOSE}-dalco
${TEMP_COMPOSE}-dalco: docker-compose.yml docker-compose.dalco.yml
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash $< docker-compose.dalco.yml > $@

.PHONY: ${TEMP_COMPOSE}-master
${TEMP_COMPOSE}-master: docker-compose.yml docker-compose.master.yml
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash $< docker-compose.master.yml > $@

.PHONY: ${TEMP_COMPOSE}-aws
${TEMP_COMPOSE}-aws: docker-compose.yml docker-compose.aws.yml
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash $< docker-compose.aws.yml > $@
4 changes: 0 additions & 4 deletions services/jaeger/docker-compose.aws.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,3 @@ services:
jaeger:
dns: # Add this always for AWS, otherwise we get "No such image: " for docker services
8.8.8.8
deploy:
placement:
constraints:
- node.labels.jaeger==true
7 changes: 0 additions & 7 deletions services/jaeger/docker-compose.dalco.yml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions services/jaeger/docker-compose.master.yml
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions services/jaeger/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ services:
environment:
MEMORY_MAX_TRACES: 10000
deploy:
placement:
constraints:
- node.labels.ops==true
labels:
- traefik.enable=true
- traefik.docker.network=${PUBLIC_NETWORK}
Expand All @@ -39,6 +42,10 @@ services:
hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
command:
- "--config=/etc/otel/config.yaml"
deploy:
placement:
constraints:
- node.labels.ops==true
ports:
- "4318:4318" # OTLP HTTP receiver
networks:
Expand Down
Loading