diff options
| author | JunYi Wu <wu65830600@163.com> | 2023-08-23 10:49:59 +0800 |
|---|---|---|
| committer | JunYi Wu <wu65830600@163.com> | 2023-09-11 14:15:35 +0800 |
| commit | fd84a6a9d6a2446e4d8c9797198e4807983d22ef (patch) | |
| tree | a2ab00527966757ca57396a779061649756515f3 | |
| parent | feat: use conditional compilation to complete edgecore windows configuration (diff) | |
| download | kubeedge-fd84a6a9d6a2446e4d8c9797198e4807983d22ef.tar.gz | |
feat: clean code
Signed-off-by: JunYi Wu <wu65830600@163.com>
7 files changed, 77 insertions, 297 deletions
diff --git a/common/constants/default.go b/common/constants/default.go index 1d55b63b6..5e5ec59e8 100644 --- a/common/constants/default.go +++ b/common/constants/default.go @@ -1,5 +1,3 @@ -//go:build !windows - package constants import ( @@ -30,38 +28,16 @@ const ( // Resources const ( - // Certificates - DefaultConfigDir = "/etc/kubeedge/config/" - DefaultCAFile = "/etc/kubeedge/ca/rootCA.crt" - DefaultCAKeyFile = "/etc/kubeedge/ca/rootCA.key" - DefaultCertFile = "/etc/kubeedge/certs/server.crt" - DefaultKeyFile = "/etc/kubeedge/certs/server.key" - DefaultServiceAccountIssuer = "https://kubernetes.default.svc.cluster.local" - DefaultCAURL = "/ca.crt" DefaultCertURL = "/edge.crt" DefaultNodeUpgradeURL = "/nodeupgrade" - DefaultStreamCAFile = "/etc/kubeedge/ca/streamCA.crt" - DefaultStreamCertFile = "/etc/kubeedge/certs/stream.crt" - DefaultStreamKeyFile = "/etc/kubeedge/certs/stream.key" - - DefaultMqttCAFile = "/etc/kubeedge/ca/rootCA.crt" - DefaultMqttCertFile = "/etc/kubeedge/certs/server.crt" - DefaultMqttKeyFile = "/etc/kubeedge/certs/server.key" - - // Bootstrap file, contains token used by edgecore to apply for ca/cert - BootstrapFile = "/etc/kubeedge/bootstrap-edgecore.conf" - // Edged - DefaultRootDir = "/var/lib/edged" - DefaultDockerAddress = "unix:///var/run/docker.sock" - DefaultRuntimeType = "remote" - DefaultDockershimRootDir = "/var/lib/dockershim" - DefaultEdgedMemoryCapacity = 7852396000 - DefaultRemoteRuntimeEndpoint = "unix:///run/containerd/containerd.sock" - DefaultRemoteImageEndpoint = "unix:///run/containerd/containerd.sock" - DefaultMosquittoImage = "eclipse-mosquitto:1.6.15" + DefaultDockerAddress = "unix:///var/run/docker.sock" + DefaultDockershimRootDir = "/var/lib/dockershim" + DefaultRuntimeType = "remote" + DefaultEdgedMemoryCapacity = 7852396000 + DefaultMosquittoImage = "eclipse-mosquitto:1.6.15" // update PodSandboxImage version when bumping k8s vendor version, consistent with vendor/k8s.io/kubernetes/cmd/kubelet/app/options/container_runtime.go defaultPodSandboxImageVersion // When this value are updated, also update comments in pkg/apis/componentconfig/edgecore/v1alpha1/types.go DefaultPodSandboxImage = "kubeedge/pause:3.6" @@ -71,16 +47,12 @@ const ( DefaultMaximumDeadContainersPerPod = 1 DefaultHostnameOverride = "default-edge-node" DefaultRegisterNodeNamespace = "default" - DefaultCNIConfDir = "/etc/cni/net.d" - DefaultCNIBinDir = "/opt/cni/bin" - DefaultCNICacheDir = "/var/lib/cni/cache" DefaultNetworkPluginMTU = 1500 DefaultConcurrentConsumers = 5 DefaultCgroupRoot = "" DefaultVolumeStatsAggPeriod = time.Minute DefaultTunnelPort = 10004 DefaultClusterDomain = "cluster.local" - DefaultVolumePluginDir = "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/" CurrentSupportK8sVersion = "v1.24.14" diff --git a/common/constants/default_others.go b/common/constants/default_others.go new file mode 100644 index 000000000..20defe4a7 --- /dev/null +++ b/common/constants/default_others.go @@ -0,0 +1,33 @@ +//go:build !windows + +package constants + +// Resources +const ( + // Certificates + DefaultConfigDir = "/etc/kubeedge/config/" + DefaultCAFile = "/etc/kubeedge/ca/rootCA.crt" + DefaultCAKeyFile = "/etc/kubeedge/ca/rootCA.key" + DefaultCertFile = "/etc/kubeedge/certs/server.crt" + DefaultKeyFile = "/etc/kubeedge/certs/server.key" + + DefaultStreamCAFile = "/etc/kubeedge/ca/streamCA.crt" + DefaultStreamCertFile = "/etc/kubeedge/certs/stream.crt" + DefaultStreamKeyFile = "/etc/kubeedge/certs/stream.key" + + DefaultMqttCAFile = "/etc/kubeedge/ca/rootCA.crt" + DefaultMqttCertFile = "/etc/kubeedge/certs/server.crt" + DefaultMqttKeyFile = "/etc/kubeedge/certs/server.key" + + // Bootstrap file, contains token used by edgecore to apply for ca/cert + BootstrapFile = "/etc/kubeedge/bootstrap-edgecore.conf" + + // Edged + DefaultRootDir = "/var/lib/edged" + DefaultRemoteRuntimeEndpoint = "unix:///run/containerd/containerd.sock" + DefaultRemoteImageEndpoint = "unix:///run/containerd/containerd.sock" + DefaultCNIConfDir = "/etc/cni/net.d" + DefaultCNIBinDir = "/opt/cni/bin" + DefaultCNICacheDir = "/var/lib/cni/cache" + DefaultVolumePluginDir = "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/" +) diff --git a/common/constants/default_windows.go b/common/constants/default_windows.go index b1ef1c0ed..45712865e 100644 --- a/common/constants/default_windows.go +++ b/common/constants/default_windows.go @@ -2,31 +2,8 @@ package constants -import ( - "time" - - v1 "k8s.io/api/core/v1" -) - // Module name and group name -const ( - // SyncController - DefaultContextSendModuleName = "cloudhub" - - // NodeName is for the clearer log of cloudcore. - NodeName = "NodeName" - - ProjectName = "KubeEdge" - - SystemName = "kubeedge" - SystemNamespace = SystemName - - CloudConfigMapName = "cloudcore" - - // runtime - DockerContainerRuntime = "docker" - RemoteContainerRuntime = "remote" -) +const () // Resources const ( @@ -38,10 +15,6 @@ const ( DefaultKeyFile = "c:\\etc\\kubeedge\\certs\\server.key" DefaultServiceAccountIssuer = "https://kubernetes.default.svc.cluster.local" - DefaultCAURL = "/ca.crt" - DefaultCertURL = "/edge.crt" - DefaultNodeUpgradeURL = "/nodeupgrade" - DefaultStreamCAFile = "c:\\etc\\kubeedge\\ca\\streamCA.crt" DefaultStreamCertFile = "c:\\etc\\kubeedge\\certs\\stream.crt" DefaultStreamKeyFile = "c:\\etc\\kubeedge\\certs\\stream.key" @@ -55,126 +28,10 @@ const ( // Edged DefaultRootDir = "c:\\var\\lib\\edged" - DefaultDockerAddress = "unix:///var/run/docker.sock" - DefaultRuntimeType = "remote" - DefaultDockershimRootDir = "c:\\var\\lib\\dockershim" - DefaultEdgedMemoryCapacity = 7852396000 DefaultRemoteRuntimeEndpoint = "npipe://./pipe/containerd-containerd" DefaultRemoteImageEndpoint = "npipe://./pipe/containerd-containerd" - DefaultMosquittoImage = "eclipse-mosquitto:1.6.15" - // update PodSandboxImage version when bumping k8s vendor version, consistent with vendor/k8s.io/kubernetes/cmd/kubelet/app/options/container_runtime.go defaultPodSandboxImageVersion - // When this value are updated, also update comments in pkg/apis/componentconfig/edgecore/v1alpha1/types.go - DefaultPodSandboxImage = "kubeedge/pause:3.6" - DefaultImagePullProgressDeadline = time.Minute - DefaultImageGCHighThreshold = 80 - DefaultImageGCLowThreshold = 40 - DefaultMaximumDeadContainersPerPod = 1 - DefaultHostnameOverride = "default-edge-node" - DefaultRegisterNodeNamespace = "default" - DefaultCNIConfDir = "c:\\etc\\cni\\net.d" - DefaultCNIBinDir = "c:\\opt\\cni\\bin" - DefaultCNICacheDir = "c:\\var\\lib\\cni\\cache" - DefaultNetworkPluginMTU = 1500 - DefaultConcurrentConsumers = 5 - DefaultCgroupRoot = "" - DefaultVolumeStatsAggPeriod = time.Minute - DefaultTunnelPort = 10004 - DefaultClusterDomain = "cluster.local" - DefaultVolumePluginDir = "C:\\usr\\libexec\\kubernetes\\kubelet-plugins\\volume\\exec\\" - - CurrentSupportK8sVersion = "v1.24.14" - - // MetaManager - DefaultRemoteQueryTimeout = 60 - DefaultMetaServerAddr = "127.0.0.1:10550" - - // Config - DefaultKubeContentType = "application/vnd.kubernetes.protobuf" - DefaultKubeNamespace = v1.NamespaceAll - DefaultKubeQPS = 100.0 - DefaultKubeBurst = 200 - DefaultNodeLimit = 500 - DefaultKubeUpdateNodeFrequency = 20 - - // EdgeController - DefaultUpdatePodStatusWorkers = 1 - DefaultUpdateNodeStatusWorkers = 1 - DefaultQueryConfigMapWorkers = 100 - DefaultQuerySecretWorkers = 100 - DefaultQueryPersistentVolumeWorkers = 4 - DefaultQueryPersistentVolumeClaimWorkers = 4 - DefaultQueryVolumeAttachmentWorkers = 4 - DefaultCreateNodeWorkers = 100 - DefaultUpdateNodeWorkers = 4 - DefaultPatchPodWorkers = 100 - DefaultDeletePodWorkers = 100 - DefaultUpdateRuleStatusWorkers = 4 - DefaultQueryLeaseWorkers = 100 - DefaultServiceAccountTokenWorkers = 100 - - DefaultUpdatePodStatusBuffer = 1024 - DefaultUpdateNodeStatusBuffer = 1024 - DefaultQueryConfigMapBuffer = 1024 - DefaultQuerySecretBuffer = 1024 - DefaultQueryPersistentVolumeBuffer = 1024 - DefaultQueryPersistentVolumeClaimBuffer = 1024 - DefaultQueryVolumeAttachmentBuffer = 1024 - DefaultCreateNodeBuffer = 1024 - DefaultUpdateNodeBuffer = 1024 - DefaultPatchPodBuffer = 1024 - DefaultDeletePodBuffer = 1024 - DefaultQueryLeaseBuffer = 1024 - DefaultServiceAccountTokenBuffer = 1024 - - DefaultPodEventBuffer = 1 - DefaultConfigMapEventBuffer = 1 - DefaultSecretEventBuffer = 1 - DefaultRulesEventBuffer = 1 - DefaultRuleEndpointsEventBuffer = 1 - - // DeviceController - DefaultUpdateDeviceStatusBuffer = 1024 - DefaultDeviceEventBuffer = 1 - DefaultDeviceModelEventBuffer = 1 - DefaultUpdateDeviceStatusWorkers = 1 - - // NodeUpgradeJobController - DefaultNodeUpgradeJobStatusBuffer = 1024 - DefaultNodeUpgradeJobEventBuffer = 1 - DefaultNodeUpgradeJobWorkers = 1 - - // Resource sep - ResourceSep = "/" - - ResourceTypeService = "service" - ResourceTypeEndpoints = "endpoints" - - ResourceTypePersistentVolume = "persistentvolume" - ResourceTypePersistentVolumeClaim = "persistentvolumeclaim" - ResourceTypeVolumeAttachment = "volumeattachment" - - CSIResourceTypeVolume = "volume" - CSIOperationTypeCreateVolume = "createvolume" - CSIOperationTypeDeleteVolume = "deletevolume" - CSIOperationTypeControllerPublishVolume = "controllerpublishvolume" - CSIOperationTypeControllerUnpublishVolume = "controllerunpublishvolume" - CSISyncMsgRespTimeout = 1 * time.Minute - - // ServerPort is the default port for the edgecore server on each host machine. - // May be overridden by a flag at startup in the future. - ServerAddress = "127.0.0.1" - ServerPort = 10350 - - // MessageSuccessfulContent is the successful content value of Message struct - MessageSuccessfulContent string = "OK" - DefaultQPS = 30 - DefaultBurst = 60 - // MaxRespBodyLength is the max length of http response body - MaxRespBodyLength = 1 << 20 // 1 MiB - - EdgeNodeRoleKey = "node-role.kubernetes.io/edge" - EdgeNodeRoleValue = "" - - DeafultMosquittoContainerName = "mqtt-kubeedge" - DeployMqttContainerEnv = "DEPLOY_MQTT_CONTAINER" + DefaultCNIConfDir = "c:\\etc\\cni\\net.d" + DefaultCNIBinDir = "c:\\opt\\cni\\bin" + DefaultCNICacheDir = "c:\\var\\lib\\cni\\cache" + DefaultVolumePluginDir = "C:\\usr\\libexec\\kubernetes\\kubelet-plugins\\volume\\exec\\" ) diff --git a/pkg/apis/componentconfig/edgecore/v1alpha2/default.go b/pkg/apis/componentconfig/edgecore/v1alpha2/default.go index 8ae677748..d95e12915 100644 --- a/pkg/apis/componentconfig/edgecore/v1alpha2/default.go +++ b/pkg/apis/componentconfig/edgecore/v1alpha2/default.go @@ -20,6 +20,7 @@ import ( "net" "net/url" "path" + "runtime" "strconv" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -30,14 +31,14 @@ import ( ) // NewDefaultEdgeCoreConfig returns a full EdgeCoreConfig object -func NewDefaultEdgeCoreConfig() *EdgeCoreConfig { +func NewDefaultEdgeCoreConfig() (config *EdgeCoreConfig) { hostnameOverride := util.GetHostname() localIP, _ := util.GetLocalIP(hostnameOverride) defaultTailedKubeletConfig := TailoredKubeletConfiguration{} SetDefaultsKubeletConfiguration(&defaultTailedKubeletConfig) - return &EdgeCoreConfig{ + config = &EdgeCoreConfig{ TypeMeta: metav1.TypeMeta{ Kind: Kind, APIVersion: path.Join(GroupName, APIVersion), @@ -67,7 +68,6 @@ func NewDefaultEdgeCoreConfig() *EdgeCoreConfig { NodeLabels: make(map[string]string), RegisterNode: true, RegisterSchedulable: true, - WindowsPriorityClass: "NORMAL_PRIORITY_CLASS", }, CustomInterfaceName: "", RegisterNodeNamespace: constants.DefaultRegisterNodeNamespace, @@ -159,17 +159,22 @@ func NewDefaultEdgeCoreConfig() *EdgeCoreConfig { }, }, } + + if runtime.GOOS == "windows" { + config.Modules.Edged.WindowsPriorityClass = "NORMAL_PRIORITY_CLASS" + } + return } // NewMinEdgeCoreConfig returns a common EdgeCoreConfig object -func NewMinEdgeCoreConfig() *EdgeCoreConfig { +func NewMinEdgeCoreConfig() (config *EdgeCoreConfig) { hostnameOverride := util.GetHostname() localIP, _ := util.GetLocalIP(hostnameOverride) defaultTailedKubeletConfig := TailoredKubeletConfiguration{} SetDefaultsKubeletConfiguration(&defaultTailedKubeletConfig) - return &EdgeCoreConfig{ + config = &EdgeCoreConfig{ TypeMeta: metav1.TypeMeta{ Kind: Kind, APIVersion: path.Join(GroupName, APIVersion), @@ -197,7 +202,6 @@ func NewMinEdgeCoreConfig() *EdgeCoreConfig { NodeLabels: make(map[string]string), RegisterNode: true, RegisterSchedulable: true, - WindowsPriorityClass: "NORMAL_PRIORITY_CLASS", }, CustomInterfaceName: "", RegisterNodeNamespace: constants.DefaultRegisterNodeNamespace, @@ -233,4 +237,9 @@ func NewMinEdgeCoreConfig() *EdgeCoreConfig { }, }, } + + if runtime.GOOS == "windows" { + config.Modules.Edged.WindowsPriorityClass = "NORMAL_PRIORITY_CLASS" + } + return } diff --git a/pkg/apis/componentconfig/edgecore/v1alpha2/default_kubelet_configuration.go b/pkg/apis/componentconfig/edgecore/v1alpha2/default_kubelet_configuration.go index 7243550f1..f85276f4c 100644 --- a/pkg/apis/componentconfig/edgecore/v1alpha2/default_kubelet_configuration.go +++ b/pkg/apis/componentconfig/edgecore/v1alpha2/default_kubelet_configuration.go @@ -1,5 +1,3 @@ -//go:build !windows - /* Copyright 2022 The KubeEdge Authors. @@ -28,6 +26,7 @@ package v1alpha2 import ( "time" + "github.com/kubeedge/kubeedge/common/constants" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" componentbaseconfigv1alpha1 "k8s.io/component-base/config/v1alpha1" kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1" @@ -35,8 +34,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/qos" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" utilpointer "k8s.io/utils/pointer" - - "github.com/kubeedge/kubeedge/common/constants" + "runtime" ) var ( @@ -64,8 +62,6 @@ func SetDefaultsKubeletConfiguration(obj *TailoredKubeletConfiguration) { obj.ImageGCHighThresholdPercent = utilpointer.Int32Ptr(constants.DefaultImageGCHighThreshold) obj.ImageGCLowThresholdPercent = utilpointer.Int32Ptr(constants.DefaultImageGCLowThreshold) obj.VolumeStatsAggPeriod = metav1.Duration{Duration: time.Minute} - obj.CgroupsPerQOS = utilpointer.BoolPtr(true) - obj.CgroupDriver = "cgroupfs" obj.CPUManagerPolicy = "none" // Keep the same as default NodeStatusUpdateFrequency obj.CPUManagerReconcilePeriod = metav1.Duration{Duration: 10 * time.Second} @@ -77,8 +73,6 @@ func SetDefaultsKubeletConfiguration(obj *TailoredKubeletConfiguration) { obj.MaxPods = 110 // default nil or negative value to -1 (implies node allocatable pid limit) obj.PodPidsLimit = utilpointer.Int64(-1) - obj.ResolverConfig = utilpointer.String(kubetypes.ResolvConfDefault) - obj.CPUCFSQuota = utilpointer.BoolPtr(true) obj.CPUCFSQuotaPeriod = &metav1.Duration{Duration: 100 * time.Millisecond} obj.NodeStatusMaxImages = utilpointer.Int32Ptr(0) obj.MaxOpenFiles = 1000000 @@ -104,4 +98,19 @@ func SetDefaultsKubeletConfiguration(obj *TailoredKubeletConfiguration) { obj.SeccompDefault = utilpointer.BoolPtr(false) obj.MemoryThrottlingFactor = utilpointer.Float64Ptr(configv1beta1.DefaultMemoryThrottlingFactor) obj.RegisterNode = utilpointer.BoolPtr(true) + + if runtime.GOOS == "windows" { + obj.EnforceNodeAllocatable = []string{} + obj.CgroupDriver = "" + obj.CgroupsPerQOS = utilpointer.BoolPtr(false) + obj.ResolverConfig = utilpointer.String("") + obj.CPUCFSQuota = utilpointer.BoolPtr(false) + } else { + obj.EnforceNodeAllocatable = DefaultNodeAllocatableEnforcement + obj.CgroupDriver = "cgroupfs" + obj.CgroupsPerQOS = utilpointer.BoolPtr(true) + obj.ResolverConfig = utilpointer.String(kubetypes.ResolvConfDefault) + obj.CPUCFSQuota = utilpointer.BoolPtr(true) + } + } diff --git a/pkg/apis/componentconfig/edgecore/v1alpha2/default_kubelet_configuration_windows.go b/pkg/apis/componentconfig/edgecore/v1alpha2/default_kubelet_configuration_windows.go deleted file mode 100644 index 6a5fe02ff..000000000 --- a/pkg/apis/componentconfig/edgecore/v1alpha2/default_kubelet_configuration_windows.go +++ /dev/null @@ -1,100 +0,0 @@ -//go:build windows - -/* -Copyright 2022 The KubeEdge Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -@CHANGELOG -KubeEdge Authors: To set default tailored kubelet configuration, -This file is derived from K8S Kubelet apis code with reduced set of methods -Changes done are -1. Package edged got some functions from "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" -and made some variant -*/ - -package v1alpha2 - -import ( - "time" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - componentbaseconfigv1alpha1 "k8s.io/component-base/config/v1alpha1" - kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1" - configv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" - "k8s.io/kubernetes/pkg/kubelet/qos" - utilpointer "k8s.io/utils/pointer" - - "github.com/kubeedge/kubeedge/common/constants" -) - -// SetDefaultsKubeletConfiguration sets defaults for tailored kubelet configuration -func SetDefaultsKubeletConfiguration(obj *TailoredKubeletConfiguration) { - obj.SyncFrequency = metav1.Duration{Duration: 1 * time.Minute} - obj.Address = constants.ServerAddress - obj.ReadOnlyPort = constants.ServerPort - obj.ClusterDomain = constants.DefaultClusterDomain - obj.RegistryPullQPS = utilpointer.Int32(5) - obj.RegistryBurst = 10 - obj.EnableDebuggingHandlers = utilpointer.Bool(true) - obj.OOMScoreAdj = utilpointer.Int32(int32(qos.KubeletOOMScoreAdj)) - obj.StreamingConnectionIdleTimeout = metav1.Duration{Duration: 4 * time.Hour} - obj.NodeStatusReportFrequency = metav1.Duration{Duration: 5 * time.Minute} - obj.NodeStatusUpdateFrequency = metav1.Duration{Duration: 10 * time.Second} - obj.NodeLeaseDurationSeconds = 40 - obj.ImageMinimumGCAge = metav1.Duration{Duration: 2 * time.Minute} - // default is below docker's default dm.min_free_space of 90% - obj.ImageGCHighThresholdPercent = utilpointer.Int32(constants.DefaultImageGCHighThreshold) - obj.ImageGCLowThresholdPercent = utilpointer.Int32(constants.DefaultImageGCLowThreshold) - obj.VolumeStatsAggPeriod = metav1.Duration{Duration: time.Minute} - obj.CgroupsPerQOS = utilpointer.Bool(false) - obj.CgroupDriver = "" - obj.CPUManagerPolicy = "none" - // Keep the same as default NodeStatusUpdateFrequency - obj.CPUManagerReconcilePeriod = metav1.Duration{Duration: 10 * time.Second} - obj.MemoryManagerPolicy = kubeletconfigv1beta1.NoneMemoryManagerPolicy - obj.TopologyManagerPolicy = kubeletconfigv1beta1.NoneTopologyManagerPolicy - obj.TopologyManagerScope = kubeletconfigv1beta1.ContainerTopologyManagerScope - obj.RuntimeRequestTimeout = metav1.Duration{Duration: 2 * time.Minute} - obj.HairpinMode = kubeletconfigv1beta1.PromiscuousBridge - obj.MaxPods = 110 - // default nil or negative value to -1 (implies node allocatable pid limit) - obj.PodPidsLimit = utilpointer.Int64(-1) - //obj.ResolverConfig = utilpointer.String("") - obj.CPUCFSQuota = utilpointer.Bool(false) - obj.CPUCFSQuotaPeriod = &metav1.Duration{Duration: 100 * time.Millisecond} - obj.NodeStatusMaxImages = utilpointer.Int32(0) - obj.MaxOpenFiles = 1000000 - obj.ContentType = "application/json" - obj.SerializeImagePulls = utilpointer.Bool(true) - obj.EvictionHard = configv1beta1.DefaultEvictionHard - obj.EvictionPressureTransitionPeriod = metav1.Duration{Duration: 5 * time.Minute} - obj.EnableControllerAttachDetach = utilpointer.Bool(true) - obj.MakeIPTablesUtilChains = utilpointer.Bool(true) - obj.IPTablesMasqueradeBit = utilpointer.Int32(configv1beta1.DefaultIPTablesMasqueradeBit) - obj.IPTablesDropBit = utilpointer.Int32(configv1beta1.DefaultIPTablesDropBit) - obj.FailSwapOn = utilpointer.Bool(false) - obj.ContainerLogMaxSize = "10Mi" - obj.ContainerLogMaxFiles = utilpointer.Int32(5) - obj.ConfigMapAndSecretChangeDetectionStrategy = kubeletconfigv1beta1.GetChangeDetectionStrategy - obj.EnforceNodeAllocatable = []string{} - obj.VolumePluginDir = constants.DefaultVolumePluginDir - // Use the Default LoggingConfiguration option - componentbaseconfigv1alpha1.RecommendedLoggingConfiguration(&obj.Logging) - obj.EnableSystemLogHandler = utilpointer.Bool(true) - obj.EnableProfilingHandler = utilpointer.Bool(true) - obj.EnableDebugFlagsHandler = utilpointer.Bool(true) - obj.SeccompDefault = utilpointer.Bool(false) - obj.MemoryThrottlingFactor = utilpointer.Float64(configv1beta1.DefaultMemoryThrottlingFactor) - obj.RegisterNode = utilpointer.Bool(true) -} diff --git a/pkg/apis/componentconfig/edgecore/v1alpha2/types_windows.go b/pkg/apis/componentconfig/edgecore/v1alpha2/types_windows.go index dba87042c..69ea9b74f 100644 --- a/pkg/apis/componentconfig/edgecore/v1alpha2/types_windows.go +++ b/pkg/apis/componentconfig/edgecore/v1alpha2/types_windows.go @@ -3,8 +3,8 @@ package v1alpha2 const ( - CGroupDriverCGroupFS = "" - CGroupDriverSystemd = "" + //CGroupDriverCGroupFS = "" + //CGroupDriverSystemd = "" // DataBaseDataSource is edge.db DataBaseDataSource = "C:\\var\\lib\\kubeedge\\edgecore.db" |
