Skip to content

Commit

Permalink
[collector] fix wrong extraContainers in generated yaml (#1143)
Browse files Browse the repository at this point in the history 
* fix #1139

* update

* revert examples changes

* Update charts/opentelemetry-collector/examples/daemonset-and-deployment/deployment-values.yaml

---------

Co-authored-by: Tyler Helmuth <[email protected]>
  • Loading branch information
@JaredTan95 @TylerHelmuth
JaredTan95 and TylerHelmuth authored Apr 16, 2024
1 parent 7d3feaa commit df92279
Show file tree
Hide file tree
Showing 49 changed files with 60 additions and 61 deletions.
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-collector
version: 0.87.1
version: 0.87.2
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
2 changes: 1 addition & 1 deletion ...s/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 13fc71b113e2bfe5f5f0ba924b47d755549931244b8d42f8502b6f3f21b1a9ce
checksum/config: a733142c8a4a0f8416cc586eb5f37df092222b1cd62dd45acbce05c47cca243d

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 4fb4e1d6baa0df10b230e4fd398d0d6f5813c6923b5905c9c6e8c9c0a536e3b0
checksum/config: c32e5ca89cc7b9bd5d7b6ea3157062bf8e57aa7effad5ce95722c14cfa4b752c

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
2 changes: 1 addition & 1 deletion ...ts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
2 changes: 1 addition & 1 deletion ...s/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 023a87a0f605776efc44ab386245a9dd59c01217a38f7539c1367269a655d649
checksum/config: cabbed3ac188ad10e071d57da7b0f4123a257e71b8d416c42895c2433923323b

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion ...ts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 5800fb9cbcb2c09c8ef98553e5e31d9ed1a802428d2daeaf542ef4fab6dfb55a
checksum/config: 1c862a86702e7987689875486baedeed0e1c8556cb7da6f25a0984bf45941dee

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
2 changes: 1 addition & 1 deletion .../opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 02786c7644cc5fd82888fdd8ff575fa324dd8fd16c4aab60a9624639cbefae20
checksum/config: ccbaf9dfb913bab53c89f6ae2d37a7118ba38ec004b64028faaf8ac15599dea4

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion ...s/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 02786c7644cc5fd82888fdd8ff575fa324dd8fd16c4aab60a9624639cbefae20
checksum/config: ccbaf9dfb913bab53c89f6ae2d37a7118ba38ec004b64028faaf8ac15599dea4

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 4fb4e1d6baa0df10b230e4fd398d0d6f5813c6923b5905c9c6e8c9c0a536e3b0
checksum/config: c32e5ca89cc7b9bd5d7b6ea3157062bf8e57aa7effad5ce95722c14cfa4b752c

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 177d06485b31ac1d13b77af699c7ebc4ff8739bdbd8adbeb5775f6eb6a010d9b
checksum/config: 39fb4cb73815c55f4f40cb842e25a871f5d8625686bb0feeefc97a6002cfc359

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
2 changes: 1 addition & 1 deletion ...entelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
2 changes: 1 addition & 1 deletion .../opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
2 changes: 1 addition & 1 deletion ...lemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRole
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
2 changes: 1 addition & 1 deletion ...ts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRoleBinding
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 5fb047b6f098edfa0a00d36f7ce746e75642d23903f28503ec1e9088f4b894e6
checksum/config: b3292d9ba35cca2b79ba0a51478deffa428282e0d5e34ea0270abf70e4cfbaa0

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.87.1
helm.sh/chart: opentelemetry-collector-0.87.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.98.0"
Expand Down
Loading

0 comments on commit df92279

Please sign in to comment.