Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rkt: Update kube-up rkt version to v1.14.0 #32020

Merged
merged 2 commits into from Sep 7, 2016
Merged

rkt: Update kube-up rkt version to v1.14.0 #32020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
807d7ba
rkt: Remove recommended rkt version
euank Sep 2, 2016
a2a324b
cluster/rkt: Update default rkt version
euank Sep 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cluster/aws/config-default.sh
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cluster/aws/config-test.sh
View file
Open in desktop
Expand Up @@ -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}
2 changes: 1 addition & 1 deletion cluster/gce/config-default.sh
View file
Open in desktop
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/config-test.sh
View file
Open in desktop
Expand Up @@ -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}
Expand Down
5 changes: 2 additions & 3 deletions pkg/kubelet/rkt/rkt.go
View file
Open in desktop
Expand Up @@ -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"
Expand Down Expand Up @@ -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.
Expand Down
21 changes: 7 additions & 14 deletions pkg/kubelet/rkt/rkt_test.go
View file
Open in desktop
Expand Up @@ -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",
Expand All @@ -198,7 +196,6 @@ func TestCheckVersion(t *testing.T) {
},
// Good versions.
{
"1.2.3+git",
"1.2.3+git",
"1.2.6-alpha",
"100",
Expand All @@ -208,7 +205,6 @@ func TestCheckVersion(t *testing.T) {
},
// Requires greater binary version.
{
"1.2.4",
"1.2.4",
"1.2.6-alpha",
"100",
Expand All @@ -218,7 +214,6 @@ func TestCheckVersion(t *testing.T) {
},
// Requires greater API version.
{
"1.2.3",
"1.2.3",
"1.2.6",
"100",
Expand All @@ -228,7 +223,6 @@ func TestCheckVersion(t *testing.T) {
},
// Requires greater API version.
{
"1.2.3",
"1.2.3",
"1.2.7",
"100",
Expand All @@ -238,7 +232,6 @@ func TestCheckVersion(t *testing.T) {
},
// Requires greater systemd version.
{
"1.2.3",
"1.2.3",
"1.2.7",
"101",
Expand All @@ -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 {
Expand Down
11 changes: 1 addition & 10 deletions pkg/kubelet/rkt/version.go
View file
Open in desktop
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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
}
Expand All @@ -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)
Expand Down