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

Add test scenario for daemonset and deployment install #178

Merged
merged 6 commits into from
Apr 20, 2022
Merged

Add test scenario for daemonset and deployment install #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b2300f
Added daemonset and deployment test
TylerHelmuth Apr 18, 2022
e70ab05
Update CI scenario resource requirements
TylerHelmuth Apr 18, 2022
afcfe5d
Bump chart version
TylerHelmuth Apr 18, 2022
734edbd
decrease timeout
TylerHelmuth Apr 18, 2022
e609138
Merge remote-tracking branch 'upstream/main' into issue-175-ready
TylerHelmuth Apr 20, 2022
8cb94bc
bunmped version
TylerHelmuth Apr 20, 2022
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
6 changes: 6 additions & 0 deletions .github/workflows/lint-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ jobs:
- name: Run chart-testing (install)
run: ct install --target-branch main

- name: Run daemonset and deployment install test
run: |
kubectl apply -f ./charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered
kubectl rollout status daemonset example-opentelemetry-collector-agent --timeout=30s
kubectl rollout status deployment example-opentelemetry-collector --timeout=30s
dmitryax marked this conversation as resolved.
Show resolved Hide resolved

- name: Run KUTTL smoke tests
run: |
until kubectl get ns opentelemetry-operator-system 2>&1 | grep "namespaces \"opentelemetry-operator-system\" not found"; do sleep 1; done
Expand Down
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.14.2
version: 0.14.3
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
4 changes: 4 additions & 0 deletions charts/opentelemetry-collector/ci/clusterrole-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@ clusterRole:
- 'watch'
clusterRoleBinding:
name: "testing-clusterrolebinding"
resources:
limits:
cpu: 100m
memory: 200M
3 changes: 3 additions & 0 deletions charts/opentelemetry-collector/ci/config-override-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ config:
receivers:
jaeger: null
otlp: null
zipkin: null
hostmetrics:
scrapers:
cpu:
Expand All @@ -14,3 +15,5 @@ config:
receivers:
- prometheus
- hostmetrics
traces: null
logs: null
4 changes: 4 additions & 0 deletions charts/opentelemetry-collector/ci/daemonset-conatiner-logs-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ config:
receivers:
filelog:
exclude: []
resources:
limits:
cpu: 100m
memory: 200M
4 changes: 4 additions & 0 deletions charts/opentelemetry-collector/ci/daemonset-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
mode: daemonset
resources:
limits:
cpu: 100m
memory: 200M
4 changes: 4 additions & 0 deletions charts/opentelemetry-collector/ci/deployment-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
mode: deployment
resources:
limits:
cpu: 100m
memory: 200M
5 changes: 4 additions & 1 deletion charts/opentelemetry-collector/ci/disabling-protocols-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
mode: deployment

ports:
jaeger-compact:
enabled: false
Expand All @@ -9,3 +8,7 @@ ports:
enabled: false
zipkin:
enabled: false
resources:
limits:
cpu: 100m
memory: 200M
5 changes: 5 additions & 0 deletions charts/opentelemetry-collector/examples/daemonset-and-deployment/daemonset-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,8 @@ config:
exporters:
- otlp
- logging

resources:
limits:
cpu: 100m
memory: 200M
5 changes: 5 additions & 0 deletions charts/opentelemetry-collector/examples/daemonset-and-deployment/deployment-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
mode: deployment

