Merge pull request kubeedge#5844 from wbc6080/remove-api-unused-commom

Remove some unused constants in api and commons
1Shubham7 · Sep 10, 2024 · b73cc46 · b73cc46
2 parents cd13483 + 0185c73
commit b73cc46
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 174 deletions.
diff --git a/common/constants/default.go b/common/constants/default.go
@@ -10,14 +10,11 @@ import (
 const (
 	// SyncController
 	DefaultContextSendModuleName = "cloudhub"
-
-	ProjectName = "KubeEdge"
-
-	SystemName      = "kubeedge"
-	SystemNamespace = SystemName
-
-	CloudConfigMapName  = "cloudcore"
-	EdgeMappingCloudKey = "cloudcore"
+	ProjectName                  = "KubeEdge"
+	SystemName                   = "kubeedge"
+	SystemNamespace              = SystemName
+	CloudConfigMapName           = "cloudcore"
+	EdgeMappingCloudKey          = "cloudcore"
 
 	// runtime
 	DockerContainerRuntime = "docker"
@@ -26,42 +23,23 @@ const (
 
 // Resources
 const (
-	DefaultCAURL                = "/ca.crt"
-	DefaultCertURL              = "/edge.crt"
-	DefaultNodeUpgradeURL       = "/nodeupgrade"
-	DefaultTaskStateReportURL   = "/task/{taskType}/name/{taskID}/node/{nodeID}/status"
-	DefaultServiceAccountIssuer = "https://kubernetes.default.svc.cluster.local"
-
-	// Edged
-	DefaultDockerAddress       = "unix:///var/run/docker.sock"
-	DefaultDockershimRootDir   = "/var/lib/dockershim"
-	DefaultRuntimeType         = "remote"
-	DefaultEdgedMemoryCapacity = 7852396000
+	DefaultCAURL              = "/ca.crt"
+	DefaultCertURL            = "/edge.crt"
+	DefaultNodeUpgradeURL     = "/nodeupgrade"
+	DefaultTaskStateReportURL = "/task/{taskType}/name/{taskID}/node/{nodeID}/status"
+
 	// DefaultMosquittoImage ...
 	// Deprecated: the mqtt broker is alreay managed by the DaemonSet in the cloud
 	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"
-	DefaultNetworkPluginMTU            = 1500
-	DefaultConcurrentConsumers         = 5
-	DefaultCgroupRoot                  = ""
-	DefaultVolumeStatsAggPeriod        = time.Minute
-	DefaultTunnelPort                  = 10004
-	DefaultClusterDomain               = "cluster.local"
+	DefaultHostnameOverride = "default-edge-node"
+	DefaultTunnelPort       = 10004
 
 	CurrentSupportK8sVersion = "v1.29.5"
 
 	// MetaManager
-	DefaultRemoteQueryTimeout = 60
-	DefaultMetaServerAddr     = "127.0.0.1:10550"
-	DefaultDummyServerAddr    = "169.254.30.10:10550"
+	DefaultMetaServerAddr = "127.0.0.1:10550"
 
 	// Config
 	DefaultKubeContentType         = "application/vnd.kubernetes.protobuf"
@@ -71,63 +49,6 @@ const (
 	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
-	DefaultCreatePodWorkers                  = 4
-	DefaultCertificateSigningRequestWorkers  = 4
-
-	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
-	DefaultCreatePodBuffer                  = 1024
-	DefaultCertificateSigningRequestBuffer  = 1024
-
-	DefaultPodEventBuffer           = 1
-	DefaultConfigMapEventBuffer     = 1
-	DefaultSecretEventBuffer        = 1
-	DefaultRulesEventBuffer         = 1
-	DefaultRuleEndpointsEventBuffer = 1
-
-	// DeviceController
-	DefaultUpdateDeviceTwinsBuffer   = 1024
-	DefaultUpdateDeviceStatesBuffer  = 1024
-	DefaultDeviceEventBuffer         = 1
-	DefaultDeviceModelEventBuffer    = 1
-	DefaultUpdateDeviceStatusWorkers = 1
-
-	// TaskManager
-	DefaultNodeUpgradeJobStatusBuffer = 1024
-	DefaultNodeUpgradeJobEventBuffer  = 1
-	DefaultNodeUpgradeJobWorkers      = 1
-
-	// ImagePrePullController
-	DefaultImagePrePullJobStatusBuffer = 1024
-	DefaultImagePrePullJobEventBuffer  = 1
-	DefaultImagePrePullJobWorkers      = 1
-
 	// Resource sep
 	ResourceSep = "/"
 
@@ -152,8 +73,6 @@ const (
 
 	// 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
 
@@ -170,7 +89,4 @@ const (
 	// EdgeHub
 	DefaultWebSocketPort = 10000
 	DefaultQuicPort      = 10001
-
-	// DeviceTwin
-	DefaultDMISockPath = "/etc/kubeedge/dmi.sock"
 )
diff --git a/staging/src/github.com/kubeedge/api/apis/common/constants/default.go b/staging/src/github.com/kubeedge/api/apis/common/constants/default.go
@@ -2,44 +2,17 @@ package constants
 
 import (
 	"time"
-
-	v1 "k8s.io/api/core/v1"
-)
-
-// Module name and group name
-const (
-	// SyncController
-	DefaultContextSendModuleName = "cloudhub"
-
-	ProjectName = "KubeEdge"
-
-	SystemName      = "kubeedge"
-	SystemNamespace = SystemName
-
-	CloudConfigMapName  = "cloudcore"
-	EdgeMappingCloudKey = "cloudcore"
-
-	// runtime
-	DockerContainerRuntime = "docker"
-	RemoteContainerRuntime = "remote"
 )
 
 // Resources
 const (
-	DefaultCAURL                = "/ca.crt"
-	DefaultCertURL              = "/edge.crt"
-	DefaultNodeUpgradeURL       = "/nodeupgrade"
-	DefaultTaskStateReportURL   = "/task/{taskType}/name/{taskID}/node/{nodeID}/status"
 	DefaultServiceAccountIssuer = "https://kubernetes.default.svc.cluster.local"
 
 	// Edged
 	DefaultDockerAddress       = "unix:///var/run/docker.sock"
-	DefaultDockershimRootDir   = "/var/lib/dockershim"
 	DefaultRuntimeType         = "remote"
 	DefaultEdgedMemoryCapacity = 7852396000
-	// DefaultMosquittoImage ...
-	// Deprecated: the mqtt broker is alreay managed by the DaemonSet in the cloud
-	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"
@@ -56,20 +29,14 @@ const (
 	DefaultTunnelPort                  = 10004
 	DefaultClusterDomain               = "cluster.local"
 
-	CurrentSupportK8sVersion = "v1.29.5"
-
 	// MetaManager
 	DefaultRemoteQueryTimeout = 60
 	DefaultMetaServerAddr     = "127.0.0.1:10550"
 	DefaultDummyServerAddr    = "169.254.30.10:10550"
 
 	// Config
-	DefaultKubeContentType         = "application/vnd.kubernetes.protobuf"
-	DefaultKubeNamespace           = v1.NamespaceAll
-	DefaultKubeQPS                 = 100.0
-	DefaultKubeBurst               = 200
-	DefaultNodeLimit               = 500
-	DefaultKubeUpdateNodeFrequency = 20
+	DefaultKubeContentType = "application/vnd.kubernetes.protobuf"
+	DefaultNodeLimit       = 500
 
 	// EdgeController
 	DefaultUpdatePodStatusWorkers            = 1
@@ -123,53 +90,14 @@ const (
 	DefaultNodeUpgradeJobEventBuffer  = 1
 	DefaultNodeUpgradeJobWorkers      = 1
 
-	// ImagePrePullController
-	DefaultImagePrePullJobStatusBuffer = 1024
-	DefaultImagePrePullJobEventBuffer  = 1
-	DefaultImagePrePullJobWorkers      = 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
-
 	ServerAddress = "127.0.0.1"
 	// ServerPort is the default port for the edgecore server on each host machine.
 	// May be overridden by a flag at startup in the future.
 	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 = ""
-
-	// DefaultMosquittoContainerName ...
-	// Deprecated: the mqtt broker is alreay managed by the DaemonSet in the cloud
-	DefaultMosquittoContainerName = "mqtt-kubeedge"
-	// DeployMqttContainerEnv ...
-	// Deprecated: the mqtt broker is alreay managed by the DaemonSet in the cloud
-	DeployMqttContainerEnv = "DEPLOY_MQTT_CONTAINER"
-
-	// EdgeHub
-	DefaultWebSocketPort = 10000
-	DefaultQuicPort      = 10001
+	DefaultQPS   = 30
+	DefaultBurst = 60
 
 	// DeviceTwin
 	DefaultDMISockPath = "/etc/kubeedge/dmi.sock"