Merge pull request #59 from Dr-N00B/PE-3373

.github/workflows/pull_request.yaml

@@ -34,29 +34,4 @@ jobs:
  registry: ghcr.io
  username: ${{ github.repository_owner }}
  password: ${{ secrets.GITHUB_TOKEN }} 
- - run: earthly --ci +provider-package-all-platforms --IMAGE_REPOSITORY=ghcr.io/kairos-io
- build:
- runs-on: ubuntu-latest
- permissions:
- id-token: write
- strategy:
- matrix:
- base-image:
- - quay.io/kairos/core-opensuse-leap:v2.3.2
- - quay.io/kairos/core-ubuntu-20-lts:v2.3.2
- - quay.io/kairos/core-ubuntu-22-lts:v2.3.2
- rke2-version:
- - v1.26.4+rke2r1
- - v1.25.2+rke2r1
- - v1.24.6+rke2r1
- - v1.23.12+rke2r1
- - v1.22.15+rke2r1
- platform:
- - linux/amd64
- steps:
- - uses: actions/checkout@v2
- - uses: docker-practice/actions-setup-docker@master
- - uses: earthly/actions-setup@v1
- with:
- version: "v0.6.30"
- - run: earthly --ci --platform=${{ matrix.platform }} +docker --RKE2_VERSION=${{ matrix.rke2-version }} --BASE_IMAGE=${{ matrix.base-image }}
+ - run: earthly --ci +provider-package-all-platforms --IMAGE_REPOSITORY=ghcr.io/kairos-io

Earthfile

@@ -1,7 +1,7 @@
 VERSION 0.6
 FROM alpine
 
-ARG BASE_IMAGE=quay.io/kairos/core-opensuse-leap:v2.3.2
+ARG BASE_IMAGE=quay.io/kairos/core-opensuse-leap:v2.4.3
 ARG IMAGE_REPOSITORY=quay.io/kairos
 
 ARG LUET_VERSION=0.34.0

main.go

@@ -112,17 +112,24 @@ func clusterProvider(cluster clusterplugin.Cluster) yip.YipConfig {
  stages = append(stages, importStage)
  }
 
- stages = append(stages, yip.Stage{
- Name: "Enable Systemd Services",
- Systemctl: yip.Systemctl{
- Enable: []string{
- systemName,
- },
- Start: []string{
- systemName,
+ stages = append(stages,
+ yip.Stage{
+ Name: "Waiting to finish extracting content",
+ Commands: []string{
+ "sleep 120",
  },
  },
- })
+ yip.Stage{
+ Name: "Enable Systemd Services",
+ Systemctl: yip.Systemctl{
+ Enable: []string{
+ systemName,
+ },
+ Start: []string{
+ systemName,
+ },
+ },
+ })
 
  cfg := yip.YipConfig{
  Name: "RKE2 Kairos Cluster Provider",

scripts/import.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -x
 
 CONTENT_PATH=$1
-mkdir -p /var/lib/rancher/k3s/agent/images
+mkdir -p /var/lib/rancher/rke2/agent/images
 for tarfile in $(find $CONTENT_PATH -name "*.tar" -type f)
 do
  cp $tarfile /var/lib/rancher/rke2/agent/images