b167fc24d7
Update dependencies and the test images to use pause 3.5. We also provide a changelog entry for the new container image version. Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
59 lines
1.7 KiB
Go
59 lines
1.7 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.5"
|
|
)
|
|
|
|
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,
|
|
DockerEndpoint: dockerEndpoint,
|
|
DockershimRootDirectory: "/var/lib/dockershim",
|
|
PodSandboxImage: defaultPodSandboxImage,
|
|
ImagePullProgressDeadline: metav1.Duration{Duration: 1 * time.Minute},
|
|
|
|
CNIBinDir: "/opt/cni/bin",
|
|
CNIConfDir: "/etc/cni/net.d",
|
|
CNICacheDir: "/var/lib/cni/cache",
|
|
}
|
|
}
|