summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2025-05-08 14:32:00 -0600
committermo khan <mo@mokhan.ca>2025-05-08 14:32:04 -0600
commitc2622c836d1e35ff382e6ff3a55a8d4f06bc3afb (patch)
tree920a655a0e82c4b632dc547e951840467233def5
parente22f354f657000105ca73ca03d412ac141831182 (diff)
chore: format yaml config
-rw-r--r--.gitlab-ci.yml7
-rw-r--r--envoy.yml80
2 files changed, 40 insertions, 47 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa3aeb4..3769622 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,10 +4,8 @@ stages:
- validate
- runway_staging
- runway_production
-
variables:
CONTAINER_IMAGE_COMMIT: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
-
include:
- project: 'gitlab-com/gl-infra/platform/runway/runwayctl'
file: 'ci-tasks/service-project/runway.yml'
@@ -19,7 +17,6 @@ include:
image: "$CONTAINER_IMAGE_COMMIT"
runway_version: v3.61.5
validate_stage: test
-
build image:
image: docker:28
interruptible: true
@@ -31,13 +28,11 @@ build image:
script:
- docker build --tag $CONTAINER_IMAGE_COMMIT .
- docker push $CONTAINER_IMAGE_COMMIT
-
unit:
image: golang:alpine
stage: test
script:
- go test ./...
-
integration:
image: golang:1.24.0
stage: test
@@ -49,7 +44,7 @@ integration:
- apt-get update && apt-get install -y docker.io
- echo "$CI_JOB_TOKEN" | docker login -u gitlab-ci-token --password-stdin "$CI_REGISTRY"
script:
- - go test -tags=integration ./test/integration/...
+ - go test -tags=integration ./test/integration/...
variables:
# Variables required by github.com/testcontainers/testcontainers-go
# ref https://golang.testcontainers.org/system_requirements/ci/gitlab_ci/#example-using-dind-docker-in-docker
diff --git a/envoy.yml b/envoy.yml
index 50618db..323b2ba 100644
--- a/envoy.yml
+++ b/envoy.yml
@@ -1,47 +1,45 @@
admin:
access_log_path: /tmp/admin_access.log
address:
- socket_address: { address: 0.0.0.0, port_value: 9901 }
-
+ socket_address: {address: 0.0.0.0, port_value: 9901}
static_resources:
listeners:
- - name: listener_0
- address:
- socket_address: { address: 0.0.0.0, port_value: 10000 }
- filter_chains:
- - filters:
- - name: envoy.filters.network.http_connection_manager
- typed_config:
- "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
- stat_prefix: ingress_http
- access_log:
- - name: envoy.access_loggers.stdout
- typed_config:
- "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog
- route_config:
- name: local_route
- virtual_hosts:
- - name: local_service
- domains: ["*"]
- routes:
- - match: { prefix: "/" }
- route: { cluster: sparkle }
- http_filters:
- - name: envoy.filters.http.router
- typed_config:
- "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
-
+ - name: listener_0
+ address:
+ socket_address: {address: 0.0.0.0, port_value: 10000}
+ filter_chains:
+ - filters:
+ - name: envoy.filters.network.http_connection_manager
+ typed_config:
+ "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
+ stat_prefix: ingress_http
+ access_log:
+ - name: envoy.access_loggers.stdout
+ typed_config:
+ "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog
+ route_config:
+ name: local_route
+ virtual_hosts:
+ - name: local_service
+ domains: ["*"]
+ routes:
+ - match: {prefix: "/"}
+ route: {cluster: sparkle}
+ http_filters:
+ - name: envoy.filters.http.router
+ typed_config:
+ "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
clusters:
- - name: sparkle
- connect_timeout: 0.25s
- type: STRICT_DNS
- lb_policy: ROUND_ROBIN
- load_assignment:
- cluster_name: sparkle
- endpoints:
- - lb_endpoints:
- - endpoint:
- address:
- socket_address:
- address: localhost
- port_value: 8080
+ - name: sparkle
+ connect_timeout: 0.25s
+ type: STRICT_DNS
+ lb_policy: ROUND_ROBIN
+ load_assignment:
+ cluster_name: sparkle
+ endpoints:
+ - lb_endpoints:
+ - endpoint:
+ address:
+ socket_address:
+ address: localhost
+ port_value: 8080