Skip to content

Commit

Permalink
v1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ty-elastic committed Nov 22, 2022
1 parent d91ce4e commit 0b8f0cf
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 15 deletions.
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/build.sh
Original file line number Diff line number Diff line change
@@ -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
curl -L --data-binary "@opentelemetry-collector-0.39.2.tgz" http://localhost:8080/api/charts
6 changes: 3 additions & 3 deletions charts/opentelemetry-collector/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions charts/opentelemetry-demo/Chart.lock
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 2 additions & 1 deletion charts/opentelemetry-demo/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-demo/build.sh
Original file line number Diff line number Diff line change
@@ -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
curl -L --data-binary "@opentelemetry-demo-0.12.3.tgz" http://localhost:8080/api/charts
5 changes: 1 addition & 4 deletions charts/opentelemetry-demo/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -254,7 +254,6 @@ components:

imageOverride:
repository: ghcr.io/ty-elastic/demo
tag: "v1.0.0-featureflagservice"
pullPolicy: Always
schedulingRules:
nodeSelector: {}
Expand Down Expand Up @@ -327,7 +326,6 @@ components:

imageOverride:
repository: ghcr.io/ty-elastic/demo
tag: "v1.0.0-frontend"
pullPolicy: Always
schedulingRules:
nodeSelector: {}
Expand Down Expand Up @@ -530,7 +528,6 @@ components:

imageOverride:
repository: ghcr.io/ty-elastic/demo
tag: "v1.0.0-shippingservice"
pullPolicy: Always
schedulingRules:
nodeSelector: {}
Expand Down

0 comments on commit 0b8f0cf

Please sign in to comment.