Merge branch 'main' into get-manifest-endpoint

akash-network · Sep 26, 2024 · 4527e87 · 4527e87
2 parents ec82dd5 + 83484f2
commit 4527e87
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git 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 }}

diff --git 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
@@ -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{}