マニフェストの更新

k8s/manifest/bind9/configmap-svc-zone.yaml

@@ -14,6 +14,6 @@ data:
             86400 )    ; Minimum TTL
 
         IN  NS  ns.svc.technotut.net.
-    ns  IN  A   10.11.254.254
+    ns  IN  A   10.12.254.254
     pa  IN  A   192.168.12.126
     drive  IN  A  192.168.30.199

k8s/manifest/bind9/service.yaml

@@ -9,7 +9,7 @@ spec:
   selector:
     app: bind
   type: LoadBalancer
-  loadBalancerIP: 10.11.254.254
+  loadBalancerIP: 10.12.254.254
   ports:
     - name: dns-tcp
       protocol: TCP

k8s/manifest/blt-xz/debian13-svc.yaml

@@ -9,7 +9,7 @@ spec:
   selector:
     vm.kubevirt.io/name: blt-xz
   type: LoadBalancer
-  loadBalancerIP: 10.11.210.253
+  loadBalancerIP: 10.12.210.253
   ports:
     - name: ssh
       port: 22

k8s/manifest/blt-xz/novnc-deploy.yaml

@@ -18,7 +18,7 @@ spec:
       containers:
       - name: novnc
         image: ghcr.io/technotut/novnc:main
-        args: ["6080", "10.11.210.253:5901"]
+        args: ["6080", "10.12.210.253:5901"]
         imagePullPolicy: Always
         ports:
         - containerPort: 6080

k8s/manifest/blt/debian13-datavolume.yaml

@@ -0,0 +1,19 @@
+apiVersion: cdi.kubevirt.io/v1beta1
+kind: DataVolume
+metadata:
+  name: blt-dv
+  namespace: blt
+spec:
+  source:
+    http:
+      url: "https://cdimage.debian.org/images/cloud/trixie/latest/debian-13-generic-amd64.raw"
+
+  pvc:
+    accessModes:
+      - ReadWriteOnce
+
+    resources:
+      requests:
+        storage: 15Gi
+
+    storageClassName: local-path

k8s/manifest/blt/debian13-svc.yaml

@@ -9,7 +9,7 @@ spec:
   selector:
     vm.kubevirt.io/name: blt
   type: LoadBalancer
-  loadBalancerIP: 10.11.210.254
+  loadBalancerIP: 10.12.210.254
   ports:
     - name: ssh
       port: 22

k8s/manifest/blt/debian13-vm.yaml

@@ -5,13 +5,16 @@ metadata:
   namespace: blt
   labels:
     kubevirt.io/os: linux
+
 spec:
   runStrategy: Always
+
   template:
     spec:
       domain:
         cpu:
           cores: 2
+
         devices:
           disks:
           - disk:
@@ -26,10 +29,11 @@ spec:
             masquerade: {}
           - name: vlan10
             bridge: {}
-          - name: vlan30
+          - name: vlan20
             bridge: {}
         machine:
           type: q35
+
         resources:
           requests:
             memory: 4096M
@@ -39,47 +43,102 @@ spec:
       - name: vlan10
         multus:
           networkName: kube-public/vlan10-bridge
-      - name: vlan30
+      - name: vlan20
         multus:
-          networkName: kube-public/vlan30-bridge
+          networkName: kube-public/vlan20-bridge
       volumes:
-      - name: disk0
-        persistentVolumeClaim:
-          claimName: blt-pvc
-      - cloudInitNoCloud:
-          userData: |
-            #cloud-config
-            hostname: blt
-            ssh_pwauth: true
-            disable_root: false
-            chpasswd:
-              list: |
-                root:password
-                debian:password
-              expire: False
-            packages:
-              - ifupdown
-
-            write_files:
-              - path: /etc/network/interfaces
-                content: |
-                  auto lo
-                  iface lo inet loopback
-
-                  auto enp1s0
-                  iface enp1s0 inet dhcp
-
-                  auto enp2s0
-                  iface enp2s0 inet static
-                          address 192.168.13.100
-                          netmask 255.255.255.0
-
-                  auto enp3s0
-                  iface enp3s0 inet dhcp
-                          address 10.14.0.100
-                          netmask 255.255.0.0
-
-          runcmd:
-            - ifdown -a || true
-            - ifup -a
-        name: cloudinitdisk
+        - name: disk0
+          dataVolume:
+            name: blt-dv
+
+        - name: cloudinitdisk
+          cloudInitNoCloud:
+            userData: |
+              #cloud-config
+
+              hostname: blt
+              ssh_pwauth: true
+              disable_root: false
+
+              users:
+                - default
+
+              chpasswd:
+                users:
+                  - name: root
+                    password: password
+                    type: text
+                  - name: debian
+                    password: password
+                    type: text
+                expire: false
+
+              packages:
+                - openjdk-21-jre
+                - curl
+                - ca-certificates
+                - xfce4
+                - xfce4-goodies
+                - lightdm
+                - xorg
+                - dbus-x11
+
+              write_files:
+                - path: /etc/network/interfaces
+                  owner: root:root
+                  permissions: "0644"
+                  content: |
+                    auto lo
+                    iface lo inet loopback
+
+                    auto enp1s0
+                    iface enp1s0 inet dhcp
+                    auto enp2s0
+                    iface enp2s0 inet dhcp
+                    auto enp3s0
+                    iface enp3s0 inet dhcp
+                - path: /home/debian/.config/autostart/blt.desktop
+                  owner: debian:debian
+                  permissions: "0644"
+                  defer: true
+                  content: |
+                    [Desktop Entry]
+                    Type=Application
+                    Name=Beat Link Trigger
+                    Exec=/usr/bin/java -jar /opt/blt/beat-link-trigger.jar
+                    Terminal=false
+                    X-GNOME-Autostart-enabled=true
+
+                - path: /etc/lightdm/lightdm.conf.d/50-autologin.conf
+                  owner: root:root
+                  permissions: "0644"
+                  defer: true
+                  content: |
+                    [Seat:*]
+                    autologin-user=debian
+                    autologin-user-timeout=0
+                    autologin-session=xfce
+
+              runcmd:
+                - install -d -o debian -g debian /home/debian/.config/autostart
+                - install -d -o root -g root /etc/lightdm/lightdm.conf.d
+                - install -d -o debian -g debian /opt/blt
+
+                - curl -fL --retry 3 --retry-delay 5 -o /opt/blt/beat-link-trigger.jar https://github.com/Deep-Symmetry/beat-link-trigger/releases/download/latest-preview/beat-link-trigger-8.1.0-Preview.jar
+
+                - chown debian:debian /opt/blt/beat-link-trigger.jar
+                - chmod 0644 /opt/blt/beat-link-trigger.jar
+
+                - systemctl disable --now blt.service || true
+                - rm -f /etc/systemd/system/blt.service
+                - systemctl daemon-reload
+                - systemctl reset-failed || true
+
+                - systemctl enable lightdm
+                - systemctl set-default graphical.target
+
+              power_state:
+                mode: reboot
+                message: Reboot after cloud-init setup
+                timeout: 300
+                condition: true

