f97770b175
In order to allow for a smoother UX with CRIs different than Docker, we have to make the --cri-socket command line flag optional when just one CRI is installed. This change does that by doing the following: - Introduce a new runtime function (DetectCRISocket) that will attempt to detect a CRI socket, or return an appropriate error. - Default to using the above function if --cri-socket is not specified and CRISocket in NodeRegistrationOptions is empty. - Stop static defaulting to DefaultCRISocket. And rename it to DefaultDockerCRISocket. Its use is now narrowed to "Docker or not" distinguishment and tests. - Introduce AddCRISocketFlag function that adds --cri-socket flag to a flagSet. Use that in all commands, that support --cri-socket. - Remove the deprecated --cri-socket-path flag from kubeadm config images pull and deprecate --cri-socket in kubeadm upgrade apply. Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
50 lines
1.3 KiB
Python
50 lines
1.3 KiB
Python
package(default_visibility = ["//visibility:public"])
|
|
|
|
load(
|
|
"@io_bazel_rules_go//go:def.bzl",
|
|
"go_library",
|
|
"go_test",
|
|
)
|
|
|
|
go_library(
|
|
name = "go_default_library",
|
|
srcs = [
|
|
"constants.go",
|
|
"constants_unix.go",
|
|
"constants_windows.go",
|
|
],
|
|
importpath = "k8s.io/kubernetes/cmd/kubeadm/app/constants",
|
|
deps = [
|
|
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
|
|
"//pkg/registry/core/service/ipallocator:go_default_library",
|
|
"//staging/src/k8s.io/api/core/v1:go_default_library",
|
|
"//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library",
|
|
"//staging/src/k8s.io/cluster-bootstrap/token/api:go_default_library",
|
|
"//vendor/github.com/pkg/errors:go_default_library",
|
|
],
|
|
)
|
|
|
|
filegroup(
|
|
name = "package-srcs",
|
|
srcs = glob(["**"]),
|
|
tags = ["automanaged"],
|
|
visibility = ["//visibility:private"],
|
|
)
|
|
|
|
filegroup(
|
|
name = "all-srcs",
|
|
srcs = [":package-srcs"],
|
|
tags = ["automanaged"],
|
|
)
|
|
|
|
go_test(
|
|
name = "go_default_test",
|
|
srcs = ["constants_test.go"],
|
|
embed = [":go_default_library"],
|
|
deps = [
|
|
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
|
|
"//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library",
|
|
"//vendor/github.com/pkg/errors:go_default_library",
|
|
],
|
|
)
|