The package rpms/flannel.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/flannel.git/commit/?id=21fbea5486....
Change:
-%ifarch s390x
Thanks.
Full change:
============
commit 21fbea54868a330a4e084ea07d6be5fb163ee76b
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Mon Sep 25 10:01:37 2017 +0200
Update to 9.0.0
- resolves: #1443517
diff --git a/.gitignore b/.gitignore
index 2e1e389..2c0b635 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/flannel-d9560b0.tar.gz
+/flannel-317b7d1.tar.gz
diff --git a/change-4001-to-2379-in-help-and-README.patch
b/change-4001-to-2379-in-help-and-README.patch
deleted file mode 100644
index 0a5847a..0000000
--- a/change-4001-to-2379-in-help-and-README.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ddafb2f121148b778081c5c934032870e755c59f Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup(a)redhat.com>
-Date: Fri, 16 Dec 2016 17:01:13 +0100
-Subject: [PATCH] change 4001 to 2379 in help and README
-
----
- README.md | 2 +-
- main.go | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/README.md b/README.md
-index dffd3ad..6e691c6 100644
---- a/README.md
-+++ b/README.md
-@@ -182,7 +182,7 @@ $ flanneld --remote=10.0.0.3:8888 --networks=blue,green
-
- ```
- --public-ip="": IP accessible by other nodes for inter-host communication.
Defaults to the IP of the interface being used for communication.
----etcd-endpoints=http://127.0.0.1:4001: a comma-delimited list of etcd endpoints.
-+--etcd-endpoints=http://127.0.0.1:2379: a comma-delimited list of etcd endpoints.
- --etcd-prefix=/coreos.com/network: etcd prefix.
- --etcd-keyfile="": SSL key file used to secure etcd communication.
- --etcd-certfile="": SSL certification file used to secure etcd communication.
-diff --git a/main.go b/main.go
-index d6dc894..b6493e0 100644
---- a/main.go
-+++ b/main.go
-@@ -61,7 +61,7 @@ type CmdLineOpts struct {
- var opts CmdLineOpts
-
- func init() {
-- flag.StringVar(&opts.etcdEndpoints, "etcd-endpoints",
"http://127.0.0.1:4001,http://127.0.0.1:2379", "a comma-delimited list of
etcd endpoints")
-+ flag.StringVar(&opts.etcdEndpoints, "etcd-endpoints",
"http://127.0.0.1:2379", "a comma-delimited list of etcd endpoints")
- flag.StringVar(&opts.etcdPrefix, "etcd-prefix",
"/coreos.com/network", "etcd prefix")
- flag.StringVar(&opts.etcdKeyfile, "etcd-keyfile", "", "SSL
key file used to secure etcd communication")
- flag.StringVar(&opts.etcdCertfile, "etcd-certfile", "",
"SSL certification file used to secure etcd communication")
---
-2.7.4
-
diff --git a/change-coreos.com-network-to-atomic.io-network-in-he.patch
b/change-coreos.com-network-to-atomic.io-network-in-he.patch
index 99cfafc..5a2213a 100644
--- a/change-coreos.com-network-to-atomic.io-network-in-he.patch
+++ b/change-coreos.com-network-to-atomic.io-network-in-he.patch
@@ -1,243 +1,90 @@
-From a9ca02c0e9ec58f86171a1bf9d122bd1d1656d01 Mon Sep 17 00:00:00 2001
+From 1831a1f0b7ab2832e891fc797c89a184f4e7be64 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup(a)redhat.com>
-Date: Fri, 16 Dec 2016 17:07:05 +0100
-Subject: [PATCH] change
coreos.com/network to atomic.io/network in help and
- docs
+Date: Mon, 25 Sep 2017 09:56:16 +0200
+Subject: [PATCH] change
coreos.com/network to atomic.io/network
---
- Documentation/aws-vpc-backend.md | 2 +-
- Documentation/gce-backend.md | 2 +-
- README.md | 10 +++++-----
- main.go | 2 +-
- subnet/mock_etcd_test.go | 34 +++++++++++++++++-----------------
- subnet/registry.go | 2 +-
- subnet/registry_test.go | 8 ++++----
- 7 files changed, 30 insertions(+), 30 deletions(-)
+ Documentation/alicloud-vpc-backend.md | 2 +-
+ Documentation/configuration.md | 2 +-
+ Documentation/running.md | 4 ++--
+ dist/functional-test.sh | 2 +-
+ subnet/etcdv2/registry_test.go | 2 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
-diff --git a/Documentation/aws-vpc-backend.md b/Documentation/aws-vpc-backend.md
-index 357c9e9..68217d4 100644
---- a/Documentation/aws-vpc-backend.md
-+++ b/Documentation/aws-vpc-backend.md
-@@ -116,7 +116,7 @@ $ etcd2 -advertise-client-urls http://$INTERNAL_IP:2379
-listen-client-urls http
+diff --git a/Documentation/alicloud-vpc-backend.md
b/Documentation/alicloud-vpc-backend.md
+index 8e0cf66..925d13f 100644
+--- a/Documentation/alicloud-vpc-backend.md
++++ b/Documentation/alicloud-vpc-backend.md
+@@ -51,7 +51,7 @@ $ etcd --advertise-client-urls http://$INTERNAL_IP:2379
--listen-client-urls htt
- Publish configuration in etcd (ensure that the network range does not overlap with the
one configured for the VPC)
```
--$ etcdctl set /coreos.com/network/config
'{"Network":"10.20.0.0/16", "Backend":
{"Type": "aws-vpc"}}'
-+$ etcdctl set /atomic.io/network/config
'{"Network":"10.20.0.0/16", "Backend":
{"Type": "aws-vpc"}}'
+-$ etcdctl set /coreos.com/network/config
'{"Network":"10.24.0.0/16", "Backend":
{"Type": "ali-vpc"}}'
++$ etcdctl set atomic.io/network/config
'{"Network":"10.24.0.0/16", "Backend":
{"Type": "ali-vpc"}}'
```
- - Fetch the latest release using wget from
[
here](https://github.com/coreos/flannel/releases/download/v0.5.0/flannel-...
- - Run flannel daemon:
-diff --git a/Documentation/gce-backend.md b/Documentation/gce-backend.md
-index 35ed8b4..675c4b0 100644
---- a/Documentation/gce-backend.md
-+++ b/Documentation/gce-backend.md
-@@ -44,7 +44,7 @@ $ etcd2 -advertise-client-urls http://$INTERNAL_IP:2379
-listen-client-urls http
- - Publish configuration in etcd (ensure that the network range does not overlap with the
one configured for the GCE network)
+ - Fetch the latest release using wget from
https://github.com/coreos/flannel/
+ - make dist/flanneld
+diff --git a/Documentation/configuration.md b/Documentation/configuration.md
+index cd0c41a..caa3856 100644
+--- a/Documentation/configuration.md
++++ b/Documentation/configuration.md
+@@ -2,7 +2,7 @@
- ```
--$ etcdctl set /coreos.com/network/config
'{"Network":"10.40.0.0/16", "Backend":
{"Type": "gce"}}'
-+$ etcdctl set /atomic.io/network/config
'{"Network":"10.40.0.0/16", "Backend":
{"Type": "gce"}}'
- ```
+ flannel reads its configuration from etcd.
- - Fetch the 0.5 release using wget from
[
here](https://github.com/coreos/flannel/releases/download/v0.5.0/flannel-...
-diff --git a/README.md b/README.md
-index 6e691c6..7b05d41 100644
---- a/README.md
-+++ b/README.md
-@@ -43,7 +43,7 @@ docker run -v $SRC:/opt/flannel -i -t google/golang /bin/bash -c
"cd /opt/flanne
- ## Configuration
+-By default, it will read the configuration from `/coreos.com/network/config` (which can
be overridden using `--etcd-prefix`).
++By default, it will read the configuration from `atomic.io/network/config` (which can be
overridden using `--etcd-prefix`).
- flannel reads its configuration from etcd.
--By default, it will read the configuration from `/coreos.com/network/config` (can be
overridden via `--etcd-prefix`).
-+By default, it will read the configuration from `/atomic.io/network/config` (can be
overridden via `--etcd-prefix`).
- You can use `etcdctl` utility to set values in etcd.
- The value of the config is a JSON dictionary with the following keys:
+ Use the `etcdctl` utility to set values in etcd.
-@@ -147,9 +147,9 @@ Multi-network mode allows a single flannel daemon to join multiple
networks.
- Each network is independent from each other and has its own configuration, IP space,
interfaces.
- To configure three networks -- in this example named `blue`, `green`, and `red` -- start
by publishing their configurations to etcd in different locations:
+diff --git a/Documentation/running.md b/Documentation/running.md
+index 163e7df..71a45e2 100644
+--- a/Documentation/running.md
++++ b/Documentation/running.md
+@@ -35,7 +35,7 @@ docker run --rm --net=host quay.io/coreos/etcd
```
--$ etcdctl set /coreos.com/network/blue/config '{ "Network":
"10.1.0.0/16", "Backend": { "Type": "vxlan",
"VNI": 1 } }'
--$ etcdctl set /coreos.com/network/green/config '{ "Network":
"10.2.0.0/16", "Backend": { "Type": "vxlan",
"VNI": 2 } }'
--$ etcdctl set /coreos.com/network/red/config '{ "Network":
"10.3.0.0/16", "Backend": { "Type": "vxlan",
"VNI": 3 } }'
-+$ etcdctl set /atomic.io/network/blue/config '{ "Network":
"10.1.0.0/16", "Backend": { "Type": "vxlan",
"VNI": 1 } }'
-+$ etcdctl set /atomic.io/network/green/config '{ "Network":
"10.2.0.0/16", "Backend": { "Type": "vxlan",
"VNI": 2 } }'
-+$ etcdctl set /atomic.io/network/red/config '{ "Network":
"10.3.0.0/16", "Backend": { "Type": "vxlan",
"VNI": 3 } }'
+ 4. Observe that `flannel` can now talk to `etcd`, but can't find any config. So
write some config. Either get `etcdctl` from the [CoreOS etcd page][coreos-etcd], or use
`docker` again.
+ ```bash
+-docker run --rm --net=host quay.io/coreos/etcd etcdctl set /coreos.com/network/config
'{ "Network": "10.5.0.0/16", "Backend":
{"Type": "vxlan"}}'
++docker run --rm --net=host quay.io/coreos/etcd etcdctl set atomic.io/network/config
'{ "Network": "10.5.0.0/16", "Backend":
{"Type": "vxlan"}}'
```
+ Now `flannel` is running, it has created a VXLAN tunnel device on the host and written a
subnet config file
- Next, start the flannel daemon, specifying the networks to join:
-@@ -183,7 +183,7 @@ $ flanneld --remote=10.0.0.3:8888 --networks=blue,green
+@@ -60,7 +60,7 @@ FLANNEL_IPMASQ=false
+ ```
+ etcd network value is `10.6.0.0/16`. Since `10.5.72.1/24` is outside of this network, a
new lease will be allocated.
+ ```bash
+-etcdctl get /coreos.com/network/config
++etcdctl get atomic.io/network/config
+ { "Network": "10.6.0.0/16", "Backend": {"Type":
"vxlan"}}
```
- --public-ip="": IP accessible by other nodes for inter-host communication.
Defaults to the IP of the interface being used for communication.
- --etcd-endpoints=http://127.0.0.1:2379: a comma-delimited list of etcd endpoints.
----etcd-prefix=/coreos.com/network: etcd prefix.
-+--etcd-prefix=/atomic.io/network: etcd prefix.
- --etcd-keyfile="": SSL key file used to secure etcd communication.
- --etcd-certfile="": SSL certification file used to secure etcd communication.
- --etcd-cafile="": SSL Certificate Authority file used to secure etcd
communication.
-diff --git a/main.go b/main.go
-index b6493e0..5adfb55 100644
---- a/main.go
-+++ b/main.go
-@@ -62,7 +62,7 @@ var opts CmdLineOpts
-
- func init() {
- flag.StringVar(&opts.etcdEndpoints, "etcd-endpoints",
"http://127.0.0.1:2379", "a comma-delimited list of etcd endpoints")
-- flag.StringVar(&opts.etcdPrefix, "etcd-prefix",
"/coreos.com/network", "etcd prefix")
-+ flag.StringVar(&opts.etcdPrefix, "etcd-prefix",
"/atomic.io/network", "etcd prefix")
- flag.StringVar(&opts.etcdKeyfile, "etcd-keyfile", "", "SSL
key file used to secure etcd communication")
- flag.StringVar(&opts.etcdCertfile, "etcd-certfile", "",
"SSL certification file used to secure etcd communication")
- flag.StringVar(&opts.etcdCAFile, "etcd-cafile", "", "SSL
Certificate Authority file used to secure etcd communication")
-diff --git a/subnet/mock_etcd_test.go b/subnet/mock_etcd_test.go
-index 8927cd2..e838282 100644
---- a/subnet/mock_etcd_test.go
-+++ b/subnet/mock_etcd_test.go
-@@ -70,17 +70,17 @@ func watchMockEtcd(ctx context.Context, watcher etcd.Watcher, result
chan error)
- }
-
- expected := []evt{
-- {"/coreos.com/network/foobar/config", "create", false},
-- {"/coreos.com/network/blah/config", "create", false},
-- {"/coreos.com/network/blah/config", "update", false},
-- {"/coreos.com/network/foobar/config", "delete", false},
-- {"/coreos.com/network/foobar", "delete", false},
-+ {"/atomic.io/network/foobar/config", "create", false},
-+ {"/atomic.io/network/blah/config", "create", false},
-+ {"/atomic.io/network/blah/config", "update", false},
-+ {"/atomic.io/network/foobar/config", "delete", false},
-+ {"/atomic.io/network/foobar", "delete", false},
- }
-
-- // Wait for delete events on /coreos.com/network/foobar and its
-+ // Wait for delete events on /atomic.io/network/foobar and its
- // 'config' child, and for the update event on
-- // /coreos.com/network/foobar (for 'config' delete) and on
-- // /coreos.com/network (for 'foobar' delete)
-+ // /atomic.io/network/foobar (for 'config' delete) and on
-+ // /atomic.io/network (for 'foobar' delete)
- numEvents := 0
- for {
- resp, err := watcher.Next(ctx)
-@@ -134,24 +134,24 @@ func TestMockEtcd(t *testing.T) {
-
- // Create base test keys
- sopts := &etcd.SetOptions{Dir: true}
-- r, err = m.Set(ctx, "/coreos.com/network", "", sopts)
-+ r, err = m.Set(ctx, "/atomic.io/network", "", sopts)
- e = &etcd.Response{Action: "create", Index: 1002}
- expectSuccess(t, r, err, e, "")
-
- wopts := &etcd.WatcherOptions{AfterIndex: m.index, Recursive: true}
-- watcher :=
m.Watcher("/coreos.com/network", wopts)
-+ watcher := m.Watcher("/atomic.io/network", wopts)
-
- result := make(chan error, 1)
- go watchMockEtcd(ctx, watcher, result)
-
- // Populate etcd with some keys
-- netKey1 := "/coreos.com/network/foobar/config"
-+ netKey1 := "/atomic.io/network/foobar/config"
- netValue := "{ \"Network\": \"10.1.0.0/16\",
\"Backend\": { \"Type\": \"host-gw\" } }"
- r, err = m.Create(ctx, netKey1, netValue)
- e = &etcd.Response{Action: "create", Index: 1004}
- expectSuccess(t, r, err, e, netValue)
-
-- netKey2 := "/coreos.com/network/blah/config"
-+ netKey2 := "/atomic.io/network/blah/config"
- netValue = "{ \"Network\": \"10.1.1.0/16\",
\"Backend\": { \"Type\": \"host-gw\" } }"
- r, err = m.Create(ctx, netKey2, netValue)
- e = &etcd.Response{Action: "create", Index: 1006}
-@@ -178,7 +178,7 @@ func TestMockEtcd(t *testing.T) {
-
- // test directory listing
- opts = &etcd.GetOptions{Recursive: true, Quorum: true}
-- r, err = m.Get(ctx, "/coreos.com/network/", opts)
-+ r, err = m.Get(ctx, "/atomic.io/network/", opts)
- e = &etcd.Response{Action: "get", Index: 1007}
- expectSuccess(t, r, err, e, "")
-
-@@ -191,9 +191,9 @@ func TestMockEtcd(t *testing.T) {
- if child.Dir != true {
- t.Fatalf("Unexpected non-directory child %s", child.Key)
- }
-- if child.Key == "/coreos.com/network/foobar" {
-+ if child.Key == "/atomic.io/network/foobar" {
- node1Found = true
-- } else if child.Key == "/coreos.com/network/blah" {
-+ } else if child.Key == "/atomic.io/network/blah" {
- node2Found = true
- } else {
- t.Fatalf("Unexpected child %s found", child.Key)
-@@ -208,14 +208,14 @@ func TestMockEtcd(t *testing.T) {
-
- // Delete a key
- dopts := &etcd.DeleteOptions{Recursive: true, Dir: false}
-- r, err = m.Delete(ctx, "/coreos.com/network/foobar", dopts)
-+ r, err = m.Delete(ctx, "/atomic.io/network/foobar", dopts)
- if err == nil {
- t.Fatalf("Unexpected success deleting a directory")
- }
-
- // Delete a key
- dopts = &etcd.DeleteOptions{Recursive: true, Dir: true}
-- r, err = m.Delete(ctx, "/coreos.com/network/foobar", dopts)
-+ r, err = m.Delete(ctx, "/atomic.io/network/foobar", dopts)
- e = &etcd.Response{Action: "delete", Index: 1010}
- expectSuccess(t, r, err, e, "")
-
-diff --git a/subnet/registry.go b/subnet/registry.go
-index dd8083b..42cbfb0 100644
---- a/subnet/registry.go
-+++ b/subnet/registry.go
-@@ -384,7 +384,7 @@ func (esr *etcdSubnetRegistry) parseNetworkWatchResponse(resp
*etcd.Response) (E
- return evt, index, nil
- }
-
--// Returns network name from config key (eg, /coreos.com/network/foobar/config),
-+// Returns network name from config key (eg, /atomic.io/network/foobar/config),
- // if the 'config' key isn't present we don't consider the network
valid
- func (esr *etcdSubnetRegistry) parseNetworkKey(s string) (string, bool) {
- if parts := esr.networkRegex.FindStringSubmatch(s); len(parts) == 3 {
-diff --git a/subnet/registry_test.go b/subnet/registry_test.go
-index 8d7524f..4c64423 100644
---- a/subnet/registry_test.go
-+++ b/subnet/registry_test.go
-@@ -29,7 +29,7 @@ import (
- func newTestEtcdRegistry(t *testing.T) (Registry, *mockEtcd) {
- cfg := &EtcdConfig{
- Endpoints: []string{"http://127.0.0.1:4001",
"http://127.0.0.1:2379"},
-- Prefix: "/coreos.com/network",
-+ Prefix: "/atomic.io/network",
- }
- r, err := newEtcdSubnetRegistry(cfg, func(c *EtcdConfig) (etcd.KeysAPI, error) {
-@@ -105,7 +105,7 @@ func TestEtcdRegistry(t *testing.T) {
+diff --git a/dist/functional-test.sh b/dist/functional-test.sh
+index e334a1f..dca21c0 100755
+--- a/dist/functional-test.sh
++++ b/dist/functional-test.sh
+@@ -47,7 +47,7 @@ run_test() {
+ fi
+
+ # etcd might take a bit to come up
+- while ! docker run --rm -it $ETCD_IMG etcdctl --endpoints=$etcd_endpt set
/coreos.com/network/config "$flannel_conf"
++ while ! docker run --rm -it $ETCD_IMG etcdctl --endpoints=$etcd_endpt set
atomic.io/network/config "$flannel_conf"
+ do
+ sleep 1
+ done
+diff --git a/subnet/etcdv2/registry_test.go b/subnet/etcdv2/registry_test.go
+index cad75a2..100e081 100644
+--- a/subnet/etcdv2/registry_test.go
++++ b/subnet/etcdv2/registry_test.go
+@@ -101,7 +101,7 @@ func TestEtcdRegistry(t *testing.T) {
}
// Populate etcd with a network
-- netKey := "/coreos.com/network/foobar/config"
-+ netKey := "/atomic.io/network/foobar/config"
+- netKey := "/coreos.com/network/config"
++ netKey := "atomic.io/network/config"
netValue := "{ \"Network\": \"10.1.0.0/16\",
\"Backend\": { \"Type\": \"host-gw\" } }"
m.Create(ctx, netKey, netValue)
-@@ -155,7 +155,7 @@ func TestEtcdRegistry(t *testing.T) {
- }
-
- // Make sure the lease got created
-- resp, err := m.Get(ctx, "/coreos.com/network/foobar/subnets/10.1.5.0-24",
nil)
-+ resp, err := m.Get(ctx, "/atomic.io/network/foobar/subnets/10.1.5.0-24",
nil)
- if err != nil {
- t.Fatal("Failed to verify subnet lease directly in etcd: %v", err)
- }
-@@ -185,7 +185,7 @@ func TestEtcdRegistry(t *testing.T) {
- }
-
- // Make sure the lease got deleted
-- resp, err = m.Get(ctx, "/coreos.com/network/foobar/subnets/10.1.5.0-24",
nil)
-+ resp, err = m.Get(ctx, "/atomic.io/network/foobar/subnets/10.1.5.0-24", nil)
- if err == nil {
- t.Fatal("Unexpected success getting deleted subnet")
- }
--
-2.7.4
+2.7.5
diff --git a/flannel.spec b/flannel.spec
index b43be2c..56a307c 100644
--- a/flannel.spec
+++ b/flannel.spec
@@ -35,15 +35,15 @@
%global repo flannel
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix}
-%global commit d9560b051b0abe92048ae5c72b5fbd71ba7b8f17
+%global commit 317b7d199e3fe937f04ecb39beed025e47316430
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global devel_main flannel-devel
%global k8s_commit 44368db9916cc345ebef8b6fbde3cdf0dc9d79dc
Name: flannel
-Version: 0.7.0
-Release: 5%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
Summary: Etcd address management agent for overlay networks
License: ASL 2.0
URL: https://%{provider_prefix}
@@ -54,9 +54,7 @@ Source2: flanneld.service
Source3: flannel-docker.conf
Source4: flannel-tmpfiles.conf
-Patch0: change-4001-to-2379-in-help-and-README.patch
Patch1: change-coreos.com-network-to-atomic.io-network-in-he.patch
-Patch2: patch-ip-pkg-on-ppc64le.patch
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
@@ -224,11 +222,7 @@ providing packages with %{import_path} prefix.
%prep
%setup -q -n %{repo}-%{commit}
-%patch0 -p1
%patch1 -p1
-%ifarch s390x
-%patch2 -p1
-%endif
find . -name "*.go" \
-print |\
@@ -350,6 +344,10 @@ export
GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
%endif
%changelog
+* Fri Nov 17 2017 Jan Chaloupka <jchaloup(a)redhat.com> - 0.9.0-1
+- Update to 9.0.0
+ resolves: #1443517
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.7.0-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/patch-ip-pkg-on-ppc64le.patch b/patch-ip-pkg-on-ppc64le.patch
deleted file mode 100644
index a0e2e1f..0000000
--- a/patch-ip-pkg-on-ppc64le.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From cf05c8357088a46679a8c6fa00be81917654d336 Mon Sep 17 00:00:00 2001
-From: salamaniibm <salamani.ibm(a)gmail.com>
-Date: Tue, 15 Nov 2016 04:17:54 +0000
-Subject: [PATCH 1/2] During test case execution, we came across all test
- case failures due to invalid IP.s generation for s390x system. On checking
- git issues , we came across the link
-
https://github.com/coreos/flannel/issues/526, which logs similar issue for
- bigEndiane during IP.s generation. On analysis we came across
- littleEndian check, where code is manipulating IP.s for bigEndianess, which
- is unnecessary because changes are required only at bit-level not for IP. We
- are removing the littleEndian check where the IP address are involved.
- For example subnetSize := ip.IP4(1 << (32 - cfg.SubnetLen)), assume
- cfg.SubnetLen=24 (by default) then, value of subnetSize should be same
- regardless of endianess, which is achieved after endiness check is removed.
-
----
- pkg/ip/ipnet.go | 27 ++++++---------------------
- 1 file changed, 6 insertions(+), 21 deletions(-)
-
-diff --git a/pkg/ip/ipnet.go b/pkg/ip/ipnet.go
-index c8e6206..a3fa827 100644
---- a/pkg/ip/ipnet.go
-+++ b/pkg/ip/ipnet.go
-@@ -24,17 +24,10 @@ import (
- type IP4 uint32
-
- func FromBytes(ip []byte) IP4 {
-- if NativelyLittle() {
-- return IP4(uint32(ip[3]) |
-- (uint32(ip[2]) << 8) |
-- (uint32(ip[1]) << 16) |
-- (uint32(ip[0]) << 24))
-- } else {
-- return IP4(uint32(ip[0]) |
-- (uint32(ip[1]) << 8) |
-- (uint32(ip[2]) << 16) |
-- (uint32(ip[3]) << 24))
-- }
-+ return IP4(uint32(ip[3]) |
-+ (uint32(ip[2]) << 8) |
-+ (uint32(ip[1]) << 16) |
-+ (uint32(ip[0]) << 24))
- }
-
- func FromIP(ip net.IP) IP4 {
-@@ -58,11 +51,7 @@ func MustParseIP4(s string) IP4 {
- }
-
- func (ip IP4) Octets() (a, b, c, d byte) {
-- if NativelyLittle() {
- a, b, c, d = byte(ip>>24), byte(ip>>16), byte(ip>>8), byte(ip)
-- } else {
-- a, b, c, d = byte(ip), byte(ip>>8), byte(ip>>16), byte(ip>>24)
-- }
- return
- }
-
-@@ -71,12 +60,8 @@ func (ip IP4) ToIP() net.IP {
- }
-
- func (ip IP4) NetworkOrder() uint32 {
-- if NativelyLittle() {
-- a, b, c, d := byte(ip>>24), byte(ip>>16), byte(ip>>8), byte(ip)
-- return uint32(a) | (uint32(b) << 8) | (uint32(c) << 16) | (uint32(d)
<< 24)
-- } else {
-- return uint32(ip)
-- }
-+ a, b, c, d := byte(ip>>24), byte(ip>>16), byte(ip>>8), byte(ip)
-+ return uint32(a) | (uint32(b) << 8) | (uint32(c) << 16) | (uint32(d)
<< 24)
- }
-
- func (ip IP4) String() string {
---
-2.7.4
-
diff --git a/sources b/sources
index c5f6ffb..d6a086c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (flannel-d9560b0.tar.gz) =
7460ede64ed58411aeec72c9be2291b8ac6bfe9d10290d5b5a4ff8a36022307b8ff2ffda0afd4e98b81348a1acb854cf2609ffc31076eb9422fd1250d2baa4d8
+SHA512 (flannel-317b7d1.tar.gz) =
ec5cad37cc40e46345530ae817140e5406d891a8ffdb6cb25f1c9044c8b8ac9750d2def4f16fa8f280e457205cc0d12762178a4ebb639f4c55f2c2d952df6701