From 050ad144190920418de7ff4c3b43f1578a19cfd1 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Fri, 13 Dec 2024 22:04:46 -0500 Subject: [PATCH 1/5] rename flagdui to flagd-ui --- .env | 2 +- .github/workflows/component-build-images.yml | 2 +- docker-compose.yml | 10 +++++----- src/flagd/demo.flagd.json | 12 ++++++------ src/frontendproxy/envoy.tmpl.yaml | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.env b/.env index 844e885c5a..8b5348a101 100644 --- a/.env +++ b/.env @@ -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 diff --git a/.github/workflows/component-build-images.yml b/.github/workflows/component-build-images.yml index 7514267b83..fd9da4ca6e 100644 --- a/.github/workflows/component-build-images.yml +++ b/.github/workflows/component-build-images.yml @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index 984d4c8858..4bee9694c6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -358,7 +358,7 @@ services: condition: service_started grafana: condition: service_started - flagdui: + flagd-ui: condition: service_started # Imageprovider @@ -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} @@ -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: diff --git a/src/flagd/demo.flagd.json b/src/flagd/demo.flagd.json index 6af1dd51a7..9cedc927af 100644 --- a/src/flagd/demo.flagd.json +++ b/src/flagd/demo.flagd.json @@ -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", @@ -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" }, @@ -107,4 +107,4 @@ "defaultVariant": "off" } } -} +} \ No newline at end of file diff --git a/src/frontendproxy/envoy.tmpl.yaml b/src/frontendproxy/envoy.tmpl.yaml index 559ad53f3b..9666396818 100644 --- a/src/frontendproxy/envoy.tmpl.yaml +++ b/src/frontendproxy/envoy.tmpl.yaml @@ -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: @@ -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: From 523054121782cd3fd8ea4a1ea5be280935f44a06 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Fri, 13 Dec 2024 22:06:45 -0500 Subject: [PATCH 2/5] rename flagdui to flagd-ui --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d23ee07c0f..c07a218ea9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,8 @@ 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)) +* [flagd-ui] rename flagdui to flagd-ui + ([#1840](https://github.com/open-telemetry/opentelemetry-demo/pull/1840)) ## 1.12.0 From 64ad4db4328755468b1434e6f3391958de3e0b54 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Wed, 18 Dec 2024 22:50:39 -0500 Subject: [PATCH 3/5] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b5db981f4..c6b16a073b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,7 +41,6 @@ the release. * [flagd-ui] rename flagdui to flagd-ui ([#1840](https://github.com/open-telemetry/opentelemetry-demo/pull/1840)) - ## 1.12.0 * [accountingservice] allow running the container with non root user From 786bd32f632860779b3de9fd9830098a289239f0 Mon Sep 17 00:00:00 2001 From: Juliano Costa Date: Thu, 19 Dec 2024 10:22:19 +0100 Subject: [PATCH 4/5] Add line break --- src/flagd/demo.flagd.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/flagd/demo.flagd.json b/src/flagd/demo.flagd.json index bc1f6e2897..3c55a93ef0 100644 --- a/src/flagd/demo.flagd.json +++ b/src/flagd/demo.flagd.json @@ -107,4 +107,4 @@ "defaultVariant": "off" } } -} \ No newline at end of file +} From 4b530cc158044ce2ef98679dda02c9a877dff75e Mon Sep 17 00:00:00 2001 From: Juliano Costa Date: Thu, 19 Dec 2024 10:52:34 +0100 Subject: [PATCH 5/5] Rename ad test folder --- test/tracetesting/{adservice => ad}/all.yaml | 0 test/tracetesting/{adservice => ad}/get.yaml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename test/tracetesting/{adservice => ad}/all.yaml (100%) rename test/tracetesting/{adservice => ad}/get.yaml (100%) diff --git a/test/tracetesting/adservice/all.yaml b/test/tracetesting/ad/all.yaml similarity index 100% rename from test/tracetesting/adservice/all.yaml rename to test/tracetesting/ad/all.yaml diff --git a/test/tracetesting/adservice/get.yaml b/test/tracetesting/ad/get.yaml similarity index 100% rename from test/tracetesting/adservice/get.yaml rename to test/tracetesting/ad/get.yaml