k8s/manifest/blt/novnc-deploy.yaml

@@ -18,7 +18,7 @@ spec:
       containers:
       - name: novnc
         image: ghcr.io/technotut/novnc:main
-        args: ["6080", "10.11.210.254:5901"]
+        args: ["6080", "10.12.210.254:5901"]
         imagePullPolicy: Always
         ports:
         - containerPort: 6080

k8s/manifest/blt/xrdp-config.yaml

@@ -286,7 +286,7 @@ data:
     [vnc-any]
     name=vnc-any
     lib=libvnc.so
-    ip=10.11.210.254
+    ip=10.12.210.254
     port=5901
     username=debian
     password=password

k8s/manifest/cam1/cam1-coredns-service.yml

@@ -7,7 +7,7 @@ spec:
   type: LoadBalancer
   selector:
     k8s-app: coredns
-  loadBalancerIP: 10.11.77.253
+  loadBalancerIP: 10.12.77.253
   ports:
     - name: dns
       port: 53

k8s/manifest/cam1/cam1-nginx-service.yml

@@ -11,7 +11,7 @@ spec:
   selector:
     app: cam1-sonycam-nginx
   type: LoadBalancer
-  loadBalancerIP: 10.11.77.252
+  loadBalancerIP: 10.12.77.252
   ports:
     - name: rtmp
       protocol: TCP

k8s/manifest/cam2/cam2-coredns-service.yml

@@ -7,7 +7,7 @@ spec:
   type: LoadBalancer
   selector:
     k8s-app: coredns
-  loadBalancerIP: 10.11.77.254
+  loadBalancerIP: 10.12.77.254
   ports:
     - name: dns
       port: 53

k8s/manifest/cam2/cam2-nginx-service.yml

@@ -11,7 +11,7 @@ spec:
   selector:
     app: cam2-sonycam-nginx
   type: LoadBalancer
-  loadBalancerIP: 10.11.77.251
+  loadBalancerIP: 10.12.77.251
   ports:
     - name: rtmp
       protocol: TCP

k8s/manifest/dmx/service.yaml

@@ -9,7 +9,7 @@ spec:
   selector:
     app: qlcplus
   type: LoadBalancer
-  loadBalancerIP: 10.11.240.254
+  loadBalancerIP: 10.12.240.254
   ports:
   - name: artnet
     protocol: UDP

k8s/manifest/ndi/ndi-service.yml

@@ -11,7 +11,7 @@ spec:
   selector:
     app: ndi-discovery-server
   type: LoadBalancer
-  loadBalancerIP: 10.11.230.254
+  loadBalancerIP: 10.12.230.254
   ports:
     - name: ndi
       protocol: TCP

k8s/setup/bind9/externaldns.yaml

@@ -82,7 +82,7 @@ spec:
         - --txt-prefix=external-dns-
         - --txt-owner-id=k8s
         - --provider=rfc2136
-        - --rfc2136-host=10.11.254.254
+        - --rfc2136-host=10.12.254.254
         - --rfc2136-port=53
         - --rfc2136-zone=svc.technotut.net
         - --rfc2136-tsig-secret=Tq/74pwBk4hTAJEMrtc8gr6ReE06OrK2qbHdhcSkSTA=

k8s/setup/calico-manifest/bgpconfig.yaml

@@ -7,4 +7,4 @@ spec:
   nodeToNodeMeshEnabled: false
   asNumber: 64646
   serviceLoadBalancerIPs:
-    - cidr: 10.11.0.0/16
+    - cidr: 10.12.0.0/16

k8s/setup/calico-manifest/bgppeer.yaml

@@ -3,5 +3,5 @@ kind: BGPPeer
 metadata:
   name: bgp-peer
 spec:
-  peerIP: 192.168.30.1
+  peerIP: 192.168.99.129
   asNumber: 64646

k8s/setup/metallb/metallb-ipaddresspool.yaml

@@ -5,4 +5,4 @@ metadata:
   namespace: metallb-system
 spec:
   addresses:
-  - 10.11.0.0/16
+  - 10.12.0.0/16