mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-10-31 05:40:42 +00:00 
			
		
		
		
	Remove one of two uses of Dockershim in `cmd/kubelet`. The other is for creating a docker client which we pass to the Kubelet... we will handle that refactor in a separate diff. I'm fairly confident, though need to double check, that no one is actually using this experimental dockershim behavior. If they are, I think we will want to find a new way to support it (that doesn't require using the Kubelet only to launch Dockershim).
		
			
				
	
	
		
			61 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			61 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| /*
 | |
| Copyright 2017 The Kubernetes 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.
 | |
| */
 | |
| 
 | |
| package options
 | |
| 
 | |
| import (
 | |
| 	"runtime"
 | |
| 	"time"
 | |
| 
 | |
| 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 | |
| 	"k8s.io/kubernetes/pkg/kubelet/config"
 | |
| 	kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
 | |
| )
 | |
| 
 | |
| const (
 | |
| 	// When these values are updated, also update test/utils/image/manifest.go
 | |
| 	defaultPodSandboxImageName    = "k8s.gcr.io/pause"
 | |
| 	defaultPodSandboxImageVersion = "3.2"
 | |
| )
 | |
| 
 | |
| var (
 | |
| 	defaultPodSandboxImage = defaultPodSandboxImageName +
 | |
| 		":" + defaultPodSandboxImageVersion
 | |
| )
 | |
| 
 | |
| // NewContainerRuntimeOptions will create a new ContainerRuntimeOptions with
 | |
| // default values.
 | |
| func NewContainerRuntimeOptions() *config.ContainerRuntimeOptions {
 | |
| 	dockerEndpoint := ""
 | |
| 	if runtime.GOOS != "windows" {
 | |
| 		dockerEndpoint = "unix:///var/run/docker.sock"
 | |
| 	}
 | |
| 
 | |
| 	return &config.ContainerRuntimeOptions{
 | |
| 		ContainerRuntime:           kubetypes.DockerContainerRuntime,
 | |
| 		RedirectContainerStreaming: false,
 | |
| 		DockerEndpoint:             dockerEndpoint,
 | |
| 		DockershimRootDirectory:    "/var/lib/dockershim",
 | |
| 		PodSandboxImage:            defaultPodSandboxImage,
 | |
| 		ImagePullProgressDeadline:  metav1.Duration{Duration: 1 * time.Minute},
 | |
| 
 | |
| 		//Alpha feature
 | |
| 		CNIBinDir:   "/opt/cni/bin",
 | |
| 		CNIConfDir:  "/etc/cni/net.d",
 | |
| 		CNICacheDir: "/var/lib/cni/cache",
 | |
| 	}
 | |
| }
 |