github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages 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
parent be22f605cf 805be30745
commit 02109414e8
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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}
if err := service.determineAPIVersion(conn); err != nil {
if err := service.determineAPIVersion(conn, endpoint); err != nil {
return nil, err
}
@@ -84,7 +84,7 @@ func (r *remoteImageService) useV1API() bool {
// being upgraded, then the container runtime must also support the initially
// selected version or the redial is expected to fail, which requires a restart
// 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)
defer cancel()
@@ -99,7 +99,7 @@ func (r *remoteImageService) determineAPIVersion(conn *grpc.ClientConn) error {
r.imageClientV1alpha2 = runtimeapiV1alpha2.NewImageServiceClient(conn)
} 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

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),
}
if err := service.determineAPIVersion(conn); err != nil {
if err := service.determineAPIVersion(conn, endpoint); err != nil {
return nil, err
}
@@ -128,7 +128,7 @@ func (r *remoteRuntimeService) useV1API() bool {
// being upgraded, then the container runtime must also support the initially
// selected version or the redial is expected to fail, which requires a restart
// 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)
defer cancel()
@@ -143,7 +143,7 @@ func (r *remoteRuntimeService) determineAPIVersion(conn *grpc.ClientConn) error
r.runtimeClientV1alpha2 = runtimeapiV1alpha2.NewRuntimeServiceClient(conn)
} 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