From ff0bbca8e24962258e2794259573bdfb1bc07c8e Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Mon, 9 Oct 2023 19:17:37 +0000 Subject: [PATCH 1/5] kairos base version to 2.4.1 Signed-off-by: Arun Sharma --- .github/workflows/publish.yaml | 6 +++--- .github/workflows/pull_request.yaml | 6 +++--- Earthfile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 19bd30c..b33ad7b 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -13,9 +13,9 @@ jobs: 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 + - quay.io/kairos/core-opensuse-leap:v2.4.1 + - quay.io/kairos/core-ubuntu-20-lts:v2.4.1 + - quay.io/kairos/core-ubuntu-22-lts:v2.4.1 rke2-version: - v1.26.4+rke2r1 - v1.25.3+rke2r1 diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 7546200..85a7af4 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -42,9 +42,9 @@ jobs: 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 + - quay.io/kairos/core-opensuse-leap:v2.4.1 + - quay.io/kairos/core-ubuntu-20-lts:v2.4.1 + - quay.io/kairos/core-ubuntu-22-lts:v2.4.1 rke2-version: - v1.26.4+rke2r1 - v1.25.2+rke2r1 diff --git a/Earthfile b/Earthfile index d2b3b77..d283fc0 100644 --- a/Earthfile +++ b/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.1 ARG IMAGE_REPOSITORY=quay.io/kairos ARG LUET_VERSION=0.34.0 From 496497667712ea77af9ab227ddf6228535daa808 Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Tue, 20 Feb 2024 09:42:56 +0000 Subject: [PATCH 2/5] PE-3373: waiting for content extraction Signed-off-by: Arun Sharma --- main.go | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/main.go b/main.go index 19a6c69..a0839bc 100644 --- a/main.go +++ b/main.go @@ -113,17 +113,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", From bf81788efbcfdfcaa46c3dbb6d5b850f826a1ad5 Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Tue, 20 Feb 2024 09:56:29 +0000 Subject: [PATCH 3/5] version update Signed-off-by: Arun Sharma --- .github/workflows/publish.yaml | 6 +++--- .github/workflows/pull_request.yaml | 6 +++--- Earthfile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index b33ad7b..1f57ef6 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -13,9 +13,9 @@ jobs: strategy: matrix: base-image: - - quay.io/kairos/core-opensuse-leap:v2.4.1 - - quay.io/kairos/core-ubuntu-20-lts:v2.4.1 - - quay.io/kairos/core-ubuntu-22-lts:v2.4.1 + - quay.io/kairos/core-opensuse-leap:v2.4.3 + - quay.io/kairos/core-ubuntu-20-lts:v2.4.3 + - quay.io/kairos/core-ubuntu-22-lts:v2.4.3 rke2-version: - v1.26.4+rke2r1 - v1.25.3+rke2r1 diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 85a7af4..edbcca8 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -42,9 +42,9 @@ jobs: strategy: matrix: base-image: - - quay.io/kairos/core-opensuse-leap:v2.4.1 - - quay.io/kairos/core-ubuntu-20-lts:v2.4.1 - - quay.io/kairos/core-ubuntu-22-lts:v2.4.1 + - quay.io/kairos/core-opensuse-leap:v2.4.3 + - quay.io/kairos/core-ubuntu-20-lts:v2.4.3 + - quay.io/kairos/core-ubuntu-22-lts:v2.4.3 rke2-version: - v1.26.4+rke2r1 - v1.25.2+rke2r1 diff --git a/Earthfile b/Earthfile index d283fc0..b4cc31d 100644 --- a/Earthfile +++ b/Earthfile @@ -1,7 +1,7 @@ VERSION 0.6 FROM alpine -ARG BASE_IMAGE=quay.io/kairos/core-opensuse-leap:v2.4.1 +ARG BASE_IMAGE=quay.io/kairos/core-opensuse-leap:v2.4.3 ARG IMAGE_REPOSITORY=quay.io/kairos ARG LUET_VERSION=0.34.0 From 00dda69b7bb81849feac9f573153e58391373452 Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Tue, 20 Feb 2024 10:38:56 +0000 Subject: [PATCH 4/5] fixes Signed-off-by: Arun Sharma --- .github/workflows/publish.yaml | 49 ----------------------------- .github/workflows/pull_request.yaml | 27 +--------------- 2 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 .github/workflows/publish.yaml diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml deleted file mode 100644 index 1f57ef6..0000000 --- a/.github/workflows/publish.yaml +++ /dev/null @@ -1,49 +0,0 @@ -name: Publish - -on: - push: - tags: - - v* - -jobs: - images: - runs-on: ubuntu-latest - permissions: - id-token: write - strategy: - matrix: - base-image: - - quay.io/kairos/core-opensuse-leap:v2.4.3 - - quay.io/kairos/core-ubuntu-20-lts:v2.4.3 - - quay.io/kairos/core-ubuntu-22-lts:v2.4.3 - rke2-version: - - v1.26.4+rke2r1 - - v1.25.3+rke2r1 - - v1.25.2+rke2r1 - - v1.25.0+rke2r1 - - v1.24.7+rke2r1 - - v1.24.6+rke2r1 - - v1.24.4+rke2r1 - - v1.23.12+rke2r1 - - v1.23.13+rke2r1 - - v1.23.10+rke2r1 - - v1.22.15+rke2r1 - - v1.22.13+rke2r1 - platform: - - linux/amd64 - env: - REGISTRY: quay.io - REGISTRY_USER: ${{ secrets.QUAY_USERNAME }} - REGISTRY_PASSWORD: ${{ secrets.QUAY_PASSWORD }} - steps: - - uses: actions/checkout@v2 - - uses: docker-practice/actions-setup-docker@master - - uses: earthly/actions-setup@v1 - with: - version: "v0.6.30" - - run: echo $REGISTRY_PASSWORD | docker login -u $REGISTRY_USER --password-stdin $REGISTRY - - run: env | grep ACTIONS_ID_TOKEN_REQUEST > .env - - run: env | grep REGISTRY >> .env - - run: earthly --ci --push --platform=${{ matrix.platform }} +docker --RKE2_VERSION=${{ matrix.rke2-version }} --BASE_IMAGE=${{ matrix.base-image }} - - run: earthly --ci +cosign --RKE2_VERSION=${{ matrix.rke2-version }} --BASE_IMAGE=${{ matrix.base-image }} - diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index edbcca8..6bf94ac 100644 --- a/.github/workflows/pull_request.yaml +++ b/.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.4.3 - - quay.io/kairos/core-ubuntu-20-lts:v2.4.3 - - quay.io/kairos/core-ubuntu-22-lts:v2.4.3 - 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 \ No newline at end of file From c7f1bb4dc9fdb824527fc31836746c30b9e1371c Mon Sep 17 00:00:00 2001 From: Arun Sharma Date: Tue, 20 Feb 2024 11:17:01 +0000 Subject: [PATCH 5/5] fixes Signed-off-by: Arun Sharma --- scripts/import.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/import.sh b/scripts/import.sh index c0c8b6a..83756e2 100644 --- a/scripts/import.sh +++ b/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