Skip to content

Commit 59baf1a

Browse files
ubergesundheitubergesundheit
authored
Some maintenance for muenster-update (#78)
* Disable overpass * Update to k8s 1.34.6 in workflow * Rename to muenster-update & add cnpg.io Cluster
1 parent ee12f58 commit 59baf1a

14 files changed

Lines changed: 378 additions & 90 deletions

‎.github/workflows/test-on-pr.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414
with:
1515
kustomize_build_input: sync
1616
kube-linter_flags: "--config .kube-linter.yaml"
17-
kubeconform_flags: "-strict -kubernetes-version 1.29.13 -schema-location 'https://raw.githubusercontent.com/ubergesundheit/kube-check-action/main/kubeconform-schemas/{{.ResourceKind}}.json' -schema-location 'https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/{{.Group}}/{{.ResourceKind}}_{{.ResourceAPIVersion}}.json' -schema-location default"
17+
kubeconform_flags: "-strict -kubernetes-version 1.34.6 -schema-location 'https://raw.githubusercontent.com/ubergesundheit/kube-check-action/main/kubeconform-schemas/{{.ResourceKind}}.json' -schema-location 'https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/{{.Group}}/{{.ResourceKind}}_{{.ResourceAPIVersion}}.json' -schema-location default"

‎apps/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ resources:
55
- ./crashes
66
- ./traffics
77
- ./muenster-update
8-
- ./overpass
8+
# - ./overpass
99
- ./climatems

‎apps/muenster-update/gitrepo.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: source.toolkit.fluxcd.io/v1
22
kind: GitRepository
33
metadata:
4-
name: codeformuenster-muenster-jetzt
4+
name: codeformuenster-muenster-update
55
namespace: flux-system
66
spec:
77
interval: 1h

‎apps/muenster-update/image-automations.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: image.toolkit.fluxcd.io/v1beta2
22
kind: ImageRepository
33
metadata:
4-
name: muenster-jetzt-api-container-image
4+
name: muenster-update-api-container-image
55
namespace: flux-system
66
spec:
77
image: docker.io/codeformuenster/muenster-jetzt-api
@@ -10,7 +10,7 @@ spec:
1010
apiVersion: image.toolkit.fluxcd.io/v1beta2
1111
kind: ImageRepository
1212
metadata:
13-
name: muenster-jetzt-api-static-container-image
13+
name: muenster-update-api-static-container-image
1414
namespace: flux-system
1515
spec:
1616
image: docker.io/codeformuenster/muenster-jetzt-api-static
@@ -19,7 +19,7 @@ spec:
1919
apiVersion: image.toolkit.fluxcd.io/v1beta2
2020
kind: ImageRepository
2121
metadata:
22-
name: muenster-jetzt-frontend-container-image
22+
name: muenster-update-frontend-container-image
2323
namespace: flux-system
2424
spec:
2525
image: docker.io/codeformuenster/muenster-jetzt-frontend
@@ -28,11 +28,11 @@ spec:
2828
apiVersion: image.toolkit.fluxcd.io/v1beta2
2929
kind: ImagePolicy
3030
metadata:
31-
name: muenster-jetzt-api-staging
31+
name: muenster-update-api-staging
3232
namespace: flux-system
3333
spec:
3434
imageRepositoryRef:
35-
name: muenster-jetzt-api-container-image
35+
name: muenster-update-api-container-image
3636
policy:
3737
alphabetical:
3838
order: asc
@@ -43,11 +43,11 @@ spec:
4343
apiVersion: image.toolkit.fluxcd.io/v1beta2
4444
kind: ImagePolicy
4545
metadata:
46-
name: muenster-jetzt-api-static-staging
46+
name: muenster-update-api-static-staging
4747
namespace: flux-system
4848
spec:
4949
imageRepositoryRef:
50-
name: muenster-jetzt-api-static-container-image
50+
name: muenster-update-api-static-container-image
5151
policy:
5252
alphabetical:
5353
order: asc
@@ -58,11 +58,11 @@ spec:
5858
apiVersion: image.toolkit.fluxcd.io/v1beta2
5959
kind: ImagePolicy
6060
metadata:
61-
name: muenster-jetzt-frontend-staging
61+
name: muenster-update-frontend-staging
6262
namespace: flux-system
6363
spec:
6464
imageRepositoryRef:
65-
name: muenster-jetzt-frontend-container-image
65+
name: muenster-update-frontend-container-image
6666
policy:
6767
alphabetical:
6868
order: asc
@@ -73,11 +73,11 @@ spec:
7373
apiVersion: image.toolkit.fluxcd.io/v1beta2
7474
kind: ImagePolicy
7575
metadata:
76-
name: muenster-jetzt-production
76+
name: muenster-update-production
7777
namespace: flux-system
7878
spec:
7979
imageRepositoryRef:
80-
name: muenster-jetzt-frontend-container-image
80+
name: muenster-update-frontend-container-image
8181
policy:
8282
semver:
8383
range: ">=v0.1.0"

‎apps/muenster-update/production/kustomization.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33

4-
namespace: c4m-muenster-jetzt-production
4+
namespace: c4m-muenster-update-production
55

66
resources:
77
- ../../../base/namespace-pss-restricted
8-
- muenster-jetzt-production.enc.yaml
8+
- muenster-update-production.enc.yaml
9+
- pgcluster.yaml
910
- sync.yaml

‎apps/muenster-update/production/muenster-jetzt-production.enc.yaml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎apps/muenster-update/production/muenster-update-production.enc.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
apiVersion: v1
2+
kind: Secret
3+
metadata:
4+
name: backend-api
5+
type: Opaque
6+
stringData:
7+
DJANGO_SECRET_KEY: ENC[AES256_GCM,data:LJs8NOEzZbUfs9FXAP2V5RxMKpGyCWE8QOLT4h6DZMUJXoCp9I+3VY1xUkhXrQ63xSY=,iv:vOvc8nIN6Whn2kA7jQUQueGmVKwKxn/SP3JjAZOfQpo=,tag:c7GvqQyFvmz42P+n7FEszA==,type:str]
8+
MUENSTERLAND_API_TOKEN: ENC[AES256_GCM,data:JG0j2YX5RROq8YuUNnywZwGj8VTd1rvVJ8d4oMxpy8U=,iv:KVjUCDZ/ayOtxOjPSWir/CZ0x6JnoJNoxysuVJrmLxM=,tag:scZC0RQhCmwQmZVQ4j7kzA==,type:str]
9+
DATENPORTAL_USER: ENC[AES256_GCM,data:L2Ue1ikNAdSqBtmP00I=,iv:PuxrIuX/Zt8g8ZFtgDkyMVgA98QleaTNlD5Tj0d//Fw=,tag:j/LubJ0ylfBP1b8+00dGmQ==,type:str]
10+
DATENPORTAL_PASSWORD: ENC[AES256_GCM,data:DJS4UnsXyj33,iv:rM7cPJsiOB6/yY3B/L1GLMMRqGlTv2Gfg39z68I4r/E=,tag:dONTVo8s2OUB4oy3ExYa8A==,type:str]
11+
sops:
12+
age:
13+
- recipient: age1nzqaqzm7wfz04ld5esukhkghmayzt8xmnrjlau0rdcycjlu53pesgew089
14+
enc: |
15+
-----BEGIN AGE ENCRYPTED FILE-----
16+
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtZnJaLzlBSXRUUzZPV09a
17+
MnhseW5WTW11YXhsTUlTMXdJZUhjbjk3dmdFCkd0RUpWWHNLYUlpZUd4MDBqRmRy
18+
ZDJaVy81a3JwbmhlN3ZRWWJUcmptcE0KLS0tIG5zbXpVKzM5ZTZnZzBEL056TVhl
19+
ZkRIRjlvaS9pOE5vRGVlTzRJZktsYlkKM7iQwix6GnITwp7E46DNc78cJOzvRRaF
20+
pdX3EeHyUHshcf7PlZTE1fu37PfgUhr5Z1pY7e8tW+FzoIT+nmylFA==
21+
-----END AGE ENCRYPTED FILE-----
22+
lastmodified: "2026-04-05T14:19:37Z"
23+
mac: ENC[AES256_GCM,data:fGBmNpfv2sfl+UaDKPIgdRvh64JHLOM7TTJBsrUruBmoza/vJrJb1ENG5RlmZNQNt6vTYYHzYELjGYPdeufPes1rYANYLWmsnLj196u5vA/BPgJSnaadtXlrXkyXp9SgcWgt/OUWrn7OtsBrIU6S7a0FZIr1lE7CpjVDaXg2FoE=,iv:UUIDJXqPezKhtoSxDEfrELh9VsIMdDcJhO0239OyuiU=,tag:8h/ulwNvjKCQf6H+m5C+Dw==,type:str]
24+
encrypted_regex: ^(data|stringData)$
25+
version: 3.12.2

‎apps/muenster-update/production/pgcluster.yaml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
apiVersion: postgresql.cnpg.io/v1
2+
kind: Cluster
3+
metadata:
4+
name: pg-ms-update-production
5+
labels:
6+
lab481.de/pg_dump: "false"
7+
spec:
8+
instances: 1
9+
enablePDB: false
10+
imageName: ghcr.io/cloudnative-pg/postgresql:18.3-system-trixie
11+
storage:
12+
size: 1Gi
13+
bootstrap:
14+
initdb:
15+
encoding: UTF8
16+
localeCollate: en_US.UTF-8
17+
localeCType: en_US.UTF-8
18+
podSelectorRefs:
19+
- name: backend
20+
selector:
21+
matchLabels:
22+
app.kubernetes.io/app: muenster-update
23+
app.kubernetes.io/component: api
24+
- name: crawler
25+
selector:
26+
matchLabels:
27+
app.kubernetes.io/app: muenster-update
28+
app.kubernetes.io/component: crawler
29+
postgresql:
30+
pg_hba:
31+
- host app app ${podselector:backend} scram-sha-256
32+
- host app app ${podselector:crawler} scram-sha-256
33+
# Workaround until https://github.com/cloudnative-pg/cloudnative-pg/issues/10371
34+
# is resolved
35+
- host all all all reject
36+
managed:
37+
services:
38+
disabledDefaultServices: ["ro", "r"]

‎apps/muenster-update/production/sync.yaml‎

Lines changed: 116 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
apiVersion: kustomize.toolkit.fluxcd.io/v1
22
kind: Kustomization
33
metadata:
4-
name: muenster-jetzt-production
4+
name: muenster-update-production
55
spec:
66
interval: 1h
7-
targetNamespace: c4m-muenster-jetzt-production
7+
targetNamespace: c4m-muenster-update-production
88
sourceRef:
99
kind: GitRepository
10-
name: codeformuenster-muenster-jetzt
10+
name: codeformuenster-muenster-update
1111
namespace: flux-system
1212
path: "."
1313
prune: true
1414
images:
1515
- name: docker.io/codeformuenster/muenster-jetzt-frontend
16-
newTag: v0.2.1 # {"$imagepolicy": "flux-system:muenster-jetzt-production:tag"}
16+
newTag: v0.2.1 # {"$imagepolicy": "flux-system:muenster-update-production:tag"}
1717
- name: docker.io/codeformuenster/muenster-jetzt-api
18-
newTag: v0.2.1 # {"$imagepolicy": "flux-system:muenster-jetzt-production:tag"}
18+
newTag: v0.2.1 # {"$imagepolicy": "flux-system:muenster-update-production:tag"}
1919
- name: docker.io/codeformuenster/muenster-jetzt-api-static
20-
newTag: v0.2.1 # {"$imagepolicy": "flux-system:muenster-jetzt-production:tag"}
20+
newTag: v0.2.1 # {"$imagepolicy": "flux-system:muenster-update-production:tag"}
21+
commonLabels:
22+
app.kubernetes.io/app: muenster-update
2123
patches:
2224
- patch: |
2325
- op: add
@@ -55,3 +57,111 @@ spec:
5557
target:
5658
kind: Deployment
5759
name: backend-api
60+
- patch: |-
61+
apiVersion: apps/v1
62+
kind: Deployment
63+
metadata:
64+
name: backend-api
65+
spec:
66+
template:
67+
spec:
68+
initContainers:
69+
- name: migrations
70+
env:
71+
- name: DB_HOST
72+
valueFrom:
73+
secretKeyRef:
74+
name: pg-ms-update-production-app
75+
key: host
76+
- name: DB_PORT
77+
valueFrom:
78+
secretKeyRef:
79+
name: pg-ms-update-production-app
80+
key: port
81+
- name: DB_NAME
82+
valueFrom:
83+
secretKeyRef:
84+
name: pg-ms-update-production-app
85+
key: dbname
86+
- name: DB_USER
87+
valueFrom:
88+
secretKeyRef:
89+
name: pg-ms-update-production-app
90+
key: user
91+
- name: DB_PASSWORD
92+
valueFrom:
93+
secretKeyRef:
94+
name: pg-ms-update-production-app
95+
key: password
96+
containers:
97+
- name: backend-api
98+
env:
99+
- name: DB_HOST
100+
valueFrom:
101+
secretKeyRef:
102+
name: pg-ms-update-production-app
103+
key: host
104+
- name: DB_PORT
105+
valueFrom:
106+
secretKeyRef:
107+
name: pg-ms-update-production-app
108+
key: port
109+
- name: DB_NAME
110+
valueFrom:
111+
secretKeyRef:
112+
name: pg-ms-update-production-app
113+
key: dbname
114+
- name: DB_USER
115+
valueFrom:
116+
secretKeyRef:
117+
name: pg-ms-update-production-app
118+
key: user
119+
- name: DB_PASSWORD
120+
valueFrom:
121+
secretKeyRef:
122+
name: pg-ms-update-production-app
123+
key: password
124+
target:
125+
kind: Deployment
126+
name: backend-api
127+
- patch: |-
128+
apiVersion: batch/v1
129+
kind: CronJob
130+
metadata:
131+
name: crawler
132+
spec:
133+
jobTemplate:
134+
spec:
135+
template:
136+
spec:
137+
containers:
138+
- name: crawler
139+
env:
140+
- name: DB_HOST
141+
valueFrom:
142+
secretKeyRef:
143+
name: pg-ms-update-production-app
144+
key: host
145+
- name: DB_PORT
146+
valueFrom:
147+
secretKeyRef:
148+
name: pg-ms-update-production-app
149+
key: port
150+
- name: DB_NAME
151+
valueFrom:
152+
secretKeyRef:
153+
name: pg-ms-update-production-app
154+
key: dbname
155+
- name: DB_USER
156+
valueFrom:
157+
secretKeyRef:
158+
name: pg-ms-update-production-app
159+
key: user
160+
- name: DB_PASSWORD
161+
valueFrom:
162+
secretKeyRef:
163+
name: pg-ms-update-production-app
164+
key: password
165+
target:
166+
kind: CronJob
167+
name: crawler

‎apps/muenster-update/staging/kustomization.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33

4-
namespace: c4m-muenster-jetzt-staging
4+
namespace: c4m-muenster-update-staging
55

66
resources:
77
- ../../../base/namespace-pss-restricted
8-
- muenster-jetzt-staging.enc.yaml
8+
- muenster-update-staging.enc.yaml
9+
- pgcluster.yaml
910
- sync.yaml

0 commit comments

Comments
 (0)