fixes

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
 
@@ -28,4 +28,6 @@ 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-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

deployment/nginx.ingress.yaml

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

deployment/nginx.service.yaml

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

deployment/quartz-build.cronjob.yaml

@@ -27,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 /config"]
+            args: ["aws --endpoint-url https://s3.kluster.moll.re s3 sync s3://$S3_BUCKET /vault"]
 
             volumeMounts:
               - name: vault
@@ -49,20 +49,22 @@ spec:
           - name: quartz-build
             image: node
             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:
             - name: vault
               mountPath: /vault
             - name: dist
               mountPath: /dist
-
+            - name: config
+              mountPath: /config
           restartPolicy: Never
 
           volumes: