github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #112542 from astraw99/fix-runtime-validate

Browse Source 
Add validation for runtime endpoint flag
This commit is contained in:
Kubernetes Prow Robot 2022-09-30 18:04:24 -07:00 committed by GitHub
commit 02109414e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/kubelet/app/options/options.go
View File

@ -193,6 +193,13 @@ func ValidateKubeletFlags(f *KubeletFlags) error {
return fmt.Errorf("unsupported CRI runtime: %q, only %q is currently supported", f.ContainerRuntime, kubetypes.RemoteContainerRuntime) return fmt.Errorf("unsupported CRI runtime: %q, only %q is currently supported", f.ContainerRuntime, kubetypes.RemoteContainerRuntime)
} }
// Note: maybe we can test it for being a valid socket address as an additional improvement.
// The only problem with it will be that some setups may not specify 'unix://' prefix.
// So just check empty for back compat.
if f.RemoteRuntimeEndpoint == "" {
return fmt.Errorf("the container runtime endpoint address was not specified or empty, use --container-runtime-endpoint to set")
}
return nil return nil
} }

3
cmd/kubelet/app/options/options_test.go
View File

@ -183,7 +183,8 @@ func TestValidateKubeletFlags(t *testing.T) {
ContainerRuntimeOptions: config.ContainerRuntimeOptions{ ContainerRuntimeOptions: config.ContainerRuntimeOptions{
ContainerRuntime: kubetypes.RemoteContainerRuntime, ContainerRuntime: kubetypes.RemoteContainerRuntime,
}, },
NodeLabels: tt.labels, RemoteRuntimeEndpoint: "unix:///run/containerd/containerd.sock",
NodeLabels: tt.labels,
}) })
if tt.error && err == nil { if tt.error && err == nil {

6
pkg/kubelet/cri/remote/remote_image.go
View File

@ -63,7 +63,7 @@ func NewRemoteImageService(endpoint string, connectionTimeout time.Duration) (in
service := &remoteImageService{timeout: connectionTimeout} service := &remoteImageService{timeout: connectionTimeout}
if err := service.determineAPIVersion(conn); err != nil { if err := service.determineAPIVersion(conn, endpoint); err != nil {
return nil, err return nil, err
} }
@ -84,7 +84,7 @@ func (r *remoteImageService) useV1API() bool {
// being upgraded, then the container runtime must also support the initially // being upgraded, then the container runtime must also support the initially
// selected version or the redial is expected to fail, which requires a restart // selected version or the redial is expected to fail, which requires a restart
// of kubelet. // of kubelet.
func (r *remoteImageService) determineAPIVersion(conn *grpc.ClientConn) error { func (r *remoteImageService) determineAPIVersion(conn *grpc.ClientConn, endpoint string) error {
ctx, cancel := getContextWithTimeout(r.timeout) ctx, cancel := getContextWithTimeout(r.timeout)
defer cancel() defer cancel()
@ -99,7 +99,7 @@ func (r *remoteImageService) determineAPIVersion(conn *grpc.ClientConn) error {
r.imageClientV1alpha2 = runtimeapiV1alpha2.NewImageServiceClient(conn) r.imageClientV1alpha2 = runtimeapiV1alpha2.NewImageServiceClient(conn)
} else { } else {
return fmt.Errorf("unable to determine image API version: %w", err) return fmt.Errorf("unable to determine image API version with %q, or API is not implemented: %w", endpoint, err)
} }
return nil return nil

6
pkg/kubelet/cri/remote/remote_runtime.go
View File

@ -108,7 +108,7 @@ func NewRemoteRuntimeService(endpoint string, connectionTimeout time.Duration, t
logReduction: logreduction.NewLogReduction(identicalErrorDelay), logReduction: logreduction.NewLogReduction(identicalErrorDelay),
} }
if err := service.determineAPIVersion(conn); err != nil { if err := service.determineAPIVersion(conn, endpoint); err != nil {
return nil, err return nil, err
} }
@ -128,7 +128,7 @@ func (r *remoteRuntimeService) useV1API() bool {
// being upgraded, then the container runtime must also support the initially // being upgraded, then the container runtime must also support the initially
// selected version or the redial is expected to fail, which requires a restart // selected version or the redial is expected to fail, which requires a restart
// of kubelet. // of kubelet.
func (r *remoteRuntimeService) determineAPIVersion(conn *grpc.ClientConn) error { func (r *remoteRuntimeService) determineAPIVersion(conn *grpc.ClientConn, endpoint string) error {
ctx, cancel := getContextWithTimeout(r.timeout) ctx, cancel := getContextWithTimeout(r.timeout)
defer cancel() defer cancel()
@ -143,7 +143,7 @@ func (r *remoteRuntimeService) determineAPIVersion(conn *grpc.ClientConn) error
r.runtimeClientV1alpha2 = runtimeapiV1alpha2.NewRuntimeServiceClient(conn) r.runtimeClientV1alpha2 = runtimeapiV1alpha2.NewRuntimeServiceClient(conn)
} else { } else {
return fmt.Errorf("unable to determine runtime API version: %w", err) return fmt.Errorf("unable to determine runtime API version with %q, or API is not implemented: %w", endpoint, err)
} }
return nil return nil