From a509cb3da6ce43962013af6386874947bc8cd646 Mon Sep 17 00:00:00 2001
From: Josh Lee <josh@joshuamlee.com>
Date: Fri, 26 Aug 2022 22:50:02 -0400
Subject: [PATCH 1/2] Rename environment variables for featureflag service to
 match what is expected in the service

---
 charts/opentelemetry-demo/values.yaml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml
index 2d23a75c8..1879192a6 100644
--- a/charts/opentelemetry-demo/values.yaml
+++ b/charts/opentelemetry-demo/values.yaml
@@ -93,10 +93,12 @@ components:
     # If a different url is desired, set DATABASE_URL here.
     # - name: DATABASE_URL
     #   value:
-    - name: GRPC_PORT
-      value: '50053'
-    - name: PORT
+    - name: FEATURE_FLAG_GRPC_SERVICE_PORT
       value: '50052'
+    - name: FEATURE_FLAG_SERVICE_PORT
+      value: '50053'
+    - name: SECRET_KEY_BASE
+      value: 'Vive++6s/oRCd7xI3zSvyUGH1AJQS0BE3xjNrEOJEVmzOg5qPBlTYE+5kgz2cfBE'
     ports:
     - name: grpc
       value: 50052

From 76e6d363c250918176cc5d4191db6aaefc83fb0a Mon Sep 17 00:00:00 2001
From: Josh Lee <josh@joshuamlee.com>
Date: Sun, 28 Aug 2022 16:41:51 -0400
Subject: [PATCH 2/2] Use default service port for featureflagservice grpc

---
 charts/opentelemetry-demo/Chart.yaml         |  2 +-
 charts/opentelemetry-demo/templates/_pod.tpl |  2 +-
 charts/opentelemetry-demo/values.yaml        | 10 ++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml
index 7f2b8e252..91e18f0d5 100644
--- a/charts/opentelemetry-demo/Chart.yaml
+++ b/charts/opentelemetry-demo/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 type: application
 name: opentelemetry-demo
-version: 0.2.1
+version: 0.2.2
 description: opentelemetry demo helm chart
 home: https://opentelemetry.io/
 sources:
diff --git a/charts/opentelemetry-demo/templates/_pod.tpl b/charts/opentelemetry-demo/templates/_pod.tpl
index eb2490c0e..765d942b6 100644
--- a/charts/opentelemetry-demo/templates/_pod.tpl
+++ b/charts/opentelemetry-demo/templates/_pod.tpl
@@ -91,7 +91,7 @@ Get Pod Env
 
 {{- if eq .name "product-catalog-service" }}
 - name: FEATURE_FLAG_GRPC_SERVICE_ADDR
-  value: {{ (printf "%s-featureflag-service:%0.f" $prefix .servicePort ) }}
+  value: {{ (printf "%s-featureflag-service:50031" $prefix ) }}
 {{- end }}
 
 # {{ $.depends }}
diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml
index 1879192a6..5331674f0 100644
--- a/charts/opentelemetry-demo/values.yaml
+++ b/charts/opentelemetry-demo/values.yaml
@@ -94,16 +94,14 @@ components:
     # - name: DATABASE_URL
     #   value:
     - name: FEATURE_FLAG_GRPC_SERVICE_PORT
-      value: '50052'
-    - name: FEATURE_FLAG_SERVICE_PORT
       value: '50053'
-    - name: SECRET_KEY_BASE
-      value: 'Vive++6s/oRCd7xI3zSvyUGH1AJQS0BE3xjNrEOJEVmzOg5qPBlTYE+5kgz2cfBE'
+    - name: FEATURE_FLAG_SERVICE_PORT
+      value: '8081'
     ports:
     - name: grpc
-      value: 50052
-    - name: http
       value: 50053
+    - name: http
+      value: 8081
     podAnnotations: {}
     #  instrumentation.opentelemetry.io/inject-sdk: "true"