mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Merge pull request #78053 from ksubrmnn/crisocket
Implement CRI detection for Windows
This commit is contained in:
commit
2f7eaa1ee3
@ -22,5 +22,5 @@ const (
|
|||||||
// DefaultCACertPath defines default location of CA certificate on Windows
|
// DefaultCACertPath defines default location of CA certificate on Windows
|
||||||
DefaultCACertPath = "C:/etc/kubernetes/pki/ca.crt"
|
DefaultCACertPath = "C:/etc/kubernetes/pki/ca.crt"
|
||||||
// DefaultUrlScheme defines default socket url prefix
|
// DefaultUrlScheme defines default socket url prefix
|
||||||
DefaultUrlScheme = "tcp"
|
DefaultUrlScheme = "npipe"
|
||||||
)
|
)
|
||||||
|
@ -22,5 +22,5 @@ const (
|
|||||||
// DefaultCACertPath defines default location of CA certificate on Windows
|
// DefaultCACertPath defines default location of CA certificate on Windows
|
||||||
DefaultCACertPath = "C:/etc/kubernetes/pki/ca.crt"
|
DefaultCACertPath = "C:/etc/kubernetes/pki/ca.crt"
|
||||||
// DefaultUrlScheme defines default socket url prefix
|
// DefaultUrlScheme defines default socket url prefix
|
||||||
DefaultUrlScheme = "tcp"
|
DefaultUrlScheme = "npipe"
|
||||||
)
|
)
|
||||||
|
@ -20,5 +20,5 @@ package constants
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
// DefaultDockerCRISocket defines the default Docker CRI socket
|
// DefaultDockerCRISocket defines the default Docker CRI socket
|
||||||
DefaultDockerCRISocket = "tcp://localhost:2375"
|
DefaultDockerCRISocket = "npipe:////./pipe/docker_engine"
|
||||||
)
|
)
|
||||||
|
@ -2,7 +2,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
|
|||||||
|
|
||||||
go_library(
|
go_library(
|
||||||
name = "go_default_library",
|
name = "go_default_library",
|
||||||
srcs = ["runtime.go"],
|
srcs = [
|
||||||
|
"runtime.go",
|
||||||
|
"runtime_unix.go",
|
||||||
|
"runtime_windows.go",
|
||||||
|
],
|
||||||
importpath = "k8s.io/kubernetes/cmd/kubeadm/app/util/runtime",
|
importpath = "k8s.io/kubernetes/cmd/kubeadm/app/util/runtime",
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
deps = [
|
deps = [
|
||||||
@ -10,7 +14,12 @@ go_library(
|
|||||||
"//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
|
"//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
|
||||||
"//vendor/github.com/pkg/errors:go_default_library",
|
"//vendor/github.com/pkg/errors:go_default_library",
|
||||||
"//vendor/k8s.io/utils/exec:go_default_library",
|
"//vendor/k8s.io/utils/exec:go_default_library",
|
||||||
],
|
] + select({
|
||||||
|
"@io_bazel_rules_go//go/platform:windows": [
|
||||||
|
"//vendor/github.com/Microsoft/go-winio:go_default_library",
|
||||||
|
],
|
||||||
|
"//conditions:default": [],
|
||||||
|
}),
|
||||||
)
|
)
|
||||||
|
|
||||||
go_test(
|
go_test(
|
||||||
|
@ -17,7 +17,6 @@ limitations under the License.
|
|||||||
package util
|
package util
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
goruntime "runtime"
|
goruntime "runtime"
|
||||||
"strings"
|
"strings"
|
||||||
@ -180,23 +179,8 @@ func (runtime *DockerRuntime) ImageExists(image string) (bool, error) {
|
|||||||
return err == nil, nil
|
return err == nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// isExistingSocket checks if path exists and is domain socket
|
|
||||||
func isExistingSocket(path string) bool {
|
|
||||||
fileInfo, err := os.Stat(path)
|
|
||||||
if err != nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
return fileInfo.Mode()&os.ModeSocket != 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// detectCRISocketImpl is separated out only for test purposes, DON'T call it directly, use DetectCRISocket instead
|
// detectCRISocketImpl is separated out only for test purposes, DON'T call it directly, use DetectCRISocket instead
|
||||||
func detectCRISocketImpl(isSocket func(string) bool) (string, error) {
|
func detectCRISocketImpl(isSocket func(string) bool) (string, error) {
|
||||||
const (
|
|
||||||
dockerSocket = "/var/run/docker.sock" // The Docker socket is not CRI compatible
|
|
||||||
containerdSocket = "/run/containerd/containerd.sock"
|
|
||||||
)
|
|
||||||
|
|
||||||
foundCRISockets := []string{}
|
foundCRISockets := []string{}
|
||||||
knownCRISockets := []string{
|
knownCRISockets := []string{
|
||||||
// Docker and containerd sockets are special cased below, hence not to be included here
|
// Docker and containerd sockets are special cased below, hence not to be included here
|
||||||
@ -233,9 +217,5 @@ func detectCRISocketImpl(isSocket func(string) bool) (string, error) {
|
|||||||
|
|
||||||
// DetectCRISocket uses a list of known CRI sockets to detect one. If more than one or none is discovered, an error is returned.
|
// DetectCRISocket uses a list of known CRI sockets to detect one. If more than one or none is discovered, an error is returned.
|
||||||
func DetectCRISocket() (string, error) {
|
func DetectCRISocket() (string, error) {
|
||||||
if goruntime.GOOS != "linux" {
|
|
||||||
return constants.DefaultDockerCRISocket, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return detectCRISocketImpl(isExistingSocket)
|
return detectCRISocketImpl(isExistingSocket)
|
||||||
}
|
}
|
||||||
|
38
cmd/kubeadm/app/util/runtime/runtime_unix.go
Normal file
38
cmd/kubeadm/app/util/runtime/runtime_unix.go
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
// +build !windows
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright 2019 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 util
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
dockerSocket = "/var/run/docker.sock" // The Docker socket is not CRI compatible
|
||||||
|
containerdSocket = "/run/containerd/containerd.sock"
|
||||||
|
)
|
||||||
|
|
||||||
|
// isExistingSocket checks if path exists and is domain socket
|
||||||
|
func isExistingSocket(path string) bool {
|
||||||
|
fileInfo, err := os.Stat(path)
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return fileInfo.Mode()&os.ModeSocket != 0
|
||||||
|
}
|
38
cmd/kubeadm/app/util/runtime/runtime_windows.go
Normal file
38
cmd/kubeadm/app/util/runtime/runtime_windows.go
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
// +build windows
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright 2019 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 util
|
||||||
|
|
||||||
|
import (
|
||||||
|
winio "github.com/Microsoft/go-winio"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
dockerSocket = "//./pipe/docker_engine" // The Docker socket is not CRI compatible
|
||||||
|
containerdSocket = "//./pipe/containerd-containerd" // Proposed containerd named pipe for Windows
|
||||||
|
)
|
||||||
|
|
||||||
|
// isExistingSocket checks if path exists and is domain socket
|
||||||
|
func isExistingSocket(path string) bool {
|
||||||
|
_, err := winio.DialPipe(path, nil)
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user