chore(deps): update dependency esbuild-sass-plugin to v2.16.1

deployment/kustomization.yaml

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

deployment/nginx.deployment.yaml

@@ -1,18 +1,18 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: quartz
+  name: quartz-physics
 spec:
   selector:
     matchLabels:
-      app: quartz
+      app: quartz-physics
   template:
     metadata:
       labels:
-        app: quartz
+        app: quartz-physics
     spec:
       containers:
-      - name: quartz
+      - name: quartz-physics
         image: nginx
         resources:
           limits:
@@ -22,14 +22,14 @@ spec:
         - containerPort: 80
         volumeMounts:
         - mountPath: /usr/share/nginx/html
-          name: quartz
+          name: quartz-physics
         - mountPath: /etc/nginx/nginx.conf
           subPath: nginx.conf
           name: nginx
       volumes:
-      - name: quartz
+      - name: quartz-physics
         persistentVolumeClaim:
-          claimName: quartz
+          claimName: quartz-nfs
       - name: nginx
         configMap:
           name: nginx-config

deployment/nginx.ingress.yaml

@@ -1,26 +1,26 @@
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
 metadata:
-  name: quartz-ingress
+  name: quartz-physics-ingress
 spec:
   entryPoints:
     - websecure
   routes:
     - match: Host(`physics.kluster.moll.re`)
       middlewares:
-        - name: quartz-auth
+        - name: quartz-physics-auth
       kind: Rule
       services:
-        - name: quartz-web
+        - name: quartz-physics-web
           port: 80
   tls:
     certResolver: default-tls
 
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: quartz-auth
+  name: quartz-physics-auth
 spec:
   basicAuth:
     secret: nginx-auth

deployment/nginx.service.yaml

@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: quartz-web
+  name: quartz-physics-web
 spec:
   selector:
-    app: quartz
+    app: quartz-physics
   ports:
     - protocol: TCP
       port: 80

deployment/pvc.yaml

@@ -1,7 +1,7 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: quartz
+  name: quartz-nfs
 spec:
   storageClassName: nfs-client
   accessModes:
@@ -13,7 +13,7 @@ spec:
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: vault
+  name: vault-nfs
 spec:
   storageClassName: nfs-client
   accessModes:

deployment/quartz-build.cronjob.yaml

@@ -6,7 +6,6 @@ spec:
   schedule: "0 */12 * * *"
   jobTemplate:
     spec:
-      backoffLimit: 1
       template:
         spec:
           initContainers:
@@ -28,7 +27,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 /vault --delete"]
+            args: ["aws --endpoint-url https://s3.kluster.moll.re s3 sync s3://$S3_BUCKET /config"]
 
             volumeMounts:
               - name: vault
@@ -51,29 +50,27 @@ spec:
             image: node
             command: ["/bin/sh", "-c"]
             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:
             - name: vault
               mountPath: /vault
             - name: dist
               mountPath: /dist
-            - name: config
+
-              mountPath: /config
           restartPolicy: Never
 
           volumes:
           - name: vault
             persistentVolumeClaim:
-              claimName: vault
+              claimName: vault-nfs
           - name: dist
             persistentVolumeClaim:
-              claimName: quartz
+              claimName: quartz-nfs
           - name: config
             emptyDir: {}

package-lock.json

@@ -2052,9 +2052,9 @@
       }
     },
     "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": {
         "resolve": "^1.22.6",
         "sass": "^1.7.3"

quartz.config.ts

@@ -11,7 +11,7 @@ const config: QuartzConfig = {
     },
     baseUrl: "physics.kluster.moll.re",
     ignorePatterns: ["private", "templates", ".obsidian"],
-    defaultDateType: "modified",
+    defaultDateType: "created",
     theme: {
       typography: {
         header: "Schibsted Grotesk",

renovate.json

@@ -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"
-  ]
 }