Skip to content

Commit

Permalink
[CE-298] Upgrade flanneld and etcd
Browse files Browse the repository at this point in the history
Currently ansible agent uses download level flanned and
etcd. This patch set will set the both level to latest
and also switch to ipip flanneld backend for VB env.

Change-Id: I3336c8edaaa6d3d491ac3162503b49fdafb167bf
Signed-off-by: Tong Li <litong01@us.ibm.com>
  • Loading branch information
Tong Li committed Mar 12, 2018
1 parent 7799713 commit cb4d5f0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/agent/ansible/vars/aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ cluster: {
etcdnodes: ["fabric001", "fabric002", "fabric003"],
builders: ["fabric001"],

flannel_repo: "https://github.com/coreos/flannel/releases/download/v0.7.1/flannel-v0.7.1-linux-amd64.tar.gz",
etcd_repo: "https://github.com/coreos/etcd/releases/download/v3.2.0/etcd-v3.2.0-linux-amd64.tar.gz",
flannel_repo: "https://github.com/coreos/flannel/releases/download/v0.10.0/flannel-v0.10.0-linux-amd64.tar.gz",
etcd_repo: "https://github.com/coreos/etcd/releases/download/v3.3.2/etcd-v3.3.2-linux-amd64.tar.gz",
k8s_repo: "https://storage.googleapis.com/kubernetes-release/release/v1.9.1/bin/linux/amd64/",
go_repo: "https://dl.google.com/go/go1.9.2.linux-amd64.tar.gz",

Expand Down
4 changes: 2 additions & 2 deletions src/agent/ansible/vars/os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ cluster: {
etcdnodes: ["fabric001", "fabric002", "fabric003"],
builders: ["fabric001"],

flannel_repo: "https://github.com/coreos/flannel/releases/download/v0.7.1/flannel-v0.7.1-linux-amd64.tar.gz",
etcd_repo: "https://github.com/coreos/etcd/releases/download/v3.2.0/etcd-v3.2.0-linux-amd64.tar.gz",
flannel_repo: "https://github.com/coreos/flannel/releases/download/v0.10.0/flannel-v0.10.0-linux-amd64.tar.gz",
etcd_repo: "https://github.com/coreos/etcd/releases/download/v3.3.2/etcd-v3.3.2-linux-amd64.tar.gz",
k8s_repo: "https://storage.googleapis.com/kubernetes-release/release/v1.9.1/bin/linux/amd64/",
go_repo: "https://dl.google.com/go/go1.9.2.linux-amd64.tar.gz",

Expand Down
8 changes: 4 additions & 4 deletions src/agent/ansible/vars/vb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ cluster: {
SubnetMin: "172.16.0.0",
SubnetMax: "172.16.255.0",
Backend: {
Type: "udp",
Port: 8285
Type: "ipip",
DirectRouting: True
}
},

Expand All @@ -52,8 +52,8 @@ cluster: {
etcdnodes: ["fabric001"],
builders: ["fabric001"],

flannel_repo: "https://github.com/coreos/flannel/releases/download/v0.7.1/flannel-v0.7.1-linux-amd64.tar.gz",
etcd_repo: "https://github.com/coreos/etcd/releases/download/v3.2.0/etcd-v3.2.0-linux-amd64.tar.gz",
flannel_repo: "https://github.com/coreos/flannel/releases/download/v0.10.0/flannel-v0.10.0-linux-amd64.tar.gz",
etcd_repo: "https://github.com/coreos/etcd/releases/download/v3.3.2/etcd-v3.3.2-linux-amd64.tar.gz",
k8s_repo: "https://storage.googleapis.com/kubernetes-release/release/v1.9.1/bin/linux/amd64/",
go_repo: "https://dl.google.com/go/go1.9.2.linux-amd64.tar.gz",

Expand Down

0 comments on commit cb4d5f0

Please sign in to comment.