Skip to content

Commit

Permalink
Regenerate test files after changes to bind IP address configuration …
Browse files Browse the repository at this point in the history
…across all pods
  • Loading branch information
rnishtala-sumo committed Aug 20, 2024
1 parent 2290367 commit 12584bd
Show file tree
Hide file tree
Showing 76 changed files with 359 additions and 160 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ service:
logs:
level: {{ .Values.metadata.metrics.logLevel }}
metrics:
address: ${env:MY_POD_IP}:8888 # this is the default, but setting it explicitly lets the operator add it automatically
address: 0.0.0.0:8888 # this is the default, but setting it explicitly lets the operator add it automatically
extensions:
- health_check
- pprof
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
podAnnotations:
## The operator adds this annotation by default, but we use our own ServiceMonitor
prometheus.io/scrape: "false"
Expand Down
3 changes: 2 additions & 1 deletion tests/helm/testdata/goldenfile/events_otc/basic.output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ data:
file_storage:
directory: /var/lib/storage/events
timeout: 10s
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}
processors:
batch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ data:
sending_queue:
enabled: true
extensions:
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}
processors:
batch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ data:
file_storage:
directory: /var/lib/storage/events
timeout: 10s
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}
processors:
batch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ spec:
priorityClassName: "prio"
containers:
- name: otelcol
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
imagePullPolicy: IfNotPresent
args:
- --config=/etc/otel/config.yaml
Expand Down Expand Up @@ -135,6 +135,11 @@ spec:

- name: NO_PROXY
value: kubernetes.default.svc
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP

- name: VALUE_FROM_SECRET
valueFrom:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ spec:
fsGroup: 999
containers:
- name: otelcol
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
imagePullPolicy: IfNotPresent
args:
- --config=/etc/otel/config.yaml
Expand Down Expand Up @@ -133,6 +133,11 @@ spec:

- name: NO_PROXY
value: kubernetes.default.svc
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
volumeClaimTemplates:
- metadata:
name: file-storage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ spec:

- name: NO_PROXY
value: kubernetes.default.svc
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
volumeClaimTemplates:
- metadata:
name: file-storage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
fsGroup: 999
containers:
- name: otelcol
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
imagePullPolicy: IfNotPresent
args:
- --config=/etc/otel/config.yaml
Expand Down Expand Up @@ -124,6 +124,11 @@ spec:
value: https://proxy.internal
- name: NO_PROXY
value: http://non-proxy.internal
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
volumeClaimTemplates:
- metadata:
name: file-storage
Expand Down
3 changes: 2 additions & 1 deletion tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ data:
on_rebound: true
directory: /var/lib/storage/otc
timeout: 10s
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}
processors:
batch:
Expand Down
3 changes: 2 additions & 1 deletion tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ data:
on_rebound: true
directory: /var/lib/storage/otc
timeout: 10s
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}
processors:
batch:
Expand Down
3 changes: 2 additions & 1 deletion tests/helm/testdata/goldenfile/logs_otc/options.output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ data:
on_rebound: true
directory: /var/lib/storage/otc
timeout: 10s
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}
processors:
batch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
fsGroup: 999
containers:
- name: otelcol
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
imagePullPolicy: IfNotPresent
args:
- --config=/etc/otelcol/config.yaml
Expand Down Expand Up @@ -93,3 +93,8 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,8 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
containers:
- args:
- --config=/etc/otelcol/config.yaml
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
imagePullPolicy: IfNotPresent
name: otelcol
livenessProbe:
Expand Down Expand Up @@ -99,6 +99,11 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP

- name: VALUE_FROM_SECRET
valueFrom:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
containers:
- args:
- --config=/etc/otelcol/config.yaml
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
imagePullPolicy: IfNotPresent
name: otelcol
livenessProbe:
Expand Down Expand Up @@ -89,6 +89,11 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
securityContext:
capabilities:
drop:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
containers:
- args:
- --config=/etc/otelcol/config.yaml
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
imagePullPolicy: IfNotPresent
name: otelcol
livenessProbe:
Expand Down Expand Up @@ -80,6 +80,11 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
securityContext:
capabilities:
drop:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP

- name: VALUE_FROM_SECRET
valueFrom:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ data:
on_rebound: true
directory: /var/lib/storage/otc
timeout: 10s
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}
processors:
batch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ data:
on_rebound: true
directory: /var/lib/storage/otc
timeout: 10s
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}
processors:
batch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ data:
on_rebound: true
directory: /var/lib/storage/otc
timeout: 10s
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}
processors:
batch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ data:
on_rebound: true
directory: /var/lib/storage/otc
timeout: 10s
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}
processors:
batch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
- "otelcol-sumo.exe"
args:
- --config=etc/otelcol/config.yaml
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
imagePullPolicy: IfNotPresent
name: otelcol
livenessProbe:
Expand Down Expand Up @@ -107,6 +107,11 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP

- name: VALUE_FROM_SECRET
valueFrom:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
- "otelcol-sumo.exe"
args:
- --config=etc/otelcol/config.yaml
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
imagePullPolicy: IfNotPresent
name: otelcol
livenessProbe:
Expand Down Expand Up @@ -94,6 +94,11 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
securityContext:
capabilities:
drop:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
- "otelcol-sumo.exe"
args:
- --config=etc/otelcol/config.yaml
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
imagePullPolicy: IfNotPresent
name: otelcol
livenessProbe:
Expand Down Expand Up @@ -85,6 +85,11 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
securityContext:
capabilities:
drop:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,11 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP

- name: VALUE_FROM_SECRET
valueFrom:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ data:
on_rebound: true
directory: /var/lib/storage/otc
timeout: 10s
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}
processors:
batch:
Expand Down
Loading

0 comments on commit 12584bd

Please sign in to comment.