Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[collector] Make it possible to specify namespace when running Helm template #871

Merged
merged 4 commits into from
Aug 25, 2023
Merged

[collector] Make it possible to specify namespace when running Helm template #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2ae421
rebase to main
krisztianfekete Aug 24, 2023
b2e3dcc
update schema to include namespace
krisztianfekete Aug 22, 2023
62be47b
switch to namespaceOverride, bump chart version
krisztianfekete Aug 23, 2023
90a1b6b
fix scope in ingress template
krisztianfekete Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-collector
version: 0.66.3
version: 0.66.4
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
3 changes: 2 additions & 1 deletion ...s/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
5 changes: 3 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: apps/v1
kind: DaemonSet
metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand All @@ -21,7 +22,7 @@ spec:
template:
metadata:
annotations:
checksum/config: d591d7a96ebe8e907b4e2babc5528bf26de5913825caba5bbc4f11dc83bad0ee
checksum/config: 306ccb4b5b4f7ebc75d88340487a42c673b10905ac5abaa549b1fc75a24bde56

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
5 changes: 3 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand All @@ -23,7 +24,7 @@ spec:
template:
metadata:
annotations:
checksum/config: cc9bc1e3d54174a3c0e6188f549b933604e54748632720336ad513b96bb7ee0f
checksum/config: 8df436fe1a34eb82cbd00cc160148eab89b943abb40fc415137b0c7282e6ddc3

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: Service
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
3 changes: 2 additions & 1 deletion ...ts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
3 changes: 2 additions & 1 deletion ...s/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
5 changes: 3 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: apps/v1
kind: DaemonSet
metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand All @@ -21,7 +22,7 @@ spec:
template:
metadata:
annotations:
checksum/config: e5e5bf15320b50267f4a1989db5454de48ae14f1487bff0e3f346400af3433fc
checksum/config: 5dd6cf134433dd8852bd66845c6a713f9039710b0680d530342e002cd6493929

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
3 changes: 2 additions & 1 deletion ...ts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
5 changes: 3 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: apps/v1
kind: DaemonSet
metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand All @@ -21,7 +22,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 48c0d2ff85f9f7d11213ac4286a8cb3cba222fac40a52f03c1845c68ad847fcc
checksum/config: 0cc9092e47a747f51748bbf05dc5598605420ceaa7bead02c77a9819c53c4f94

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
3 changes: 2 additions & 1 deletion .../opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
5 changes: 3 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: apps/v1
kind: DaemonSet
metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand All @@ -21,7 +22,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 1319970d1125766adf87a74b44e1773f829a36bae81b64ce150ea312a3291eff
checksum/config: b421816fb164c2a0e674f8788791d2b97bbaa5b86db805b65c9d6d5130807792

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
3 changes: 2 additions & 1 deletion ...s/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
5 changes: 3 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: apps/v1
kind: DaemonSet
metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand All @@ -21,7 +22,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 1319970d1125766adf87a74b44e1773f829a36bae81b64ce150ea312a3291eff
checksum/config: b421816fb164c2a0e674f8788791d2b97bbaa5b86db805b65c9d6d5130807792

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
5 changes: 3 additions & 2 deletions charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand All @@ -23,7 +24,7 @@ spec:
template:
metadata:
annotations:
checksum/config: cc9bc1e3d54174a3c0e6188f549b933604e54748632720336ad513b96bb7ee0f
checksum/config: 8df436fe1a34eb82cbd00cc160148eab89b943abb40fc415137b0c7282e6ddc3

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: Service
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
5 changes: 3 additions & 2 deletions charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand All @@ -23,7 +24,7 @@ spec:
template:
metadata:
annotations:
checksum/config: f03c0b4eea87d9e1057e23a564bab931da3c83459d8f5113da6d40ce99d602ce
checksum/config: 4f7e3ee2c34567f31d0aada436446deee2566a1f85ce3fc5d85aab4221ee2e42

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: Service
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
3 changes: 2 additions & 1 deletion ...entelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
3 changes: 2 additions & 1 deletion .../opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: Service
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
3 changes: 2 additions & 1 deletion ...lemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.66.3
helm.sh/chart: opentelemetry-collector-0.66.4
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.83.0"
Expand Down
Loading