From 1831a1f0b7ab2832e891fc797c89a184f4e7be64 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Mon, 25 Sep 2017 09:56:16 +0200 Subject: [PATCH] change coreos.com/network to atomic.io/network --- 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/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.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 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 @@ flannel reads its configuration from etcd. -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`). Use the `etcdctl` utility to set values in etcd. 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 ``` 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 @@ -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"}} ``` 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/config" + netKey := "atomic.io/network/config" netValue := "{ \"Network\": \"10.1.0.0/16\", \"Backend\": { \"Type\": \"host-gw\" } }" m.Create(ctx, netKey, netValue) -- 2.7.5