Skip to content

Commit 090b99f

Browse files
committed
Move dataproducts-apps topic to nais team
1 parent 43b4cbf commit 090b99f

File tree

3 files changed

+39
-2
lines changed

3 files changed

+39
-2
lines changed

dataproduct_apps/config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Settings(BaseSettings):
2222
nais_client_id: Optional[str] = ""
2323
nais_cluster_name: Optional[str] = ""
2424

25-
app_topic: str = "aura.dataproduct-apps"
25+
app_topic: str = "nais.dataproduct-apps"
2626
topic_topic: str = "nais.dataproduct-apps-topics"
2727

2828
@computed_field

nais/topic-nais.yaml

+37
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,43 @@
11
---
22
apiVersion: kafka.nais.io/v1
33
kind: Topic
4+
metadata:
5+
name: dataproduct-apps
6+
namespace: nais
7+
labels:
8+
team: nais
9+
annotations:
10+
dcat.data.nav.no/title: "Applikasjoner i NAIS"
11+
dcat.data.nav.no/description: "Applikasjoner som kjører i de forskjellige NAIS clusterne, med team og namespace"
12+
dcat.data.nav.no/theme: "nais"
13+
dcat.data.nav.no/keyword: "nais,application"
14+
dcat.data.nav.no/publisher: "https://github.com/nais/dataproduct-apps"
15+
kafka.nais.io/removeDataWhenResourceIsDeleted: "true"
16+
spec:
17+
pool: nav-infrastructure
18+
config: # optional; all fields are optional too; defaults shown
19+
cleanupPolicy: delete # delete, compact, compact,delete
20+
minimumInSyncReplicas: 2
21+
partitions: 1
22+
replication: 3 # see min/max requirements
23+
retentionBytes: -1 # -1 means unlimited
24+
retentionHours: 168 # a week
25+
acl:
26+
- team: aura
27+
application: dataproduct-apps-collect
28+
access: write # read, write, readwrite
29+
- team: aura
30+
application: dataproduct-apps-persist
31+
access: read # read, write, readwrite
32+
- team: nais
33+
application: dataproduct-apps-collect
34+
access: write # read, write, readwrite
35+
- team: nais
36+
application: dataproduct-apps-persist
37+
access: read # read, write, readwrite
38+
---
39+
apiVersion: kafka.nais.io/v1
40+
kind: Topic
441
metadata:
542
name: dataproduct-apps-topics
643
namespace: nais

tests/test_integration.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def settings(self, request):
7777
kafka_brokers=f"{TEST_HOST}:{KAFKA_PORT}",
7878
kafka_security_protocol="PLAINTEXT",
7979
topic_topic=f"nais.dataproduct-apps-topics-{run_id}",
80-
app_topic=f"aura.dataproduct-apps-{run_id}",
80+
app_topic=f"nais.dataproduct-apps-{run_id}",
8181
)
8282

8383
@pytest.fixture(scope="module")

0 commit comments

Comments
 (0)