Skip to content

Commit 1f93393

Browse files
committed
Remove trailing whitespace
1 parent 5a09149 commit 1f93393

2 files changed

Lines changed: 46 additions & 46 deletions

File tree

ci/deploy-logging-dependencies/files/cluster_log_forwarder.yaml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,74 @@
1-
apiVersion: observability.openshift.io/v1
2-
kind: ClusterLogForwarder
1+
apiVersion: observability.openshift.io/v1
2+
kind: ClusterLogForwarder
33
metadata:
4-
name: collector-with-cadf-to-loki-audit
4+
name: collector-with-cadf-to-loki-audit
55
namespace: openshift-logging
66
spec:
77
serviceAccount:
8-
name: collector
8+
name: collector
99
inputs:
10-
- name: dataplane
11-
receiver:
12-
port: 10514
13-
type: syslog
14-
type: receiver
10+
- name: dataplane
11+
receiver:
12+
port: 10514
13+
type: syslog
14+
type: receiver
1515
managementState: Managed
16-
outputs:
17-
- name: default-lokistack
16+
outputs:
17+
- name: default-lokistack
1818
type: lokiStack
19-
lokiStack:
19+
lokiStack:
2020
authentication:
21-
token:
22-
from: serviceAccount
23-
labelKeys:
24-
infrastructure:
25-
labelKeys:
26-
- host
21+
token:
22+
from: serviceAccount
23+
labelKeys:
24+
infrastructure:
25+
labelKeys:
26+
- host
2727
- appname
28-
target:
28+
target:
2929
name: logging-loki
30-
namespace: openshift-logging
30+
namespace: openshift-logging
3131
tls:
32-
ca:
32+
ca:
3333
key: service-ca.crt
3434
configMapName: openshift-service-ca.crt
35-
- name: audit-lokistack
35+
- name: audit-lokistack
3636
type: lokiStack
37-
lokiStack:
37+
lokiStack:
3838
authentication:
39-
token:
39+
token:
4040
from: serviceAccount
4141
target:
42-
name: logging-loki-audit
42+
name: logging-loki-audit
4343
namespace: openshift-logging
44-
tls:
45-
ca:
44+
tls:
45+
ca:
4646
key: service-ca.crt
47-
configMapName: openshift-service-ca.crt
48-
filters:
49-
- name: to-loki-filter
50-
type: drop
51-
drop:
52-
- test:
53-
- field: .message
54-
matches: "oslo.messaging.notification"
47+
configMapName: openshift-service-ca.crt
48+
filters:
49+
- name: to-loki-filter
50+
type: drop
51+
drop:
52+
- test:
53+
- field: .message
54+
matches: "oslo.messaging.notification"
5555
- name: to-loki-audit-filter
56-
type: drop
57-
drop:
58-
- test:
56+
type: drop
57+
drop:
58+
- test:
5959
- field: .message
6060
notMatches: "oslo.messaging.notification"
6161
pipelines:
6262
- name: to-loki
6363
inputRefs:
64-
- application
64+
- application
6565
- dataplane
66-
outputRefs:
66+
outputRefs:
6767
- default-lokistack
6868
filterRefs:
69-
- to-loki-filter
69+
- to-loki-filter
7070
- name: to-loki-audit
71-
inputRefs:
71+
inputRefs:
7272
- application
7373
outputRefs:
7474
- audit-lokistack

ci/deploy-logging-dependencies/tasks/deploy-loki.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
until: loki_ready.stdout == "True"
2727
retries: 40
2828
delay: 15
29-
29+
3030
- name: Create audit loki S3 secret
3131
ansible.builtin.shell:
3232
cmd: |
3333
oc apply -f {{ role_path }}/files/audit_loki_secret.yaml -n openshift-logging
34-
34+
3535
- name: Create audit loki stack
3636
ansible.builtin.shell:
3737
cmd: |
3838
oc apply -f {{ role_path }}/files/audit_lokistack.yaml -n openshift-logging
39-
39+
4040
- name: Wait for audit lokistack to be created
4141
ansible.builtin.command:
4242
cmd:
@@ -45,7 +45,7 @@
4545
retries: 20
4646
register: output
4747
until: output.stdout_lines | length != 0
48-
48+
4949
- name: Wait for the audit lokistack to be ready
5050
ansible.builtin.command:
5151
cmd:

0 commit comments

Comments
 (0)