Merge remote-tracking branch 'upstream/master'

fmoral2 · Apr 19, 2024 · 0627888 · 0627888
2 parents 252bb9b + 63fe2ca
commit 0627888
Show file tree

Hide file tree

Showing 109 changed files with 5,761 additions and 2,734 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -32,7 +32,6 @@ steps:
   - name: validate-release
     image: rancher/dapper:v0.5.5
     commands:
-      - docker pull --quiet rancher/hardened-build-base:v1.20.4b11
       - dapper -f Dockerfile --target dapper make validate-release
     volumes:
       - name: docker
@@ -52,8 +51,7 @@ steps:
       AWS_SECRET_ACCESS_KEY:
         from_secret: AWS_SECRET_ACCESS_KEY-rke2-ci-uploader     
     commands:
-      - docker pull --quiet rancher/hardened-build-base:v1.20.4b11
-      - docker pull --quiet alpine:3.17
+      - docker pull --quiet alpine:3.18
       - dapper -f Dockerfile --target dapper make dapper-ci
     volumes:
       - name: docker
@@ -88,7 +86,6 @@ steps:
   - name: package-images
     image: rancher/dapper:v0.5.5
     commands:
-      - docker pull --quiet rancher/hardened-build-base:v1.20.4b11
       - dapper -f Dockerfile --target dapper make package-images
     volumes:
       - name: docker
