Merge remote-tracking branch 'origin/main'

apps/publicfiles/Caddyfile

@@ -1,4 +1,4 @@
-http://publicfiles.default.svc.yakumo.prettysunflower.moe, http://files.prettysunflower.moe {
+http://publicfiles.default.svc.sekibanki.prettysunflower.moe, http://files.prettysunflower.moe {
 	root * /srv
 
 	basic_auth /memberpress-basic-1.12.6.zip {

apps/publicfiles/deployment.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/name: publicfiles
 spec:
-  replicas: 3
+  replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: publicfiles

apps/publicfiles/pvc.yaml

@@ -1,43 +1,37 @@
+---
 apiVersion: v1
 kind: PersistentVolume
 metadata:
+  annotations:
+    pv.kubernetes.io/provisioned-by: nfs.csi.k8s.io
   name: publicfiles
 spec:
-  storageClassName: s3yuyuko
   capacity:
-    storage: 10T
+    storage: 50Gi
   accessModes:
     - ReadOnlyMany
-  claimRef:
-    namespace: default
-    name: publicfiles
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: nfs-csi
+  mountOptions:
+    - nfsvers=4.1
   csi:
-    driver: ru.yandex.s3.csi
-    controllerPublishSecretRef:
-      name: csi-yuyuko-secret
-      namespace: kube-system
-    nodePublishSecretRef:
-      name: csi-yuyuko-secret
-      namespace: kube-system
-    nodeStageSecretRef:
-      name: csi-yuyuko-secret
-      namespace: kube-system
+    driver: nfs.csi.k8s.io
+    # volumeHandle format: {nfs-server-address}#{sub-dir-name}#{share-name}
+    # make sure this value is unique for every share in the cluster
+    volumeHandle: 100.126.243.21/mnt/yuyuko/public_files##
     volumeAttributes:
-      capacity: 10Ti
-      mounter: geesefs
-      options: --memory-limit 1000 --dir-mode 0777 --file-mode 0666
-    volumeHandle: publicfiles
+      server: 100.126.243.21
+      share: mnt//yuyuko/public_files
 ---
-apiVersion: v1
 kind: PersistentVolumeClaim
+apiVersion: v1
 metadata:
   name: publicfiles
 spec:
-  storageClassName: "s3yuyuko"
-  resources:
-    requests:
-      storage: 10Ti
-  volumeMode: Filesystem
   accessModes:
     - ReadOnlyMany
+  resources:
+    requests:
+      storage: 50Gi
   volumeName: publicfiles
+  storageClassName: nfs-csi

apps/seija/kakigoori/deployment.yaml

@@ -34,6 +34,11 @@ spec:
                 - ALL
             seccompProfile:
               type: RuntimeDefault
+        - name: kakigoori-static
+          image: "git.prettysunflower.moe/prettysunflower/kakigoori-static:main"
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 8002
         - name: anubis
           image: ghcr.io/techarohq/anubis:v1.21.3
           env:
@@ -90,4 +95,4 @@ spec:
       dnsPolicy: "None"
       dnsConfig:
         nameservers:
-          - 100.96.226.96
+          - 100.94.59.38

apps/seija/kakigoori/services.yaml

@@ -15,3 +15,7 @@ spec:
       port: 80
       targetPort: 8080
       name: anubis
+    - protocol: TCP
+      port: 8002
+      targetPort: 8002
+      name: static

apps/seija/ourfigurecollection/deployment.yaml

@@ -105,4 +105,4 @@ spec:
       dnsPolicy: "None"
       dnsConfig:
         nameservers:
-          - 100.96.226.96
+          - 100.94.59.38

apps/seija/prettysunflower-website/deployment.yaml

@@ -81,4 +81,4 @@ spec:
       dnsPolicy: "ClusterFirst"
       dnsConfig:
         nameservers:
-          - 100.96.226.96
+          - 100.94.59.38

apps/sekibanki/etherpad/deployment.yaml

@@ -41,7 +41,7 @@ spec:
       dnsPolicy: "None"
       dnsConfig:
         nameservers:
-          - 100.96.226.96
+          - 100.94.59.38
       volumes:
       - name: etherpad-images
         persistentVolumeClaim:

apps/sekibanki/gitea/deployment.yaml

@@ -28,7 +28,7 @@ spec:
       dnsPolicy: "None"
       dnsConfig:
         nameservers:
-          - 100.96.226.96
+          - 100.94.59.38
       containers:
         - image: docker.gitea.com/gitea:1.24.3-rootless 
           name: gitea

apps/sekibanki/gotosocial/deployment.yaml

@@ -21,7 +21,7 @@ spec:
       dnsPolicy: "None"
       dnsConfig:
         nameservers:
-          - 100.96.226.96
+          - 100.94.59.38
       containers:
         - image: docker.io/superseriousbusiness/gotosocial:0.19.1
           name: gotosocial

apps/sekibanki/renovate/cronjob.yaml

@@ -12,7 +12,7 @@ spec:
           dnsPolicy: "None"
           dnsConfig:
             nameservers:
-              - 100.96.226.96
+              - 100.94.59.38
           affinity:
             nodeAffinity:
               preferredDuringSchedulingIgnoredDuringExecution:

apps/sekibanki/thelounge/statefulset.yaml

@@ -17,7 +17,7 @@ spec:
       dnsPolicy: "None"
       dnsConfig:
         nameservers:
-          - 100.96.226.96
+          - 100.94.59.38
       volumes:
         - name: thelounge-data
           persistentVolumeClaim:

apps/template/deployment.yaml

@@ -66,4 +66,4 @@ spec:
       dnsPolicy: "ClusterFirst"
       dnsConfig:
         nameservers:
-          - 100.96.226.96
+          - 100.94.59.38

infra/seija/talconfig.yaml

@@ -1,7 +1,7 @@
 ---
 clusterName: seija
-talosVersion: v1.10.5
-kubernetesVersion: v1.33.2
+talosVersion: v1.10.6
+kubernetesVersion: v1.33.3
 endpoint: https://10.11.0.2:6443
 domain: seija.prettysunflower.moe
 allowSchedulingOnControlPlanes: true
@@ -23,7 +23,7 @@ patches:
       path: /machine/network
       value:
         nameservers:
-          - 100.96.226.96
+          - 100.94.59.38
 nodes:
   - hostname: fulgora
     ipAddress: 10.11.0.2

infra/sekibanki/talconfig.yaml

@@ -1,7 +1,7 @@
 ---
 clusterName: sekibanki
-talosVersion: v1.10.5
-kubernetesVersion: v1.33.2
+talosVersion: v1.10.6
+kubernetesVersion: v1.33.3
 endpoint: https://10.0.0.32:6443
 domain: sekibanki.prettysunflower.moe
 allowSchedulingOnControlPlanes: true