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