Skip to content

Commit 1ed77a1

Browse files
committed
added imagestream, resources request and limit. fixed registry param
1 parent f742a7a commit 1ed77a1

4 files changed

Lines changed: 31 additions & 2 deletions

File tree

configuration-sample/ods-core.env.sample

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,5 +429,11 @@ OPENTELEMETRY_COLLECTOR_OTLP_API_ENDPOINT=https://fake-jaeger/v1/traces
429429
OPENTELEMETRY_COLLECTOR_OTLP_API_TOKEN=Bearer fakeJaegerIDToken
430430

431431
# The Host of the Opentelemetry Collector
432-
OPENTELEMETRY_COLLECTOR_INGRESS_HOST=https://fake.opentelemetry-collector.com
432+
OPENTELEMETRY_COLLECTOR_INGRESS_HOST=fake.opentelemetry-collector.com
433+
434+
# Resource requests and limits for the Opentelemetry Collector
435+
OPENTELEMETRY_COLLECTOR_CPU_REQUEST=200m
436+
OPENTELEMETRY_COLLECTOR_MEMORY_REQUEST=128Mi
437+
OPENTELEMETRY_COLLECTOR_CPU_LIMIT=1
438+
OPENTELEMETRY_COLLECTOR_MEMORY_LIMIT=256Mi
433439

opentelemetry-collector/chart/templates/deployment.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ spec:
3434
- name: {{ .name }}
3535
mountPath: "{{ .mountPath }}"
3636
{{- end }}
37+
resources:
38+
requests:
39+
cpu: {{ .Values.collector.resources.requests.cpu | quote }}
40+
memory: {{ .Values.collector.resources.requests.memory | quote }}
41+
limits:
42+
cpu: {{ .Values.collector.resources.limits.cpu | quote }}
43+
memory: {{ .Values.collector.resources.limits.memory | quote }}
3744
volumes:
3845
{{- range .Values.collector.volumes }}
3946
- name: {{ .name }}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: image.openshift.io/v1
2+
kind: ImageStream
3+
metadata:
4+
labels:
5+
app: {{ .Values.collector.name }}
6+
name: {{ .Values.collector.name }}
7+
spec:
8+
lookupPolicy:
9+
local: false

opentelemetry-collector/chart/values.yaml.template

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
global:
2-
registry: $ODS_REGISTRY
2+
registry: $DOCKER_REGISTRY
33
odsImageTag: $ODS_IMAGE_TAG
44
repoBase: $REPO_BASE
55
odsBitBucketProject: $ODS_BITBUCKET_PROJECT
@@ -48,6 +48,13 @@ collector:
4848
- key: otel-collector-config
4949
path: otel-collector-config.yaml
5050
defaultMode: 420
51+
resources:
52+
requests:
53+
cpu: $OPENTELEMETRY_COLLECTOR_CPU_REQUEST
54+
memory: $OPENTELEMETRY_COLLECTOR_MEMORY_REQUEST
55+
limits:
56+
cpu: $OPENTELEMETRY_COLLECTOR_CPU_LIMIT
57+
memory: $OPENTELEMETRY_COLLECTOR_MEMORY_LIMIT
5158
service:
5259
name: opentelemetry-collector-service
5360
port: 4318

0 commit comments

Comments
 (0)