diff --git a/cli/pkg/common/kube_runtime.go b/cli/pkg/common/kube_runtime.go index 1751a64c3..a9b3fad50 100755 --- a/cli/pkg/common/kube_runtime.go +++ b/cli/pkg/common/kube_runtime.go @@ -256,13 +256,14 @@ type Frp struct { } func NewArgument() *Argument { + si := connector.GetSystemInfo() arg := &Argument{ KsEnable: true, KsVersion: DefaultKubeSphereVersion, InstallPackages: false, SKipPushImages: false, ContainerManager: Containerd, - SystemInfo: connector.GetSystemInfo(), + SystemInfo: si, Storage: &Storage{ StorageType: ManagedMinIO, }, @@ -286,6 +287,7 @@ func NewArgument() *Argument { arg.IsCloudInstance, _ = strconv.ParseBool(os.Getenv(ENV_TERMINUS_IS_CLOUD_VERSION)) arg.PublicNetworkInfo.PubliclyAccessible, _ = strconv.ParseBool(os.Getenv(ENV_PUBLICLY_ACCESSIBLE)) arg.IsOlaresInContainer = os.Getenv("CONTAINER_MODE") == "oic" + si.IsOIC = arg.IsOlaresInContainer if err := arg.LoadReleaseInfo(); err != nil { fmt.Printf("error loading release info: %v", err) diff --git a/cli/pkg/core/connector/system.go b/cli/pkg/core/connector/system.go index af68712ca..c9e0ed7ff 100644 --- a/cli/pkg/core/connector/system.go +++ b/cli/pkg/core/connector/system.go @@ -114,6 +114,7 @@ type SystemInfo struct { LocalIp string `json:"local_ip"` NatGateway string `json:"nat_gateway"` PkgManager string `json:"pkg_manager"` + IsOIC bool `json:"is_oic,omitempty"` } func (s *SystemInfo) IsSupport() error { @@ -217,7 +218,7 @@ func (s *SystemInfo) IsPveOrPveLxc() bool { } func (s *SystemInfo) IsWsl() bool { - return s.HostInfo.OsPlatform == common.WSL + return s.HostInfo.OsPlatform == common.WSL && !s.IsOIC } func (s *SystemInfo) IsRaspbian() bool {