From b3a648fc769f30ba62a570c19062a3b5468f4e41 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Wed, 25 Aug 2021 21:02:50 +0800 Subject: [PATCH] feat(cloudcommon): move ignore_nonrunning_guests option to common --- pkg/apis/identity/consts.go | 1 + pkg/cloudcommon/options/options.go | 2 ++ pkg/compute/options/options.go | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/apis/identity/consts.go b/pkg/apis/identity/consts.go index 7131e0797c..a0faca16ff 100644 --- a/pkg/apis/identity/consts.go +++ b/pkg/apis/identity/consts.go @@ -109,6 +109,7 @@ var ( "customized_private_prefixes", "global_http_proxy", "global_https_proxy", + "ignore_nonrunning_guests", }, } diff --git a/pkg/cloudcommon/options/options.go b/pkg/cloudcommon/options/options.go index 795a4f52d4..1a0410069c 100644 --- a/pkg/cloudcommon/options/options.go +++ b/pkg/cloudcommon/options/options.go @@ -102,6 +102,8 @@ type BaseOptions struct { GlobalHTTPProxy string `help:"Global http proxy"` GlobalHTTPSProxy string `help:"Global https proxy"` + + IgnoreNonrunningGuests bool `default:"true" help:"Count memory for running guests only when do scheduling. Ignore memory allocation for non-running guests"` } const ( diff --git a/pkg/compute/options/options.go b/pkg/compute/options/options.go index 17977ab9b2..d3fe5df910 100644 --- a/pkg/compute/options/options.go +++ b/pkg/compute/options/options.go @@ -27,7 +27,6 @@ type ComputeOptions struct { DNSDomain string `help:"Domain suffix for virtual servers"` DNSResolvers []string `help:"Upstream DNS resolvers"` - IgnoreNonrunningGuests bool `default:"true" help:"Count memory for running guests only when do scheduling. Ignore memory allocation for non-running guests"` DefaultCPUOvercommitBound float32 `default:"8.0" help:"Default cpu overcommit bound for host, default to 8"` DefaultMemoryOvercommitBound float32 `default:"1.0" help:"Default memory overcommit bound for host, default to 1"` DefaultStorageOvercommitBound float32 `default:"1.0" help:"Default storage overcommit bound for storage, default to 1"`