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 /common | |
| 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>
Diffstat (limited to 'common')
| -rw-r--r-- | common/constants/default.go | 38 | ||||
| -rw-r--r-- | common/constants/default_others.go | 33 | ||||
| -rw-r--r-- | common/constants/default_windows.go | 153 |
3 files changed, 43 insertions, 181 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\\" ) |
