Skip to content

Commit 03029a3

Browse files
committed
introduce ns-sablier
1 parent 78c3c77 commit 03029a3

File tree

5 files changed

+55
-3
lines changed

5 files changed

+55
-3
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: ns-sablier
5+
6+
spec:
7+
replicas: 1
8+
selector:
9+
matchLabels:
10+
app: ns-sablier
11+
template:
12+
metadata:
13+
labels:
14+
app: ns-sablier
15+
spec:
16+
enableServiceLinks: false
17+
volumes:
18+
- name: config
19+
configMap:
20+
name: ns-sablier
21+
containers:
22+
- name: ns-sablier
23+
image: ns-sablier
24+
ports:
25+
- name: http
26+
containerPort: 10000
27+
volumeMounts:
28+
- name: config
29+
mountPath: /etc/sablier
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
name: ns-sablier
5+
6+
spec:
7+
type: ClusterIP
8+
selector:
9+
app: ns-sablier
10+
ports:
11+
- name: http
12+
port: 80
13+
targetPort: http

ns-system/config/ns-sablier.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
provider:
2+
name: kubernetes

ns-system/config/ns.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ components:
127127
middleware:
128128
sablier:
129129
enable: true
130-
url: http://sablier.sablier.svc.cluster.local
130+
url: http://ns-sablier.ns-system.svc.cluster.local
131131
sessionDuration: 1h
132132
dynamic:
133-
theme: ghost
133+
theme: neoshowcase
134134
blocking:
135135
timeout: 1m
136136
tls:
@@ -202,7 +202,7 @@ components:
202202
type: loki
203203
loki:
204204
endpoint: http://loki.monitor.svc.cluster.local:3100
205-
queryTemplate: "{namespace=\"ns-apps\",pod=\"nsapp-{{ .App.ID }}-0\"}"
205+
queryTemplate: '{namespace="ns-apps",pod="nsapp-{{ .App.ID }}-0"}'
206206
metrics:
207207
type: prometheus
208208
prometheus:

ns-system/kustomization.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ resources:
1818
- components/migrate-job.yaml
1919
- components/ssgen-service.yaml
2020
- components/ssgen-stateful-set.yaml
21+
- components/sablier-deployment.yaml
22+
- components/sablier-service.yaml
2123
- db/adminer-certificate.yaml
2224
- db/adminer-deployment.yaml
2325
- db/adminer-ingress-route.yaml
@@ -46,6 +48,9 @@ configMapGenerator:
4648
- files:
4749
- config/90-limit-buffer.conf
4850
name: mariadb-config
51+
- name: ns-sablier
52+
files:
53+
- config/ns-sablier.yaml
4954

5055
images:
5156
- name: ns-builder
@@ -69,6 +74,9 @@ images:
6974
- name: ns-ssgen
7075
newName: ghcr.io/traptitech/ns-ssgen
7176
newTag: 1.7.1
77+
- name: ns-sablier
78+
newName: ghcr.io/traptitech/ns-sablier
79+
newTag: 1.7.1
7280

7381
generators:
7482
- ksops.yaml

0 commit comments

Comments
 (0)