Skip to content
This repository has been archived by the owner on Mar 28, 2020. It is now read-only.

Commit

Permalink
*: make default etcd version to 3.2.9
Browse files Browse the repository at this point in the history
  • Loading branch information
hongchaodeng committed Oct 31, 2017
1 parent 113bcac commit a54e109
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion example/example-etcd-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ metadata:
name: "example-etcd-cluster"
spec:
size: 3
version: "3.1.8"
version: "3.2.9"
8 changes: 4 additions & 4 deletions pkg/apis/etcd/v1beta2/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
)

const (
defaultBaseImage = "quay.io/coreos/etcd"
defaultVersion = "3.1.8"
defaultBaseImage = "gcr.io/etcd-development/etcd"
defaultVersion = "3.2.9"
)

var (
Expand Down Expand Up @@ -92,10 +92,10 @@ type ClusterSpec struct {
// The etcd-operator will eventually make the etcd cluster version
// equal to the expected version.
//
// The version must follow the [semver]( http://semver.org) format, for example "3.1.8".
// The version must follow the [semver]( http://semver.org) format, for example "3.2.9".
// Only etcd released versions are supported: https://github.com/coreos/etcd/releases
//
// If version is not set, default is "3.1.8".
// If version is not set, default is "3.2.9".
Version string `json:"version,omitempty"`

// Paused is to pause the control of the operator for the etcd cluster.
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/basic_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func TestEtcdUpgrade(t *testing.T) {
}
f := framework.Global
origEtcd := e2eutil.NewCluster("test-etcd-", 3)
origEtcd = e2eutil.ClusterWithVersion(origEtcd, "3.0.16")
origEtcd = e2eutil.ClusterWithVersion(origEtcd, "3.2.8")
testEtcd, err := e2eutil.CreateCluster(t, f.CRClient, f.Namespace, origEtcd)
if err != nil {
t.Fatal(err)
Expand All @@ -119,21 +119,21 @@ func TestEtcdUpgrade(t *testing.T) {
}
}()

err = e2eutil.WaitSizeAndVersionReached(t, f.KubeClient, "3.0.16", 3, 6, testEtcd)
err = e2eutil.WaitSizeAndVersionReached(t, f.KubeClient, "3.2.8", 3, 6, testEtcd)
if err != nil {
t.Fatalf("failed to create 3 members etcd cluster: %v", err)
}

updateFunc := func(cl *api.EtcdCluster) {
cl = e2eutil.ClusterWithVersion(cl, "3.1.8")
cl = e2eutil.ClusterWithVersion(cl, "3.2.9")
}
_, err = e2eutil.UpdateCluster(f.CRClient, testEtcd, 10, updateFunc)
if err != nil {
t.Fatalf("fail to update cluster version: %v", err)
}

// We have seen in k8s 1.7.1 env it took 35s for the pod to restart with the new image.
err = e2eutil.WaitSizeAndVersionReached(t, f.KubeClient, "3.1.8", 3, 10, testEtcd)
err = e2eutil.WaitSizeAndVersionReached(t, f.KubeClient, "3.2.9", 3, 10, testEtcd)
if err != nil {
t.Fatalf("failed to wait new version etcd cluster: %v", err)
}
Expand Down

0 comments on commit a54e109

Please sign in to comment.