github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

cluster/rkt: Update default rkt version

Browse Source
This commit is contained in:
Euan Kemp 2016-09-02 15:50:28 -07:00
parent 807d7ba8ec
commit a2a324bf8b
5 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/aws/config-default.sh
View File

@ -151,7 +151,7 @@ NODE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}" KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}"
COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}" COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}"
CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}" 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 # OpenContrail networking plugin specific settings
NETWORK_PROVIDER="${NETWORK_PROVIDER:-none}" # opencontrail NETWORK_PROVIDER="${NETWORK_PROVIDER:-none}" # opencontrail

2
cluster/aws/config-test.sh
View File

@ -137,7 +137,7 @@ NODE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}" KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}"
COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}" COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}"
CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}" 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. # 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} E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false}

2
cluster/gce/config-default.sh
View File

@ -47,7 +47,7 @@ MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}
NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers}
CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} 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} RKT_STAGE1_IMAGE=${KUBE_RKT_STAGE1_IMAGE:-coreos.com/rkt/stage1-coreos}
NETWORK=${KUBE_GCE_NETWORK:-default} NETWORK=${KUBE_GCE_NETWORK:-default}

2
cluster/gce/config-test.sh
View File

@ -49,7 +49,7 @@ NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}
NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers} NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers}
CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker} CONTAINER_RUNTIME=${KUBE_CONTAINER_RUNTIME:-docker}
GCI_DOCKER_VERSION=${KUBE_GCI_DOCKER_VERSION:-} 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} RKT_STAGE1_IMAGE=${KUBE_RKT_STAGE1_IMAGE:-coreos.com/rkt/stage1-coreos}
NETWORK=${KUBE_GCE_NETWORK:-e2e} NETWORK=${KUBE_GCE_NETWORK:-e2e}

21
pkg/kubelet/rkt/rkt_test.go
View File

@ -178,17 +178,15 @@ func TestCheckVersion(t *testing.T) {
} }
fs.version = "100" fs.version = "100"
tests := []struct { tests := []struct {
minimumRktBinVersion string minimumRktBinVersion string
recommendedRktBinVersion string minimumRktApiVersion string
minimumRktApiVersion string minimumSystemdVersion string
minimumSystemdVersion string err error
err error calledGetInfo bool
calledGetInfo bool calledSystemVersion bool
calledSystemVersion bool
}{ }{
// Good versions. // Good versions.
{ {
"1.2.3",
"1.2.3", "1.2.3",
"1.2.5", "1.2.5",
"99", "99",
@ -198,7 +196,6 @@ func TestCheckVersion(t *testing.T) {
}, },
// Good versions. // Good versions.
{ {
"1.2.3+git",
"1.2.3+git", "1.2.3+git",
"1.2.6-alpha", "1.2.6-alpha",
"100", "100",
@ -208,7 +205,6 @@ func TestCheckVersion(t *testing.T) {
}, },
// Requires greater binary version. // Requires greater binary version.
{ {
"1.2.4",
"1.2.4", "1.2.4",
"1.2.6-alpha", "1.2.6-alpha",
"100", "100",
@ -218,7 +214,6 @@ func TestCheckVersion(t *testing.T) {
}, },
// Requires greater API version. // Requires greater API version.
{ {
"1.2.3",
"1.2.3", "1.2.3",
"1.2.6", "1.2.6",
"100", "100",
@ -228,7 +223,6 @@ func TestCheckVersion(t *testing.T) {
}, },
// Requires greater API version. // Requires greater API version.
{ {
"1.2.3",
"1.2.3", "1.2.3",
"1.2.7", "1.2.7",
"100", "100",
@ -238,7 +232,6 @@ func TestCheckVersion(t *testing.T) {
}, },
// Requires greater systemd version. // Requires greater systemd version.
{ {
"1.2.3",
"1.2.3", "1.2.3",
"1.2.7", "1.2.7",
"101", "101",
@ -250,7 +243,7 @@ func TestCheckVersion(t *testing.T) {
for i, tt := range tests { for i, tt := range tests {
testCaseHint := fmt.Sprintf("test case #%d", i) 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) assert.Equal(t, tt.err, err, testCaseHint)
if tt.calledGetInfo { if tt.calledGetInfo {