Skip to content

Commit acafa05

Browse files
authored
Merge pull request #6747 from zalando-incubator/audittrail-pcs
Update Audittrail to allow Nakadi functionality
2 parents 7f1ca6c + 432a958 commit acafa05

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

cluster/config-defaults.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,7 @@ audittrail_url: "https://audittrail.cloud.zalando.com"
685685
{{else}}
686686
audittrail_url: ""
687687
{{end}}
688+
audittrail_nakadi_url: ""
688689
audittrail_root_account_role: ""
689690

690691
audittrail_adapter_cpu: "50m"

cluster/manifests/audittrail-adapter/credentials.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Cluster.ConfigItems.audittrail_url }}
1+
{{- if or .Cluster.ConfigItems.audittrail_url .Cluster.ConfigItems.audittrail_nakadi_url }}
22
apiVersion: "zalando.org/v1"
33
kind: PlatformCredentialsSet
44
metadata:
@@ -8,7 +8,15 @@ metadata:
88
application: "audittrail-adapter"
99
spec:
1010
application: "audittrail-adapter"
11+
token_version: v2
1112
tokens:
13+
{{- end }}
14+
{{- if .Cluster.ConfigItems.audittrail_url }}
1215
audittrail:
1316
privileges: []
1417
{{- end }}
18+
{{- if .Cluster.ConfigItems.audittrail_nakadi_url }}
19+
nakadi:
20+
privileges:
21+
- com.zalando::nakadi.event_stream.write
22+
{{- end }}

cluster/manifests/audittrail-adapter/daemonset.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,16 @@ spec:
3333
hostNetwork: true
3434
containers:
3535
- name: audittrail-adapter
36-
image: container-registry.zalando.net/teapot/audittrail-adapter:master-49
36+
image: container-registry.zalando.net/teapot/audittrail-adapter:master-51
3737
env:
3838
- name: AWS_REGION
3939
value: "{{ .Cluster.Region }}"
4040
args:
4141
- --cluster-id={{ .Cluster.ID }}
4242
- --cluster-alias={{ .Cluster.Alias }}
4343
- --audittrail-url={{ .Cluster.ConfigItems.audittrail_url }}
44-
- --s3-fallback-bucket-name=zalando-audittrail-{{accountID .Cluster.InfrastructureAccount}}-{{ .Cluster.LocalID }}
44+
- --s3-fallback-bucket-name=zalando-audittrail-{{ accountID .Cluster.InfrastructureAccount }}-{{ .Cluster.LocalID }}
45+
- --nakadi-url={{ .Cluster.ConfigItems.audittrail_nakadi_url }}
4546
- --address=:8889
4647
- --metrics-address=:7980
4748
- --audittrail-timeout={{ .Cluster.ConfigItems.audittrail_adapter_timeout }}

0 commit comments

Comments
 (0)