From ed8bafb93d7fc507f6f95c7371f5e752c8fad7dd Mon Sep 17 00:00:00 2001 From: Artur Troian Date: Thu, 22 Aug 2024 16:09:20 -0500 Subject: [PATCH 1/2] ci: bump docker login (#254) Signed-off-by: Artur Troian --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 234b5e54..a80acd60 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -40,7 +40,7 @@ jobs: - name: release version run: echo "RELEASE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV - name: Login to GHCR - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} From 83484f2e4f3452205808b0c90d4eac4396be44a3 Mon Sep 17 00:00:00 2001 From: Artur Troian Date: Thu, 26 Sep 2024 08:23:51 -0400 Subject: [PATCH 2/2] fix(cluster): recover cluster params on provider restart (#252) Signed-off-by: Artur Troian --- cluster/inventory.go | 5 ++++- cluster/inventory_test.go | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cluster/inventory.go b/cluster/inventory.go index c0095635..d7f6cf8c 100644 --- a/cluster/inventory.go +++ b/cluster/inventory.go @@ -142,7 +142,10 @@ func newInventoryService( reservations := make([]*reservation, 0, len(deployments)) for _, d := range deployments { - reservations = append(reservations, newReservation(d.LeaseID().OrderID(), d.ManifestGroup())) + res := newReservation(d.LeaseID().OrderID(), d.ManifestGroup()) + res.SetClusterParams(d.ClusterParams()) + + reservations = append(reservations, res) } go is.lc.WatchChannel(ctx.Done()) diff --git a/cluster/inventory_test.go b/cluster/inventory_test.go index 899169cf..4047a9e3 100644 --- a/cluster/inventory_test.go +++ b/cluster/inventory_test.go @@ -29,6 +29,7 @@ import ( cmocks "github.com/akash-network/provider/cluster/types/v1beta3/mocks" "github.com/akash-network/provider/event" "github.com/akash-network/provider/operator/waiter" + crd "github.com/akash-network/provider/pkg/apis/akash.network/v2beta2" aclient "github.com/akash-network/provider/pkg/client/clientset/versioned" afake "github.com/akash-network/provider/pkg/client/clientset/versioned/fake" "github.com/akash-network/provider/tools/fromctx" @@ -187,6 +188,8 @@ func TestInventory_ClusterDeploymentDeployed(t *testing.T) { } deployment.On("ManifestGroup").Return(&group) + deployment.On("ClusterParams").Return(crd.ClusterSettings{}) + deployments[0] = deployment clusterClient := &mocks.Client{}