diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go index 75111fc97e9..31b2bc6a0b6 100644 --- a/pkg/kubelet/rkt/rkt.go +++ b/pkg/kubelet/rkt/rkt.go @@ -70,8 +70,7 @@ const ( RktType = "rkt" DefaultRktAPIServiceEndpoint = "localhost:15441" - minimumRktBinVersion = "1.13.0" - recommendedRktBinVersion = "1.13.0" + minimumRktBinVersion = "1.13.0" minimumRktApiVersion = "1.0.0-alpha" minimumSystemdVersion = "219" @@ -1679,7 +1678,7 @@ func (r *Runtime) APIVersion() (kubecontainer.Version, error) { // Status returns error if rkt is unhealthy, nil otherwise. func (r *Runtime) Status() error { - return r.checkVersion(minimumRktBinVersion, recommendedRktBinVersion, minimumRktApiVersion, minimumSystemdVersion) + return r.checkVersion(minimumRktBinVersion, minimumRktApiVersion, minimumSystemdVersion) } // SyncPod syncs the running pod to match the specified desired pod. diff --git a/pkg/kubelet/rkt/version.go b/pkg/kubelet/rkt/version.go index ee8ff11f382..37468572732 100644 --- a/pkg/kubelet/rkt/version.go +++ b/pkg/kubelet/rkt/version.go @@ -22,7 +22,6 @@ import ( "github.com/coreos/go-semver/semver" rktapi "github.com/coreos/rkt/api/v1alpha" - "github.com/golang/glog" "golang.org/x/net/context" ) @@ -98,7 +97,7 @@ func (r *Runtime) getVersions() error { // checkVersion tests whether the rkt/systemd/rkt-api-service that meet the version requirement. // If all version requirements are met, it returns nil. -func (r *Runtime) checkVersion(minimumRktBinVersion, recommendedRktBinVersion, minimumRktApiVersion, minimumSystemdVersion string) error { +func (r *Runtime) checkVersion(minimumRktBinVersion, minimumRktApiVersion, minimumSystemdVersion string) error { if err := r.getVersions(); err != nil { return err } @@ -123,14 +122,6 @@ func (r *Runtime) checkVersion(minimumRktBinVersion, recommendedRktBinVersion, m if result < 0 { return fmt.Errorf("rkt: binary version is too old(%v), requires at least %v", r.versions.binVersion, minimumRktBinVersion) } - result, err = r.versions.binVersion.Compare(recommendedRktBinVersion) - if err != nil { - return err - } - if result != 0 { - // TODO(yifan): Record an event to expose the information. - glog.Warningf("rkt: current binary version %q is not recommended (recommended version %q)", r.versions.binVersion, recommendedRktBinVersion) - } // Check rkt API version. result, err = r.versions.apiVersion.Compare(minimumRktApiVersion)