Merge remote-tracking branch 'origin/main' into se/merge-upstream

Author: Stuart Espey

.codespell-ignore

@@ -0,0 +1,6 @@
+AtLeast
+destOp
+ECT
+inport
+renderD
+requestor

.devcontainer/Dockerfile

@@ -50,6 +50,7 @@ RUN sed -r -i 's/^Components: main$/Components: main contrib/g' /etc/apt/sources
       lxc-templates \
       make \
       man-db \
+      pipx \
       pkg-config \
       protoc-gen-go \
       python3-matplotlib \
@@ -69,6 +70,9 @@ RUN sed -r -i 's/^Components: main$/Components: main contrib/g' /etc/apt/sources
       # zfsutils-linux
       xz-utils
 
+# With pipx >= 1.5.0, we could use pipx --global instead.
+RUN PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install codespell
+
 # Add vscode user and add it to sudoers.
 RUN groupadd -g 1000 $USERNAME && \
     useradd -s /bin/bash -u $USER_UID -g $USER_GID -m $USERNAME && \

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,66 @@
+name: Bug report
+description: File a bug report.
+type: bug
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    description: Please search to see if an issue already exists for the bug you encountered.
+    options:
+    - label: There is no existing issue for this bug
+      required: true
+
+- type: checkboxes
+  attributes:
+    label: Is this happening on an up to date version of Incus?
+    description: Please make sure that your system has all updates applied and is running a current version of Incus or Incus LTS.
+    options:
+    - label: This is happening on a supported version of Incus
+      required: true
+
+- type: textarea
+  attributes:
+    label: Incus system details
+    description: Output of `incus info`.
+    render: yaml
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Instance details
+    description: If the issue affects an  instance, please include the output of `incus config show NAME`.
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Instance log
+    description: If the issue is related to an instance startup failure, please include `incus info --show-log NAME`.
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Current behavior
+    description: A concise description of what you're experiencing.
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Expected behavior
+    description: A concise description of what you expected to happen.
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Steps to reproduce
+    description: Step by step instructions to reproduce the behavior.
+    placeholder: |
+      1. Step one
+      2. Step two
+      3. Step three
+  validations:
+    required: true

.github/ISSUE_TEMPLATE/bug-reports.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Support question
+    url: https://discuss.linuxcontainers.org
+    about: Please ask and answer questions here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,25 @@
+name: Feature request
+description: File a feature request.
+type: feature
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    description: Please search to see if an issue already exists for the feature you'd like to see added.
+    options:
+    - label: There is no existing issue for this feature
+      required: true
+
+- type: textarea
+  attributes:
+    label: What are you currently unable to do
+    description: A concise description of the problem you're trying to solve.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: What do you think would need to be added
+    description: A concise description of what you think should be added to Incus.
+  validations:
+    required: false

.github/ISSUE_TEMPLATE/feature-requests.yml

@@ -90,10 +90,13 @@ jobs:
             libtool \
             libudev-dev \
             make \
+            pipx \
             pkg-config \
             shellcheck
 
-          python3 -m pip install flake8
+          # With pipx >= 1.5.0, we could use pipx --global instead.
+          PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin \
+            pipx install codespell flake8
 
       - name: Fix repository permissions
         run: |
@@ -137,6 +140,7 @@ jobs:
           - lvm
           - zfs
           - ceph
+          - linstor
           - random
         os:
           - ubuntu-22.04
@@ -388,6 +392,48 @@ jobs:
           sudo microceph.ceph status
           sudo rm -f /snap/bin/rbd
 
+      - name: Setup LINSTOR
+        if: ${{ matrix.backend == 'linstor' }}
+        run: |
+          set -x
+
+          # As with Ceph, we hope for a spare disk.
+          if [ "$(stat -c '%d' /)" = "$(stat -c '%d' /mnt)" ]; then
+            echo "FAIL: rootfs and ephemeral part on the same disk, aborting"
+            exit 1
+          fi
+
+          sudo add-apt-repository ppa:linbit/linbit-drbd9-stack -y
+
+          # Install everything required to compile DRBD and run LINSTOR tools.
+          sudo apt-get install --no-install-recommends -y \
+            drbd-dkms \
+            linstor-client \
+            linstor-controller \
+            linstor-satellite \
+            linux-headers-generic \
+            python3-setuptools
+
+          # Enable DRBD.
+          sudo modprobe -r drbd
+          sudo modprobe drbd
+
+          # Get the runner IP.
+          runner_ip="$(hostname -I | cut -d' ' -f1)"
+
+          # Create a single local node.
+          sudo linstor node create local "${runner_ip}" --node-type combined
+
+          # Repurpose the ephemeral disk for LINSTOR physical storage.
+          sudo swapoff /mnt/swapfile
+          ephemeral_disk="$(findmnt --noheadings --output SOURCE --target /mnt | sed 's/[0-9]\+$//')"
+          sudo umount /mnt
+          sudo wipefs -a "${ephemeral_disk}"
+          sudo linstor physical-storage create-device-pool --storage-pool incus --pool-name linstor-incus lvmthin local "${ephemeral_disk}"
+
+          # Update the runner env.
+          echo "INCUS_LINSTOR_CLUSTER=${runner_ip}" >> "$GITHUB_ENV"
+
       - name: "Ensure offline mode (block image server)"
         run: |
           sudo nft add table inet filter
@@ -401,6 +447,7 @@ jobs:
           INCUS_CEPH_CLUSTER: "ceph"
           INCUS_CEPH_CEPHFS: "cephfs"
           INCUS_CEPH_CEPHOBJECT_RADOSGW: "http://127.0.0.1"
+          INCUS_LINSTOR_LOCAL_SATELLITE: "local"
           INCUS_CONCURRENT: "1"
           INCUS_VERBOSE: "1"
           INCUS_OFFLINE: "1"
@@ -410,7 +457,7 @@ jobs:
           chmod +x ~
           echo "root:1000000:1000000000" | sudo tee /etc/subuid /etc/subgid
           cd test
-          sudo --preserve-env=PATH,GOPATH,GITHUB_ACTIONS,INCUS_VERBOSE,INCUS_BACKEND,INCUS_CEPH_CLUSTER,INCUS_CEPH_CEPHFS,INCUS_CEPH_CEPHOBJECT_RADOSGW,INCUS_OFFLINE,INCUS_SKIP_TESTS,INCUS_REQUIRED_TESTS, INCUS_BACKEND=${{ matrix.backend }} ./main.sh ${{ matrix.suite }}
+          sudo --preserve-env=PATH,GOPATH,GITHUB_ACTIONS,INCUS_VERBOSE,INCUS_BACKEND,INCUS_CEPH_CLUSTER,INCUS_CEPH_CEPHFS,INCUS_CEPH_CEPHOBJECT_RADOSGW,INCUS_LINSTOR_LOCAL_SATELLITE,INCUS_LINSTOR_CLUSTER,INCUS_OFFLINE,INCUS_SKIP_TESTS,INCUS_REQUIRED_TESTS, INCUS_BACKEND=${{ matrix.backend }} ./main.sh ${{ matrix.suite }}
 
   client:
     name: Client