From 807d7ba8ecbb4ee8a8ca32aae357a1ee0664106a Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Fri, 2 Sep 2016 15:09:34 -0700 Subject: [PATCH 1/2] rkt: Remove recommended rkt version This has been unhelpful logspam forever basically. We always want newer versions of rkt to be viable options, and often they have bugfixes as well. --- pkg/kubelet/rkt/rkt.go | 5 ++--- pkg/kubelet/rkt/version.go | 11 +---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go index 75111fc97e9d7..31b2bc6a0b614 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 ee8ff11f382d2..3746857273258 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) From a2a324bf8bb6c919a2ba7c4656a5ac68db78ce95 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Fri, 2 Sep 2016 15:50:28 -0700 Subject: [PATCH 2/2] cluster/rkt: Update default rkt version --- cluster/aws/config-default.sh | 2 +- cluster/aws/config-test.sh | 2 +- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 2 +- pkg/kubelet/rkt/rkt_test.go | 21 +++++++-------------- 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index fbfb242a523d1..3b24158a4c83f 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -151,7 +151,7 @@ NODE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}" KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}" COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}" CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}" -RKT_VERSION="${KUBE_RKT_VERSION:-0.5.5}" +RKT_VERSION="${KUBE_RKT_VERSION:-1.14.0}" # OpenContrail networking plugin specific settings NETWORK_PROVIDER="${NETWORK_PROVIDER:-none}" # opencontrail diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index 107264e0a215c..c44163e58ec74 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -137,7 +137,7 @@ NODE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}" KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}" COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}" CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}" -RKT_VERSION="${KUBE_RKT_VERSION:-0.5.5}" +RKT_VERSION="${KUBE_RKT_VERSION:-1.14.0}" # Optional: if set to true, kube-up will configure the cluster to run e2e tests. E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false} diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 4ec0c0178fe6c..a560faf0b9b6e 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -47,7 +47,7 @@ MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} -RKT_VERSION=${KUBE_RKT_VERSION:-1.9.1} +RKT_VERSION=${KUBE_RKT_VERSION:-1.14.0} RKT_STAGE1_IMAGE=${KUBE_RKT_STAGE1_IMAGE:-coreos.com/rkt/stage1-coreos} NETWORK=${KUBE_GCE_NETWORK:-default} diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index aa9d1c236599b..1ce96fefb3323 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -49,7 +49,7 @@ NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} GCI_DOCKER_VERSION=${KUBE_GCI_DOCKER_VERSION:-} -RKT_VERSION=${KUBE_RKT_VERSION:-1.9.1} +RKT_VERSION=${KUBE_RKT_VERSION:-1.14.0} RKT_STAGE1_IMAGE=${KUBE_RKT_STAGE1_IMAGE:-coreos.com/rkt/stage1-coreos} NETWORK=${KUBE_GCE_NETWORK:-e2e} diff --git a/pkg/kubelet/rkt/rkt_test.go b/pkg/kubelet/rkt/rkt_test.go index 60070125442b6..3dd7a77306542 100644 --- a/pkg/kubelet/rkt/rkt_test.go +++ b/pkg/kubelet/rkt/rkt_test.go @@ -178,17 +178,15 @@ func TestCheckVersion(t *testing.T) { } fs.version = "100" tests := []struct { - minimumRktBinVersion string - recommendedRktBinVersion string - minimumRktApiVersion string - minimumSystemdVersion string - err error - calledGetInfo bool - calledSystemVersion bool + minimumRktBinVersion string + minimumRktApiVersion string + minimumSystemdVersion string + err error + calledGetInfo bool + calledSystemVersion bool }{ // Good versions. { - "1.2.3", "1.2.3", "1.2.5", "99", @@ -198,7 +196,6 @@ func TestCheckVersion(t *testing.T) { }, // Good versions. { - "1.2.3+git", "1.2.3+git", "1.2.6-alpha", "100", @@ -208,7 +205,6 @@ func TestCheckVersion(t *testing.T) { }, // Requires greater binary version. { - "1.2.4", "1.2.4", "1.2.6-alpha", "100", @@ -218,7 +214,6 @@ func TestCheckVersion(t *testing.T) { }, // Requires greater API version. { - "1.2.3", "1.2.3", "1.2.6", "100", @@ -228,7 +223,6 @@ func TestCheckVersion(t *testing.T) { }, // Requires greater API version. { - "1.2.3", "1.2.3", "1.2.7", "100", @@ -238,7 +232,6 @@ func TestCheckVersion(t *testing.T) { }, // Requires greater systemd version. { - "1.2.3", "1.2.3", "1.2.7", "101", @@ -250,7 +243,7 @@ func TestCheckVersion(t *testing.T) { for i, tt := range tests { testCaseHint := fmt.Sprintf("test case #%d", i) - err := r.checkVersion(tt.minimumRktBinVersion, tt.recommendedRktBinVersion, tt.minimumRktApiVersion, tt.minimumSystemdVersion) + err := r.checkVersion(tt.minimumRktBinVersion, tt.minimumRktApiVersion, tt.minimumSystemdVersion) assert.Equal(t, tt.err, err, testCaseHint) if tt.calledGetInfo {