Skip to content

Commit

Permalink
Decouple monitoring from dev deployment
Browse files Browse the repository at this point in the history
  • Loading branch information
pvannierop committed Jan 22, 2025
1 parent 9f8b7fa commit 43f186f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ jobs:
helmfile_mods+='\ \ \ \ \ \ - ../.github/ci_config/secrets.yaml.gotmpl'
sed -i "/secrets.yaml/a $helmfile_mods" environments.yaml
sed -i '/_install: /s/false/true/' etc/production.yaml
# Deploy a minimal deployment accessible on 'localhost:80' with monitoring enabled
sed -i '/enable_logging_monitoring: /s/false/true/' etc/production.yaml
sed -i '/dev_deployment: /s/false/true/' etc/production.yaml
sed -i '/e2e_test: /s/false/true/' etc/production.yaml
test-helmfile-template:
Expand Down Expand Up @@ -99,9 +101,7 @@ jobs:
- name: Run end-to-end tests
run: |
cd test/features
behave -D secrets_file=$GITHUB_WORKSPACE/etc/secrets.yaml -D url=https://example.com
# Enable tmate debugging of manually-triggered workflows if the input option was provided
behave -D secrets_file=$GITHUB_WORKSPACE/etc/secrets.yaml -D url=http://localhost:80 # Enable tmate debugging of manually-triggered workflows if the input option was provided
- name: Manually triggered tmate session
uses: mxschmitt/action-tmate@v3
if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
Expand Down
1 change: 0 additions & 1 deletion environments.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ environments:
{{ end }}
{{ if .Values.dev_deployment }}
- ../mods/disable_tls.yaml
- ../mods/disable_monitoring_logging.yaml
- ../mods/localdev.yaml
- ../mods/minimal.yaml
- ../mods/minimal_kafka.yaml.gotmpl
Expand Down
3 changes: 2 additions & 1 deletion etc/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ enable_logging_monitoring: false
# Can be disabled when TLS termination is handled upstream of the on-cluster Nginx reverse proxy.
enable_tls: true

# Minimal deployment for development (disables TLS, monitoring and logging, sets kafka and minio brokers to 1).
# Minimal deployment for development (disables TLS, sets kafka and minio brokers to 1 and uses minimal RAM footprint).
dev_deployment: false
# E2e test deployment (applies very fast application loop timings for tests).
e2e_test: false

# --------------------------------------------------------- 00-init.yaml ---------------------------------------------------------
Expand Down

0 comments on commit 43f186f

Please sign in to comment.