Compare commits

...

4 Commits

Author SHA1 Message Date
8aa34e6b38 chore(deps): update dependency remark-smartypants to v2.1.0 2024-02-04 00:01:11 +00:00
f55a28c01a here? 2024-02-04 00:56:52 +01:00
fb8da469cb lets try fewer 2024-02-04 00:54:51 +01:00
9ea515e140 fixes 2024-02-04 00:52:44 +01:00
6 changed files with 34 additions and 43 deletions

View File

@@ -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
@@ -28,4 +28,6 @@ images:
newName: public.ecr.aws/aws-cli/aws-cli
newTag: latest
- name: nginx
newName: nginx
newTag: "1.25"

View File

@@ -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,12 +22,12 @@ 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
- name: nginx

View File

@@ -1,17 +1,17 @@
apiVersion: traefik.containo.us/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
@@ -20,7 +20,7 @@ spec:
apiVersion: traefik.containo.us/v1alpha1
kind: Middleware
metadata:
name: quartz-physics-auth
name: quartz-auth
spec:
basicAuth:
secret: nginx-auth

View File

@@ -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

View File

@@ -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"]
volumeMounts:
- name: vault
@@ -49,20 +50,22 @@ 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:

24
package-lock.json generated
View File

@@ -4864,32 +4864,18 @@
}
},
"node_modules/remark-smartypants": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/remark-smartypants/-/remark-smartypants-2.0.0.tgz",
"integrity": "sha512-Rc0VDmr/yhnMQIz8n2ACYXlfw/P/XZev884QU1I5u+5DgJls32o97Vc1RbK3pfumLsJomS2yy8eT4Fxj/2MDVA==",
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/remark-smartypants/-/remark-smartypants-2.1.0.tgz",
"integrity": "sha512-qoF6Vz3BjU2tP6OfZqHOvCU0ACmu/6jhGaINSQRI9mM7wCxNQTKB3JUAN4SVoN2ybElEDTxBIABRep7e569iJw==",
"dependencies": {
"retext": "^8.1.0",
"retext-smartypants": "^5.1.0",
"unist-util-visit": "^4.1.0"
"retext-smartypants": "^5.2.0",
"unist-util-visit": "^5.0.0"
},
"engines": {
"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
}
},
"node_modules/remark-smartypants/node_modules/unist-util-visit": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.2.tgz",
"integrity": "sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==",
"dependencies": {
"@types/unist": "^2.0.0",
"unist-util-is": "^5.0.0",
"unist-util-visit-parents": "^5.1.1"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/unified"
}
},
"node_modules/remark-stringify": {
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-11.0.0.tgz",