resources:
limits:
cpu: 100m
memory: 200M
8 changes: 4 additions & 4 deletions ...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 @@ -5,7 +5,7 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand All @@ -21,13 +21,13 @@ data:
extensions:
health_check: {}
memory_ballast:
size_mib: "819"
size_mib: "78"
processors:
batch: {}
memory_limiter:
check_interval: 5s
limit_mib: 1638
spike_limit_mib: 512
limit_mib: 156
spike_limit_mib: 48
receivers:
jaeger:
protocols:
Expand Down
6 changes: 3 additions & 3 deletions 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 @@ -5,7 +5,7 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand All @@ -21,8 +21,8 @@ data:
batch: {}
memory_limiter:
check_interval: 5s
limit_mib: 1638
spike_limit_mib: 512
limit_mib: 156
spike_limit_mib: 48
receivers:
jaeger:
protocols:
Expand Down
8 changes: 4 additions & 4 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 @@ -5,7 +5,7 @@ kind: DaemonSet
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand All @@ -19,7 +19,7 @@ spec:
template:
metadata:
annotations:
checksum/config: bb506616e92d045025ca400e8457e040ee2daebc707e6ee5e051a773574aeef1
checksum/config: 6d078a2d460aeed8fc03c79508969487a5a38bb1ad0413408c8de5f9642e444e

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down Expand Up @@ -81,8 +81,8 @@ spec:
port: 13133
resources:
limits:
cpu: 1
memory: 2Gi
cpu: 100m
memory: 200M
volumeMounts:
- mountPath: /conf
name: opentelemetry-collector-configmap
Expand Down
8 changes: 4 additions & 4 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 @@ -5,7 +5,7 @@ kind: Deployment
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand All @@ -21,7 +21,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 4e5bcd2d42ab12b1496c88e27041e12c7d616950a736fe7103ba78262a5ba8ad
checksum/config: 9db04fa09a87ec9b5b02604abc01ab0183a0e7277e1cb158d08ab492c121a553

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down Expand Up @@ -77,8 +77,8 @@ spec:
port: 13133
resources:
limits:
cpu: 1
memory: 2Gi
cpu: 100m
memory: 200M
volumeMounts:
- mountPath: /conf
name: opentelemetry-collector-configmap
Expand Down
2 changes: 1 addition & 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 @@ -5,7 +5,7 @@ kind: Service
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand Down
2 changes: 1 addition & 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 @@ -5,7 +5,7 @@ kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand Down
2 changes: 1 addition & 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 @@ -5,7 +5,7 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand Down
4 changes: 2 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 @@ -5,7 +5,7 @@ kind: DaemonSet
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand All @@ -19,7 +19,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 41fef06c4307702094f63b4e6df4e70a4444a2c7c1be72da52c2c3c20823dd2e
checksum/config: 41c3219ebfdfc3820754bac7f5696039f9b15757b79bbdf6d59def3c5295353a

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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand Down
2 changes: 1 addition & 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 @@ -5,7 +5,7 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand Down
4 changes: 2 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 @@ -5,7 +5,7 @@ kind: DaemonSet
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand All @@ -19,7 +19,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 09a5d9f730e3d74641b2b00b2ef2e4ec2a05b9a5caee52c049f6564851d7a6c2
checksum/config: 8dc14630ec7b06c71572c8cb67db1dbb5c4fc6228ba3449523409d5818cc07c6

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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand Down
2 changes: 1 addition & 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 @@ -5,7 +5,7 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand Down
4 changes: 2 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 @@ -5,7 +5,7 @@ kind: DaemonSet
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand All @@ -19,7 +19,7 @@ spec:
template:
metadata:
annotations:
checksum/config: b21d0e5ac24da64e38bb96402220c9cc8209f2b5777c446d69f398f86b852633
checksum/config: de4459fda4ae1135207849f95961eadb82d0d012dc7b45bba4ec26ce187e7faf

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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand Down
2 changes: 1 addition & 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 @@ -5,7 +5,7 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand Down
4 changes: 2 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 @@ -5,7 +5,7 @@ kind: Deployment
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand All @@ -21,7 +21,7 @@ spec:
template:
metadata:
annotations:
checksum/config: edc847bf6d9a0e3c8afc80ae2267a5139f23629cba1d1055dc475baf6c49d195
checksum/config: 598febca95b203dc9f2c17812045650ff128028ef01e1a096811f961bf6ef025

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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: Service
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand Down
2 changes: 1 addition & 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 @@ -5,7 +5,7 @@ kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand Down
2 changes: 1 addition & 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 @@ -5,7 +5,7 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand Down
4 changes: 2 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 @@ -5,7 +5,7 @@ kind: Deployment
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.14.2
helm.sh/chart: opentelemetry-collector-0.14.3
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.48.0"
Expand All @@ -21,7 +21,7 @@ spec:
template:
metadata:
annotations:
checksum/config: be4df6bbf300cec79a7cd0a91f1819dedec3ecd1b9c3a083c89e7f255b77a15b
checksum/config: 7cd37bd6036d93af14699c6fd991068f8311365ad4811dca0fce380997029c92

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
Loading