Merge remote-tracking branch 'upstream/main'

elastic · Aug 30, 2024 · 4c24904 · 4c24904
2 parents e1ade33 + 076afc4
commit 4c24904
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.env b/.env
@@ -7,7 +7,7 @@ DEMO_VERSION=latest
 
 # Dependent images
 COLLECTOR_CONTRIB_IMAGE=otel/opentelemetry-collector-contrib:0.105.0
-FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.11.1
+FLAGD_IMAGE=ghcr.io/open-feature/flagd:v0.11.2
 GRAFANA_IMAGE=grafana/grafana:11.1.1
 JAEGERTRACING_IMAGE=jaegertracing/all-in-one:1.59
 # must also update version field in ./src/grafana/provisioning/datasources/opensearch.yaml

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -579,6 +579,7 @@ services:
       resources:
         limits:
           memory: 50M
+    restart: unless-stopped
     environment:
       - FLAGD_OTEL_COLLECTOR_URI=${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_GRPC}
       - FLAGD_METRICS_EXPORTER=otel

diff --git a/kubernetes/opentelemetry-demo.yaml b/kubernetes/opentelemetry-demo.yaml
@@ -9910,7 +9910,7 @@ spec:
       serviceAccountName: opentelemetry-demo
       containers:
         - name: flagd
-          image: 'ghcr.io/open-feature/flagd:v0.11.1'
+          image: 'ghcr.io/open-feature/flagd:v0.11.2'
           imagePullPolicy: IfNotPresent
           command:
           - /flagd-build