From 0b8f0cf50399ffad4eee24ee0ba9e2c2b8db9876 Mon Sep 17 00:00:00 2001
From: Ty Bekiares <tyrone.bekiares@elastic.co>
Date: Mon, 21 Nov 2022 20:25:08 -0600
Subject: [PATCH] v1.1.0

---
 charts/opentelemetry-collector/build.sh    | 2 +-
 charts/opentelemetry-collector/values.yaml | 6 +++---
 charts/opentelemetry-demo/Chart.lock       | 8 ++++----
 charts/opentelemetry-demo/Chart.yaml       | 3 ++-
 charts/opentelemetry-demo/build.sh         | 4 ++--
 charts/opentelemetry-demo/values.yaml      | 5 +----
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/charts/opentelemetry-collector/build.sh b/charts/opentelemetry-collector/build.sh
index 6cfae81..ee9cc1e 100755
--- a/charts/opentelemetry-collector/build.sh
+++ b/charts/opentelemetry-collector/build.sh
@@ -1,3 +1,3 @@
 rm -rf opentelemetry-collector-0.38.2.tgz
 helm package .
-curl -L --data-binary "@opentelemetry-collector-0.38.2.tgz" http://localhost:8080/api/charts
\ No newline at end of file
+curl -L --data-binary "@opentelemetry-collector-0.39.2.tgz" http://localhost:8080/api/charts
\ No newline at end of file
diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml
index 02945c4..c569d7b 100644
--- a/charts/opentelemetry-collector/values.yaml
+++ b/charts/opentelemetry-collector/values.yaml
@@ -121,15 +121,15 @@ config:
 
 image:
   # If you want to use the core image `otel/opentelemetry-collector`, you also need to change `command.name` value to `otelcol`.
-  repository: otel/opentelemetry-collector-contrib
-  pullPolicy: IfNotPresent
+  repository: ghcr.io/ty-elastic/otelcontribcol
+  pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 imagePullSecrets: []
 
 # OpenTelemetry Collector executable
 command:
-  name: otelcol-contrib
+  name: otelcontribcol
   extraArgs: []
 
 serviceAccount:
diff --git a/charts/opentelemetry-demo/Chart.lock b/charts/opentelemetry-demo/Chart.lock
index 8d04189..349f33b 100644
--- a/charts/opentelemetry-demo/Chart.lock
+++ b/charts/opentelemetry-demo/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: opentelemetry-collector
-  repository: https://ty-elastic.github.io/opentelemetry-helm-charts
-  version: 0.39.1
+  repository: http://127.0.0.1:8080
+  version: 0.39.2
 - name: prometheus
   repository: https://prometheus-community.github.io/helm-charts
   version: 15.16.1
 - name: grafana
   repository: https://grafana.github.io/helm-charts
   version: 6.42.2
-digest: sha256:1e865a4eeab047148522d810711c2869038a7eb2300193f50156c5e5aa63f68b
-generated: "2022-11-14T22:16:08.306967-07:00"
+digest: sha256:187fce3957460ecab1d35bd925b80d0e9e755b8420bb9886e9a77876135c98bf
+generated: "2022-11-21T16:32:51.923674-06:00"
diff --git a/charts/opentelemetry-demo/Chart.yaml b/charts/opentelemetry-demo/Chart.yaml
index aa7fbe0..1519f5d 100644
--- a/charts/opentelemetry-demo/Chart.yaml
+++ b/charts/opentelemetry-demo/Chart.yaml
@@ -14,8 +14,9 @@ icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
 appVersion: "1.1.0"
 dependencies:
   - name: opentelemetry-collector
-    version: 0.39.1
+    version: 0.39.2
     repository: https://ty-elastic.github.io/opentelemetry-helm-charts
+    #repository: http://127.0.0.1:8080
     condition: observability.otelcol.enabled
   - name: prometheus
     version: 15.16.1
diff --git a/charts/opentelemetry-demo/build.sh b/charts/opentelemetry-demo/build.sh
index bc33798..5936e8f 100755
--- a/charts/opentelemetry-demo/build.sh
+++ b/charts/opentelemetry-demo/build.sh
@@ -1,4 +1,4 @@
 helm dependency update
-rm -rf opentelemetry-demo-0.11.1.tgz
+rm -rf opentelemetry-demo-0.12.3.tgz
 helm package .
-curl -L --data-binary "@opentelemetry-demo-0.11.1.tgz" http://localhost:8080/api/charts
\ No newline at end of file
+curl -L --data-binary "@opentelemetry-demo-0.12.3.tgz" http://localhost:8080/api/charts
\ No newline at end of file
diff --git a/charts/opentelemetry-demo/values.yaml b/charts/opentelemetry-demo/values.yaml
index 1bf32ea..100de67 100644
--- a/charts/opentelemetry-demo/values.yaml
+++ b/charts/opentelemetry-demo/values.yaml
@@ -67,7 +67,7 @@ default:
           apiVersion: v1
           fieldPath: metadata.name
     - name: OTEL_RESOURCE_ATTRIBUTES
-      value: service.name=$(OTEL_SERVICE_NAME),k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME),k8s.pod.uid=$(OTEL_K8S_POD_UID),k8s.pod.ip=$(OTEL_K8S_POD_IP),k8s.container.name=$(OTEL_K8S_CONTAINER_NAME),k8s.container.restart_count=0
+      value: service.name=$(OTEL_SERVICE_NAME),k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_K8S_NODE_NAME),k8s.pod.name=$(OTEL_K8S_POD_NAME),k8s.pod.uid=$(OTEL_K8S_POD_UID),k8s.pod.ip=$(OTEL_K8S_POD_IP),k8s.container.name=$(OTEL_K8S_CONTAINER_NAME)
   # Allows overriding and additions to .Values.default.env
   envOverrides: []
   #  - name: OTEL_K8S_NODE_NAME
@@ -254,7 +254,6 @@ components:
 
     imageOverride:
       repository: ghcr.io/ty-elastic/demo
-      tag: "v1.0.0-featureflagservice"
       pullPolicy: Always
     schedulingRules:
       nodeSelector: {}
@@ -327,7 +326,6 @@ components:
 
     imageOverride:
       repository: ghcr.io/ty-elastic/demo
-      tag: "v1.0.0-frontend"
       pullPolicy: Always
     schedulingRules:
       nodeSelector: {}
@@ -530,7 +528,6 @@ components:
 
     imageOverride:
       repository: ghcr.io/ty-elastic/demo
-      tag: "v1.0.0-shippingservice"
       pullPolicy: Always
     schedulingRules:
       nodeSelector: {}