@@ -139,7 +136,7 @@ steps:
           - refs/tags/*
 
   - name: publish-image-runtime
-    image: rancher/hardened-build-base:v1.20.4b11
+    image: rancher/hardened-build-base:v1.21.9b1
     commands:
       - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
       - DRONE_TAG=${DRONE_TAG} make publish-image-runtime
@@ -163,7 +160,6 @@ steps:
   - name: package-windows-images
     image: rancher/dapper:v0.5.5
     commands:
-      - docker pull --quiet rancher/hardened-build-base:v1.20.4b11
       - dapper -f Dockerfile --target dapper make package-windows-images
     when:
       event:
@@ -234,7 +230,6 @@ steps:
   - name: validate-release
     image: rancher/dapper:v0.5.5
     commands:
-      - docker pull --quiet rancher/hardened-build-base:v1.20.4b11
       - dapper -f Dockerfile --target dapper make validate-release
     volumes:
       - name: docker
@@ -254,8 +249,7 @@ steps:
       AWS_SECRET_ACCESS_KEY:
         from_secret: AWS_SECRET_ACCESS_KEY-rke2-ci-uploader     
     commands:
-      - docker pull --quiet rancher/hardened-build-base:v1.20.4b11
-      - docker pull --quiet alpine:3.17
+      - docker pull --quiet alpine:3.18
       - dapper -f Dockerfile --target dapper make dapper-ci
     volumes:
       - name: docker
@@ -290,7 +284,6 @@ steps:
   - name: package-images
     image: rancher/dapper:v0.5.5
     commands:
-      - docker pull --quiet rancher/hardened-build-base:v1.20.4b11
       - dapper -f Dockerfile --target dapper make package-images
     volumes:
       - name: docker
@@ -319,7 +312,7 @@ steps:
           - refs/tags/*
 
   - name: publish-image-runtime
-    image: rancher/hardened-build-base:v1.20.4b11
+    image: rancher/hardened-build-base:v1.21.9b1
     commands:
       - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
       - DRONE_TAG=${DRONE_TAG} make publish-image-runtime
@@ -361,114 +354,6 @@ steps:
         - refs/head/master
         - refs/tags/*
 
-volumes:
-  - name: docker
-    host:
-      path: /var/run/docker.sock
----
-kind: pipeline
-type: docker
-name: build-s390x
-
-platform:
-  os: linux
-  arch: amd64
-
-node:
-  arch: s390x
-
-clone:
-  retries: 3
-
-steps:
-  - name: skipfiles
-    image: alpine/git:v2.30.2-s390x
-    commands:
-      - export NAME=$(test $DRONE_BUILD_EVENT = pull_request && echo remotes/origin/${DRONE_COMMIT_BRANCH:-master} || echo ${DRONE_COMMIT_SHA}~)
-      - export DIFF=$(git --no-pager diff --name-only $NAME | grep -v -f .droneignore);
-      - if [ -z "$DIFF" ]; then
-            echo "All files in PR are on ignore list";
-            exit 78;
-        else
-            echo "Some files in PR are not ignored, $DIFF";
-        fi;
-    when:
-      ref:
-        include:
-          - refs/heads/master
-          - refs/heads/release-*
-          - refs/pull/**
-
-  - name: build
-    image: rancher/dapper:v0.5.8
-    commands:
-      - dapper -f Dockerfile --target dapper make dapper-ci
-    volumes:
-      - name: docker
-        path: /var/run/docker.sock
-    when:
-      ref:
-        include:
-          - refs/heads/master
-          - refs/heads/release-*
-          - refs/pull/**
-          - refs/tags/*
-
-  - name: package-images
-    image: rancher/dapper:v0.5.8
-    commands:
-      - dapper -f Dockerfile --target dapper make package-images
-    volumes:
-      - name: docker
-        path: /var/run/docker.sock
-    when:
-      event:
-        - tag
-      instance:
-        - drone-publish.rancher.io
-
-  - name: publish-image-runtime
-    image: rancher/hardened-build-base:v1.20.4b11
-    commands:
-      - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-      - DRONE_TAG=${DRONE_TAG} make publish-image-runtime
-    environment:
-      DOCKER_PASSWORD:
-        from_secret: docker_password
-      DOCKER_USERNAME:
-        from_secret: docker_username
-    volumes:
-      - name: docker
-        path: /var/run/docker.sock
-    when:
-      event:
-        - tag
-      instance:
-        - drone-publish.rancher.io
-      ref:
-        - refs/head/master
-        - refs/tags/*
-
-  - name: publish-dist-artifacts
-    image: rancher/drone-images:github-release-s390x
-    settings:
-      api_key:
-        from_secret: github_token
-      checksum:
-        - sha256
-      checksum_file: CHECKSUMsum-s390x.txt
-      checksum_flatten: true
-      files:
-        - dist/artifacts/*
-      prerelease: true
-    when:
-      event:
-        - tag
-      instance:
-        - drone-publish.rancher.io
-      ref:
-        - refs/head/master
-        - refs/tags/*
 volumes:
   - name: docker
     host:
@@ -534,7 +419,6 @@ volumes:
 depends_on:
   - build-amd64
   - build-arm64
-  - build-s390x
 ---
 kind: pipeline
 type: docker
@@ -585,5 +469,4 @@ steps:
 depends_on:
   - build-amd64
   - build-arm64
-  - build-s390x
 ...
diff --git a/.droneignore b/.droneignore
@@ -1,7 +1,7 @@
 ^.*\.md$
 ^install\.sh$
 ^\.droneignore$
-^\.github/*$
+^\.github\/.*$
 ^MAINTAINERS$
 ^CODEOWNERS$
 ^LICENSE$

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -23,7 +23,7 @@ Cluster Configuration:
 <!-- A clear and concise description of what the bug is. -->
 
 **Steps To Reproduce:**
-<!-- Steps to reproduce the behavior. Please include as the first step how you installed RKE2 on the node(s) (including all flags or environment variables). If you have customized configuration via systemd drop-ins or overrides (https://coreos.com/os/docs/latest/using-systemd-drop-in-units.html) please include those as well. -->
+<!-- Steps to reproduce the behavior. Please include as the first step how you installed RKE2 on the node(s) (including all flags or environment variables). If you have customized configuration via systemd drop-ins or overrides (https://wiki.archlinux.org/title/systemd#Drop-in_files) please include those as well. -->
 - Installed RKE2: 
 
 **Expected behavior:**

diff --git a/.github/actions/vagrant-setup/action.yaml b/.github/actions/vagrant-setup/action.yaml
@@ -0,0 +1,33 @@
+name: 'Setup Vagrant and Libvirt'
+description: 'A composite action that installs latest versions of vagrant and libvirt for use on ubuntu based runners'
+runs:
+  using: 'composite'
+  steps:
+    - name: Add vagrant to apt-get sources
+      shell: bash
+      run: |
+        curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
+        echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
+        sudo sed -i 's/^# deb-src/deb-src/' /etc/apt/sources.list
+    - name: Install vagrant and libvirt
+      shell: bash
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libvirt-daemon libvirt-daemon-system vagrant
+        sudo systemctl enable --now libvirtd
+    - name: Build vagrant dependencies
+      shell: bash
+      run: |
+        sudo apt-get build-dep -y vagrant ruby-libvirt
+        sudo apt-get install -y --no-install-recommends libxslt-dev libxml2-dev libvirt-dev ruby-bundler ruby-dev zlib1g-dev
+    # This is a workaround for the libvirt group not being available in the current shell
+    # https://github.com/actions/runner-images/issues/7670#issuecomment-1900711711
+    - name: Make the libvirt socket rw accessible to everyone
+      shell: bash
+      run: |
+        sudo chmod a+rw /var/run/libvirt/libvirt-sock
+    
+
+    - name: Install vagrant-libvirt plugin
+      shell: bash
+      run: vagrant plugin install vagrant-libvirt
diff --git a/.github/stale.yml b/.github/stale.yml
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
diff --git a/.github/workflows/epic.yaml b/.github/workflows/epic.yaml