Skip to content

Commit

Permalink
[flagd-ui]: rename flagdui to flagd-ui (#1840)
Browse files Browse the repository at this point in the history
* rename flagdui to flagd-ui

* rename flagdui to flagd-ui

* Update CHANGELOG.md

* Add line break

* Rename ad test folder

---------

Co-authored-by: Juliano Costa <julianocosta89@outlook.com>
Co-authored-by: Juliano Costa <juliano.costa@datadoghq.com>
  • Loading branch information
3 people authored Dec 19, 2024
1 parent d6efe7f commit a0897a6
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ FLAGD_HOST=flagd
FLAGD_PORT=8013

# Flagd UI
FLAGD_UI_HOST=flagdui
FLAGD_UI_HOST=flagd-ui
FLAGD_UI_PORT=4000
FLAGD_UI_DOCKERFILE=./src/flagd-ui/Dockerfile

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/component-build-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
context: ./
setup-qemu: true
- file: ./src/flagd-ui/Dockerfile
tag_suffix: flagdui
tag_suffix: flagd-ui
context: ./
setup-qemu: true
- file: ./test/tracetesting/Dockerfile
Expand Down
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,16 @@ the release.
([#1827](https://github.com/open-telemetry/opentelemetry-demo/pull/1827))
* [cartservice] - Add Exemplars to Cart Service
([#1830](https://github.com/open-telemetry/opentelemetry-demo/pull/1830))
* [ad] rename adservice to ad
([#1832](https://github.com/open-telemetry/opentelemetry-demo/pull/1832))
* [grafana] Add Exemplars Dashboard
([#1836](https://github.com/open-telemetry/opentelemetry-demo/pull/1836))
* [quote] rename quoteservice to quote
([#1838](https://github.com/open-telemetry/opentelemetry-demo/pull/1838))
* [flagd-ui] rename flagdui to flagd-ui
([#1840](https://github.com/open-telemetry/opentelemetry-demo/pull/1840))
* [otel-collector] rename otelcol to otel-collector
([#1841](https://github.com/open-telemetry/opentelemetry-demo/pull/1841))
* [ad] rename adservice to ad
([#1827](https://github.com/open-telemetry/opentelemetry-demo/pull/1832))

## 1.12.0

Expand Down
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ services:
condition: service_started
grafana:
condition: service_started
flagdui:
flagd-ui:
condition: service_started

# Imageprovider
Expand Down Expand Up @@ -609,9 +609,9 @@ services:
*logging

# Flagd UI for configuring the feature flag service
flagdui:
image: ${IMAGE_NAME}:${DEMO_VERSION}-flagdui
container_name: flagdui
flagd-ui:
image: ${IMAGE_NAME}:${DEMO_VERSION}-flagd-ui
container_name: flagd-ui
build:
context: ./
dockerfile: ${FLAGD_UI_DOCKERFILE}
Expand All @@ -624,7 +624,7 @@ services:
- OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
- OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
- OTEL_RESOURCE_ATTRIBUTES
- OTEL_SERVICE_NAME=flagdui
- OTEL_SERVICE_NAME=flagd-ui
ports:
- "${FLAGD_UI_PORT}"
depends_on:
Expand Down
10 changes: 5 additions & 5 deletions src/flagd/demo.flagd.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"on": true,
"off": false
},
"defaultVariant": "off"
"defaultVariant": "on"
},
"kafkaQueueProblems": {
"description": "Overloads Kafka queue while simultaneously introducing a consumer side delay leading to a lag spike",
Expand All @@ -68,13 +68,13 @@
"description": "Fail payment service charge requests n%",
"state": "ENABLED",
"variants": {
"100%": 1.00,
"100%": 1,
"90%": 0.95,
"75%": 0.75,
"50%": 0.50,
"50%": 0.5,
"25%": 0.25,
"10%": 0.10,
"off": 0.00
"10%": 0.1,
"off": 0
},
"defaultVariant": "off"
},
Expand Down
6 changes: 3 additions & 3 deletions src/frontendproxy/envoy.tmpl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ static_resources:
- match: { prefix: "/flagservice/" }
route: { cluster: flagservice, prefix_rewrite: "/", timeout: 0s }
- match: { prefix: "/feature" }
route: { cluster: flagdui }
route: { cluster: flagd-ui }
- match: { prefix: "/" }
route: { cluster: frontend }
http_filters:
Expand Down Expand Up @@ -224,11 +224,11 @@ static_resources:
socket_address:
address: ${FLAGD_HOST}
port_value: ${FLAGD_PORT}
- name: flagdui
- name: flagd-ui
type: STRICT_DNS
lb_policy: ROUND_ROBIN
load_assignment:
cluster_name: flagdui
cluster_name: flagd-ui
endpoints:
- lb_endpoints:
- endpoint:
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit a0897a6

Please sign in to comment.