Compare commits
10 Commits
fbd0f16a74
...
renovate/n
Author | SHA1 | Date | |
---|---|---|---|
14420f19b9 | |||
bd82c55e0f | |||
cc237eada9 | |||
0b1dfd76fb | |||
d04cb1a6b1 | |||
17d7164565 | |||
35a2226b1c | |||
f55a28c01a | |||
fb8da469cb | |||
9ea515e140 |
@@ -8,7 +8,7 @@ resources:
|
||||
- nginx.deployment.yaml
|
||||
- nginx.service.yaml
|
||||
- nginx-auth.sealedsecret.yaml
|
||||
# - nginx.ingress.yaml
|
||||
- nginx.ingress.yaml
|
||||
- quartz-build.cronjob.yaml
|
||||
- s3-credentials.sealedsecret.yaml
|
||||
|
||||
@@ -18,7 +18,7 @@ namespace: eth-physics
|
||||
images:
|
||||
- name: node
|
||||
newName: node
|
||||
newTag: 20-slim
|
||||
newTag: 24-slim
|
||||
|
||||
- name: git
|
||||
newName: alpine/git
|
||||
@@ -28,4 +28,6 @@ images:
|
||||
newName: public.ecr.aws/aws-cli/aws-cli
|
||||
newTag: latest
|
||||
|
||||
|
||||
- name: nginx
|
||||
newName: nginx
|
||||
newTag: "1.25"
|
||||
|
@@ -1,18 +1,18 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: quartz-physics
|
||||
name: quartz
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
app: quartz-physics
|
||||
app: quartz
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: quartz-physics
|
||||
app: quartz
|
||||
spec:
|
||||
containers:
|
||||
- name: quartz-physics
|
||||
- name: quartz
|
||||
image: nginx
|
||||
resources:
|
||||
limits:
|
||||
@@ -22,14 +22,14 @@ spec:
|
||||
- containerPort: 80
|
||||
volumeMounts:
|
||||
- mountPath: /usr/share/nginx/html
|
||||
name: quartz-physics
|
||||
name: quartz
|
||||
- mountPath: /etc/nginx/nginx.conf
|
||||
subPath: nginx.conf
|
||||
name: nginx
|
||||
volumes:
|
||||
- name: quartz-physics
|
||||
- name: quartz
|
||||
persistentVolumeClaim:
|
||||
claimName: quartz-nfs
|
||||
claimName: quartz
|
||||
- name: nginx
|
||||
configMap:
|
||||
name: nginx-config
|
||||
|
@@ -1,26 +1,26 @@
|
||||
apiVersion: traefik.containo.us/v1alpha1
|
||||
apiVersion: traefik.io/v1alpha1
|
||||
kind: IngressRoute
|
||||
metadata:
|
||||
name: quartz-physics-ingress
|
||||
name: quartz-ingress
|
||||
spec:
|
||||
entryPoints:
|
||||
- websecure
|
||||
routes:
|
||||
- match: Host(`physics.kluster.moll.re`)
|
||||
middlewares:
|
||||
- name: quartz-physics-auth
|
||||
- name: quartz-auth
|
||||
kind: Rule
|
||||
services:
|
||||
- name: quartz-physics-web
|
||||
- name: quartz-web
|
||||
port: 80
|
||||
tls:
|
||||
certResolver: default-tls
|
||||
|
||||
---
|
||||
apiVersion: traefik.containo.us/v1alpha1
|
||||
apiVersion: traefik.io/v1alpha1
|
||||
kind: Middleware
|
||||
metadata:
|
||||
name: quartz-physics-auth
|
||||
name: quartz-auth
|
||||
spec:
|
||||
basicAuth:
|
||||
secret: nginx-auth
|
||||
|
@@ -1,10 +1,10 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: quartz-physics-web
|
||||
name: quartz-web
|
||||
spec:
|
||||
selector:
|
||||
app: quartz-physics
|
||||
app: quartz
|
||||
ports:
|
||||
- protocol: TCP
|
||||
port: 80
|
||||
|
@@ -1,7 +1,7 @@
|
||||
kind: PersistentVolumeClaim
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
name: quartz-nfs
|
||||
name: quartz
|
||||
spec:
|
||||
storageClassName: nfs-client
|
||||
accessModes:
|
||||
@@ -13,7 +13,7 @@ spec:
|
||||
kind: PersistentVolumeClaim
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
name: vault-nfs
|
||||
name: vault
|
||||
spec:
|
||||
storageClassName: nfs-client
|
||||
accessModes:
|
||||
|
@@ -6,6 +6,7 @@ spec:
|
||||
schedule: "0 */12 * * *"
|
||||
jobTemplate:
|
||||
spec:
|
||||
backoffLimit: 1
|
||||
template:
|
||||
spec:
|
||||
initContainers:
|
||||
@@ -27,7 +28,7 @@ spec:
|
||||
- name: S3_REGION
|
||||
value: us-west-1
|
||||
command: ["/bin/sh", "-c"]
|
||||
args: ["aws --endpoint-url https://s3.kluster.moll.re s3 sync s3://$S3_BUCKET /config"]
|
||||
args: ["aws --endpoint-url https://s3.kluster.moll.re s3 sync s3://$S3_BUCKET /vault --delete"]
|
||||
|
||||
volumeMounts:
|
||||
- name: vault
|
||||
@@ -49,28 +50,30 @@ spec:
|
||||
- name: quartz-build
|
||||
image: node
|
||||
command: ["/bin/sh", "-c"]
|
||||
args:
|
||||
- cd /config &&
|
||||
- ln -s /vault content
|
||||
- npm ci &&
|
||||
- npx quartz build &&
|
||||
- rm -rfv /dist/* &&
|
||||
- cp --verbose -r public/* /dist
|
||||
|
||||
args:
|
||||
- >-
|
||||
cd /config &&
|
||||
ln -s /vault content &&
|
||||
npm ci &&
|
||||
npx quartz build &&
|
||||
rm -rfv /dist/* &&
|
||||
cp --verbose -r /config/public/* /dist
|
||||
# can't just ln to the dist folder, because quartz deletes it before rebuilding
|
||||
volumeMounts:
|
||||
- name: vault
|
||||
mountPath: /vault
|
||||
- name: dist
|
||||
mountPath: /dist
|
||||
|
||||
- name: config
|
||||
mountPath: /config
|
||||
restartPolicy: Never
|
||||
|
||||
volumes:
|
||||
- name: vault
|
||||
persistentVolumeClaim:
|
||||
claimName: vault-nfs
|
||||
claimName: vault
|
||||
- name: dist
|
||||
persistentVolumeClaim:
|
||||
claimName: quartz-nfs
|
||||
claimName: quartz
|
||||
- name: config
|
||||
emptyDir: {}
|
@@ -11,7 +11,7 @@ const config: QuartzConfig = {
|
||||
},
|
||||
baseUrl: "physics.kluster.moll.re",
|
||||
ignorePatterns: ["private", "templates", ".obsidian"],
|
||||
defaultDateType: "created",
|
||||
defaultDateType: "modified",
|
||||
theme: {
|
||||
typography: {
|
||||
header: "Schibsted Grotesk",
|
||||
|
@@ -1,3 +1,7 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json"
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"dependencyDashboard": true,
|
||||
"ignorePaths": [
|
||||
"package.json"
|
||||
]
|
||||
}
|
||||
|
Reference in New Issue
Block a user