mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-04 15:05:20 +00:00
Merge pull request #30212 from feiskyer/kuberuntime-flag
Automatic merge from submit-queue Kubelet: add --container-runtime-endpoint and --image-service-endpoint Flag `--container-runtime-endpoint` (overrides `--container-runtime`) is introduced to identify the unix socket file of the remote runtime service. And flag `--image-service-endpoint` is introduced to identify the unix socket file of the image service. This PR is part of #28789 Milestone 0. CC @yujuhong @Random-Liu
This commit is contained in:
@@ -226,6 +226,8 @@ func UnsecuredKubeletConfig(s *options.KubeletServer) (*KubeletConfig, error) {
|
||||
ConfigureCBR0: s.ConfigureCBR0,
|
||||
ContainerManager: nil,
|
||||
ContainerRuntime: s.ContainerRuntime,
|
||||
RemoteRuntimeEndpoint: s.RemoteRuntimeEndpoint,
|
||||
RemoteImageEndpoint: s.RemoteImageEndpoint,
|
||||
RuntimeRequestTimeout: s.RuntimeRequestTimeout.Duration,
|
||||
CPUCFSQuota: s.CPUCFSQuota,
|
||||
DiskSpacePolicy: diskSpacePolicy,
|
||||
@@ -877,6 +879,8 @@ type KubeletConfig struct {
|
||||
ConfigureCBR0 bool
|
||||
ContainerManager cm.ContainerManager
|
||||
ContainerRuntime string
|
||||
RemoteRuntimeEndpoint string
|
||||
RemoteImageEndpoint string
|
||||
RuntimeRequestTimeout time.Duration
|
||||
CPUCFSQuota bool
|
||||
DiskSpacePolicy kubelet.DiskSpacePolicy
|
||||
@@ -1025,6 +1029,8 @@ func CreateAndInitKubelet(kc *KubeletConfig) (k KubeletBootstrap, pc *config.Pod
|
||||
kc.CgroupsPerQOS,
|
||||
kc.CgroupRoot,
|
||||
kc.ContainerRuntime,
|
||||
kc.RemoteRuntimeEndpoint,
|
||||
kc.RemoteImageEndpoint,
|
||||
kc.RuntimeRequestTimeout,
|
||||
kc.RktPath,
|
||||
kc.RktAPIEndpoint,
|
||||
|
||||
Reference in New Issue
Block a user