Skip to content

Refactor ops-traefik #1

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

Closed
wants to merge 20 commits into from
Closed

Refactor ops-traefik #1

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2249efc
Refactor ops-traefik - Remove custom docker compose overwrites, add c…
mrnicegyu11 May 12, 2025
df6482b
remove ununsed env-vars
mrnicegyu11 May 12, 2025
a35cea8
rename log-level env-vars
mrnicegyu11 May 12, 2025
fb5b138
Merge remote-tracking branch 'upstream/main' into 2025/refactor/traefik
mrnicegyu11 May 13, 2025
5234228
only bind ports when needed
mrnicegyu11 May 13, 2025
70c8908
Add env_file back to traefik compose spec
mrnicegyu11 May 13, 2025
1cf605d
Merge remote-tracking branch 'upstream/main' into 2025/add/fluentd
mrnicegyu11 May 14, 2025
bcc67d4
wip
mrnicegyu11 May 14, 2025
4fa4f26
Merge remote-tracking branch 'upstream/main' into 2025/refactor/traefik
mrnicegyu11 May 20, 2025
858c82d
Merge remote-tracking branch 'upstream/main' into 2025/refactor/traefik
mrnicegyu11 May 21, 2025
57947e3
Merge remote-tracking branch 'upstream/main' into 2025/add/fluentd
mrnicegyu11 May 21, 2025
88e4ed5
Merge remote-tracking branch 'upstream/main' into 2025/add/fluentd
mrnicegyu11 May 28, 2025
1eba82c
Merge branch '2025/add/fluentd' into 2025/refactor/traefik
mrnicegyu11 May 28, 2025
236dda9
Merge branch '2025/add/traefikOpenTelemetry' into 2025/refactor/traefik
mrnicegyu11 Jul 3, 2025
de1e17e
Kubernetes: add local storage (#1100)
YuryHrytsuk Jul 3, 2025
87875e0
Merge branch '2025/add/traefikOpenTelemetry' into 2025/refactor/traefik
mrnicegyu11 Jul 3, 2025
b0f1710
Fix deploy_ops CD step - monitoring
mrnicegyu11 Jul 4, 2025
1970766
Merge remote-tracking branch 'upstream/main' into 2025/refactor/traefik
mrnicegyu11 Jul 4, 2025
221c930
wip
mrnicegyu11 Jul 8, 2025
0969ffe
wip
mrnicegyu11 Jul 8, 2025
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
36 changes: 8 additions & 28 deletions services/traefik/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,53 +56,33 @@ ${TEMP_COMPOSE}-local: docker-compose.yml docker-compose.local.yml .env
set +o allexport; \
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.local.yml > $@

.PHONY: ${TEMP_COMPOSE}-letsencrypt-http
${TEMP_COMPOSE}-letsencrypt-http: docker-compose.yml docker-compose.letsencrypt.http.yml .env
@set -o allexport; \
source .env; \
set +o allexport; \
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.letsencrypt.http.yml > $@

.PHONY: ${TEMP_COMPOSE}-letsencrypt-dns
${TEMP_COMPOSE}-letsencrypt-dns: docker-compose.yml docker-compose.letsencrypt.dns.yml .env
@set -o allexport; \
source .env; \
set +o allexport; \
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.letsencrypt.dns.yml > $@

.PHONY: ${TEMP_COMPOSE}-aws
${TEMP_COMPOSE}-aws: docker-compose.yml docker-compose.aws.yml .env
${TEMP_COMPOSE}-aws: docker-compose.yml .env
@set -o allexport; \
source .env; \
set +o allexport; \
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.aws.yml > $@
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< > $@

.PHONY: ${TEMP_COMPOSE}-dalco
${TEMP_COMPOSE}-dalco: docker-compose.yml docker-compose.dalco.yml .env
${TEMP_COMPOSE}-dalco: docker-compose.yml .env
@set -o allexport; \
source .env; \
set +o allexport; \
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.dalco.yml > $@
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< > $@

.PHONY: ${TEMP_COMPOSE}-public
${TEMP_COMPOSE}-public: docker-compose.yml docker-compose.public.yml .env
${TEMP_COMPOSE}-public: docker-compose.yml .env
@set -o allexport; \
source .env; \
set +o allexport; \
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.public.yml > $@
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< > $@

.PHONY: ${TEMP_COMPOSE}-master
${TEMP_COMPOSE}-master: docker-compose.yml docker-compose.master.yml .env
${TEMP_COMPOSE}-master: docker-compose.yml .env
@set -o allexport; \
source .env; \
set +o allexport; \
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.master.yml > $@

.PHONY: docker-compose.letsencrypt.dns.yml
docker-compose.letsencrypt.dns.yml: .venv .env
@$(call jinja, docker-compose.letsencrypt.dns.yml.j2, .env, docker-compose.letsencrypt.dns.yml.unlinted) && \
$(_yq) docker-compose.letsencrypt.dns.yml.unlinted > docker-compose.letsencrypt.dns.yml; \
rm docker-compose.letsencrypt.dns.yml.unlinted >/dev/null 2>&1;
${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< > $@

.PHONY: docker-compose.yml
docker-compose.yml: traefik_dynamic_config.yml .venv .env
Expand Down
54 changes: 0 additions & 54 deletions services/traefik/docker-compose.aws.yml
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions services/traefik/docker-compose.dalco.yml
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions services/traefik/docker-compose.letsencrypt.dns.yml.j2
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions services/traefik/docker-compose.letsencrypt.http.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion services/traefik/docker-compose.local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
- "/customEntrypoint.sh"
- "--api=true"
- "--api.dashboard=true"
- "--log.level=${OPS_TRAEFIK_LOGLEVEL}"
- "--log.level=${TRAEFIK_LOG_LEVEL}"
Copy link
Collaborator

@YuryHrytsuk YuryHrytsuk May 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Q: why removing the prefix? Since we have 2 traefiks, it makes sense, oder?

Copy link
Owner Author

@mrnicegyu11 mrnicegyu11 May 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will revert, yes

- "--accesslog=true"
- "--accesslog.format=json"
- "--accesslog.fields.defaultmode=keep"
Expand Down
41 changes: 0 additions & 41 deletions services/traefik/docker-compose.master.yml
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions services/traefik/docker-compose.public.yml
View file
Open in desktop

This file was deleted.

Loading