refactor: increase resource limits on deployment

Signed-off-by: Artur Troian <[email protected]>
akash-network · Nov 8, 2023 · 50b604b · 50b604b
1 parent 75c73ef
commit 50b604b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/_run/common-kube.mk b/_run/common-kube.mk
@@ -64,7 +64,7 @@ kube-prepare-image-akash: RELEASE_DOCKER_IMAGE=ghcr.io/akash-network/node
 kube-prepare-image-akash:
 ifneq ($(SKIP_BUILD), true)
 ifeq ($(AKASH_BUILD_LOCAL_IMAGE), true)
-	make -C $(AKASHD_LOCAL_PATH) docker-image
+	$(AP_ROOT)/script/tools.sh build-akash $(AKASHD_LOCAL_PATH)
 else
 	docker pull $(AKASH_DOCKER_IMAGE)
 endif

diff --git a/bidengine/order_test.go b/bidengine/order_test.go
@@ -63,17 +63,17 @@ func makeMocks(s *orderTestScaffold) {
 	groupResult.Group.GroupSpec.Resources = make(dtypes.ResourceUnits, 1)
 
 	cpu := atypes.CPU{}
-	cpu.Units = atypes.NewResourceValue(uint64(dtypes.GetValidationConfig().MinUnitCPU))
+	cpu.Units = atypes.NewResourceValue(uint64(dtypes.GetValidationConfig().Unit.Min.CPU))
 
 	gpu := atypes.GPU{}
-	gpu.Units = atypes.NewResourceValue(uint64(dtypes.GetValidationConfig().MinUnitGPU))
+	gpu.Units = atypes.NewResourceValue(uint64(dtypes.GetValidationConfig().Unit.Min.GPU))
 
 	memory := atypes.Memory{}
-	memory.Quantity = atypes.NewResourceValue(dtypes.GetValidationConfig().MinUnitMemory)
+	memory.Quantity = atypes.NewResourceValue(dtypes.GetValidationConfig().Unit.Min.Memory)
 
 	storage := atypes.Volumes{
 		atypes.Storage{
-			Quantity: atypes.NewResourceValue(dtypes.GetValidationConfig().MinUnitStorage),
+			Quantity: atypes.NewResourceValue(dtypes.GetValidationConfig().Unit.Min.Storage),
 		},
 	}
 

diff --git a/go.mod b/go.mod
@@ -3,8 +3,8 @@ module github.com/akash-network/provider
 go 1.21
 
 require (
-	github.com/akash-network/akash-api v0.0.29
-	github.com/akash-network/node v0.24.2
+	github.com/akash-network/akash-api v0.0.31
+	github.com/akash-network/node v0.26.2
 	github.com/avast/retry-go/v4 v4.5.0
 	github.com/boz/go-lifecycle v0.1.1
 	github.com/cosmos/cosmos-sdk v0.45.16

diff --git a/go.sum b/go.sum
@@ -200,16 +200,16 @@ github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
-github.com/akash-network/akash-api v0.0.29 h1:S+GiYldK1UlpfHsSKOccQWGPsW3xqztwi5745lumgv4=
-github.com/akash-network/akash-api v0.0.29/go.mod h1:9aIEhpvAyGQJ4/p1cPo18lG67S0QGT//JLueAXqk6Kw=
+github.com/akash-network/akash-api v0.0.31 h1:2U2f7vN2eyLbSV7ombWyXnsFZ2ZfE4brjSMq46hkL3k=
+github.com/akash-network/akash-api v0.0.31/go.mod h1:pW5NnJNhxynCOUGEcgxa338GSU2qzMkpn3MMYcAY6O4=
 github.com/akash-network/cometbft v0.34.27-akash h1:V1dApDOr8Ee7BJzYyQ7Z9VBtrAul4+baMeA6C49dje0=
 github.com/akash-network/cometbft v0.34.27-akash/go.mod h1:BcCbhKv7ieM0KEddnYXvQZR+pZykTKReJJYf7YC7qhw=
 github.com/akash-network/ledger-go v0.14.3 h1:LCEFkTfgGA2xFMN2CtiKvXKE7dh0QSM77PJHCpSkaAo=
 github.com/akash-network/ledger-go v0.14.3/go.mod h1:NfsjfFvno9Kaq6mfpsKz4sqjnAVVEsVsnBJfKB4ueAs=
 github.com/akash-network/ledger-go/cosmos v0.14.3 h1:bEI9jLHM+Lm55idi4RfJlDez4/rVJs7E1MT0U2whYqI=
 github.com/akash-network/ledger-go/cosmos v0.14.3/go.mod h1:SjAfheQTE4rWk0ir+wjbOWxwj8nc8E4AZ08NdsvYG24=
-github.com/akash-network/node v0.24.2 h1:hbAKLUNIYH7ohgLVhV+vHXPyp2ur/xav/LPv/lge+aI=
-github.com/akash-network/node v0.24.2/go.mod h1:XI7OttMM4n2l8SmK80kN1YECw64I3y9Y6dasm7Ekjkw=
+github.com/akash-network/node v0.26.2 h1:BfXS7hmgxmOeacBDbhl9oaKwj1z6s8Fw93F/4zO/+z8=
+github.com/akash-network/node v0.26.2/go.mod h1:8ITKkFCowLQJnRNhagw1ELP41Ph7801dOiCfBNqThuI=
 github.com/alecthomas/participle/v2 v2.0.0-alpha7 h1:cK4vjj0VSgb3lN1nuKA5F7dw+1s1pWBe5bx7nNCnN+c=
 github.com/alecthomas/participle/v2 v2.0.0-alpha7/go.mod h1:NumScqsC42o9x+dGj8/YqsIfhrIQjFEOFovxotbBirA=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=

diff --git a/script/tools.sh b/script/tools.sh
@@ -27,8 +27,19 @@ function get_gotoolchain() {
     echo -n "$gotoolchain"
 }
 
+function build_akash() {
+    cd "$1" || exit 1
+    export AKASH_ROOT="$1"
+    source .env
+    make docker-image
+}
+
 case "$1" in
 gotoolchain)
     get_gotoolchain
     ;;
+build-akash)
+    shift
+    build_akash "$@"
+    ;;
 esac