Compare commits
1 Commits
v4
...
28d98b0505
Author | SHA1 | Date | |
---|---|---|---|
28d98b0505 |
@@ -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
|
||||||
|
|
||||||
@@ -28,6 +28,4 @@ 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
|
name: quartz-physics
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: quartz
|
app: quartz-physics
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: quartz
|
app: quartz-physics
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: quartz
|
- name: quartz-physics
|
||||||
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
|
name: quartz-physics
|
||||||
- mountPath: /etc/nginx/nginx.conf
|
- mountPath: /etc/nginx/nginx.conf
|
||||||
subPath: nginx.conf
|
subPath: nginx.conf
|
||||||
name: nginx
|
name: nginx
|
||||||
volumes:
|
volumes:
|
||||||
- name: quartz
|
- name: quartz-physics
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: quartz
|
claimName: quartz-nfs
|
||||||
- name: nginx
|
- name: nginx
|
||||||
configMap:
|
configMap:
|
||||||
name: nginx-config
|
name: nginx-config
|
||||||
|
@@ -1,26 +1,26 @@
|
|||||||
apiVersion: traefik.io/v1alpha1
|
apiVersion: traefik.containo.us/v1alpha1
|
||||||
kind: IngressRoute
|
kind: IngressRoute
|
||||||
metadata:
|
metadata:
|
||||||
name: quartz-ingress
|
name: quartz-physics-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-auth
|
- name: quartz-physics-auth
|
||||||
kind: Rule
|
kind: Rule
|
||||||
services:
|
services:
|
||||||
- name: quartz-web
|
- name: quartz-physics-web
|
||||||
port: 80
|
port: 80
|
||||||
tls:
|
tls:
|
||||||
certResolver: default-tls
|
certResolver: default-tls
|
||||||
|
|
||||||
---
|
---
|
||||||
apiVersion: traefik.io/v1alpha1
|
apiVersion: traefik.containo.us/v1alpha1
|
||||||
kind: Middleware
|
kind: Middleware
|
||||||
metadata:
|
metadata:
|
||||||
name: quartz-auth
|
name: quartz-physics-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-web
|
name: quartz-physics-web
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
app: quartz
|
app: quartz-physics
|
||||||
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
|
name: quartz-nfs
|
||||||
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
|
name: vault-nfs
|
||||||
spec:
|
spec:
|
||||||
storageClassName: nfs-client
|
storageClassName: nfs-client
|
||||||
accessModes:
|
accessModes:
|
||||||
|
@@ -6,7 +6,6 @@ spec:
|
|||||||
schedule: "0 */12 * * *"
|
schedule: "0 */12 * * *"
|
||||||
jobTemplate:
|
jobTemplate:
|
||||||
spec:
|
spec:
|
||||||
backoffLimit: 1
|
|
||||||
template:
|
template:
|
||||||
spec:
|
spec:
|
||||||
initContainers:
|
initContainers:
|
||||||
@@ -28,7 +27,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 /vault --delete"]
|
args: ["aws --endpoint-url https://s3.kluster.moll.re s3 sync s3://$S3_BUCKET /config"]
|
||||||
|
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: vault
|
- name: vault
|
||||||
@@ -51,29 +50,27 @@ spec:
|
|||||||
image: node
|
image: node
|
||||||
command: ["/bin/sh", "-c"]
|
command: ["/bin/sh", "-c"]
|
||||||
args:
|
args:
|
||||||
- >-
|
- cd /config &&
|
||||||
cd /config &&
|
- ln -s /vault content
|
||||||
ln -s /vault content &&
|
- npm ci &&
|
||||||
npm ci &&
|
- npx quartz build &&
|
||||||
npx quartz build &&
|
- rm -rfv /dist/* &&
|
||||||
rm -rfv /dist/* &&
|
- cp --verbose -r public/* /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
|
claimName: vault-nfs
|
||||||
- name: dist
|
- name: dist
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: quartz
|
claimName: quartz-nfs
|
||||||
- name: config
|
- name: config
|
||||||
emptyDir: {}
|
emptyDir: {}
|
6
package-lock.json
generated
6
package-lock.json
generated
@@ -2052,9 +2052,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/esbuild-sass-plugin": {
|
"node_modules/esbuild-sass-plugin": {
|
||||||
"version": "2.16.0",
|
"version": "2.16.1",
|
||||||
"resolved": "https://registry.npmjs.org/esbuild-sass-plugin/-/esbuild-sass-plugin-2.16.0.tgz",
|
"resolved": "https://registry.npmjs.org/esbuild-sass-plugin/-/esbuild-sass-plugin-2.16.1.tgz",
|
||||||
"integrity": "sha512-mGCe9MxNYvZ+j77Q/QFO+rwUGA36mojDXkOhtVmoyz1zwYbMaNrtVrmXwwYDleS/UMKTNU3kXuiTtPiAD3K+Pw==",
|
"integrity": "sha512-mBB2aEF0xk7yo+Q9pSUh8xYED/1O2wbAM6IauGkDrqy6pl9SbJNakLeLGXiNpNujWIudu8TJTZCv2L5AQYRXtA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"resolve": "^1.22.6",
|
"resolve": "^1.22.6",
|
||||||
"sass": "^1.7.3"
|
"sass": "^1.7.3"
|
||||||
|
@@ -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: "modified",
|
defaultDateType: "created",
|
||||||
theme: {
|
theme: {
|
||||||
typography: {
|
typography: {
|
||||||
header: "Schibsted Grotesk",
|
header: "Schibsted Grotesk",
|
||||||
|
@@ -1,7 +1,3 @@
|
|||||||
{
|
{
|
||||||
"$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