From 37ae6e0c410262b39a1c4782337eaa82ae4fbd46 Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Fri, 1 Dec 2017 13:59:31 -0800 Subject: [PATCH] hack/scripts-dev: keep only shared scripts in docker-dns-srv Signed-off-by: Gyu-Ho Lee --- hack/scripts-dev/docker-dns-srv/Dockerfile | 8 ++--- hack/scripts-dev/docker-dns-srv/Procfile | 5 --- hack/scripts-dev/docker-dns-srv/etcd.zone | 37 ++++++++++++---------- hack/scripts-dev/docker-dns-srv/run.sh | 16 ---------- 4 files changed, 23 insertions(+), 43 deletions(-) delete mode 100644 hack/scripts-dev/docker-dns-srv/Procfile delete mode 100755 hack/scripts-dev/docker-dns-srv/run.sh diff --git a/hack/scripts-dev/docker-dns-srv/Dockerfile b/hack/scripts-dev/docker-dns-srv/Dockerfile index e53787e4f..07e907214 100644 --- a/hack/scripts-dev/docker-dns-srv/Dockerfile +++ b/hack/scripts-dev/docker-dns-srv/Dockerfile @@ -33,16 +33,12 @@ ENV GO_DOWNLOAD_URL https://storage.googleapis.com/golang RUN rm -rf ${GOROOT} \ && curl -s ${GO_DOWNLOAD_URL}/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local/ -xz \ && mkdir -p ${GOPATH}/src ${GOPATH}/bin \ - && go version + && go version \ + && go get -v -u github.com/mattn/goreman RUN mkdir -p /var/bind /etc/bind RUN chown root:bind /var/bind /etc/bind -ADD Procfile /Procfile -ADD run.sh /run.sh ADD named.conf etcd.zone rdns.zone /etc/bind/ RUN chown root:bind /etc/bind/named.conf /etc/bind/etcd.zone /etc/bind/rdns.zone ADD resolv.conf /etc/resolv.conf - -RUN go get github.com/mattn/goreman -CMD ["/run.sh"] diff --git a/hack/scripts-dev/docker-dns-srv/Procfile b/hack/scripts-dev/docker-dns-srv/Procfile deleted file mode 100644 index e1b2c411c..000000000 --- a/hack/scripts-dev/docker-dns-srv/Procfile +++ /dev/null @@ -1,5 +0,0 @@ -etcd1: ./etcd --name m1 --listen-client-urls https://127.0.0.1:2379 --advertise-client-urls https://m1.etcd.local:2379 --listen-peer-urls https://127.0.0.1:2380 --initial-advertise-peer-urls=https://m1.etcd.local:2380 --initial-cluster-token tkn --discovery-srv=etcd.local --initial-cluster-state new --peer-cert-file=/certs/server-wildcard.crt --peer-key-file=/certs/server-wildcard.key.insecure --peer-trusted-ca-file=/certs/ca.crt --peer-client-cert-auth --cert-file=/certs/server-wildcard.crt --key-file=/certs/server-wildcard.key.insecure --trusted-ca-file=/certs/ca.crt --client-cert-auth - -etcd2: ./etcd --name m2 --listen-client-urls https://127.0.0.1:22379 --advertise-client-urls https://m2.etcd.local:22379 --listen-peer-urls https://127.0.0.1:22380 --initial-advertise-peer-urls=https://m2.etcd.local:22380 --initial-cluster-token tkn --discovery-srv=etcd.local --initial-cluster-state new --peer-cert-file=/certs/server-wildcard.crt --peer-key-file=/certs/server-wildcard.key.insecure --peer-trusted-ca-file=/certs/ca.crt --peer-client-cert-auth --cert-file=/certs/server-wildcard.crt --key-file=/certs/server-wildcard.key.insecure --trusted-ca-file=/certs/ca.crt --client-cert-auth - -etcd3: ./etcd --name m3 --listen-client-urls https://127.0.0.1:32379 --advertise-client-urls https://m3.etcd.local:32379 --listen-peer-urls https://127.0.0.1:32380 --initial-advertise-peer-urls=https://m3.etcd.local:32380 --initial-cluster-token tkn --discovery-srv=etcd.local --initial-cluster-state new --peer-cert-file=/certs/server-wildcard.crt --peer-key-file=/certs/server-wildcard.key.insecure --peer-trusted-ca-file=/certs/ca.crt --peer-client-cert-auth --cert-file=/certs/server-wildcard.crt --key-file=/certs/server-wildcard.key.insecure --trusted-ca-file=/certs/ca.crt --client-cert-auth diff --git a/hack/scripts-dev/docker-dns-srv/etcd.zone b/hack/scripts-dev/docker-dns-srv/etcd.zone index e501ed399..b9cebbba4 100644 --- a/hack/scripts-dev/docker-dns-srv/etcd.zone +++ b/hack/scripts-dev/docker-dns-srv/etcd.zone @@ -1,16 +1,21 @@ -etcd.local. IN SOA bindhostname. admin.etcd.local. ( -1452607488 -10800 -3600 -604800 -38400 ) -etcd.local. IN NS bindhostname. -m1.etcd.local. 300 IN A 127.0.0.1 -m2.etcd.local. 300 IN A 127.0.0.1 -m3.etcd.local. 300 IN A 127.0.0.1 -_etcd-client-ssl._tcp 300 IN SRV 0 0 2379 m1.etcd.local. -_etcd-client-ssl._tcp 300 IN SRV 0 0 22379 m2.etcd.local. -_etcd-client-ssl._tcp 300 IN SRV 0 0 32379 m3.etcd.local. -_etcd-server-ssl._tcp 300 IN SRV 0 0 2380 m1.etcd.local. -_etcd-server-ssl._tcp 300 IN SRV 0 0 22380 m2.etcd.local. -_etcd-server-ssl._tcp 300 IN SRV 0 0 32380 m3.etcd.local. \ No newline at end of file +$TTL 86400 +@ IN SOA etcdns.local. root.etcdns.local. ( + 100500 ; Serial + 604800 ; Refresh + 86400 ; Retry + 2419200 ; Expire + 86400 ) ; Negative Cache TTL + IN NS ns.etcdns.local. + IN A 127.0.0.1 + +ns IN A 127.0.0.1 +m1 IN A 127.0.0.1 +m2 IN A 127.0.0.1 +m3 IN A 127.0.0.1 + +_etcd-client-ssl._tcp IN SRV 0 0 2379 m1.etcd.local. +_etcd-server-ssl._tcp IN SRV 0 0 2380 m1.etcd.local. +_etcd-client-ssl._tcp IN SRV 0 0 22379 m2.etcd.local. +_etcd-server-ssl._tcp IN SRV 0 0 22380 m2.etcd.local. +_etcd-client-ssl._tcp IN SRV 0 0 32379 m3.etcd.local. +_etcd-server-ssl._tcp IN SRV 0 0 32380 m3.etcd.local. diff --git a/hack/scripts-dev/docker-dns-srv/run.sh b/hack/scripts-dev/docker-dns-srv/run.sh deleted file mode 100755 index 7c7415f8d..000000000 --- a/hack/scripts-dev/docker-dns-srv/run.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -/etc/init.d/bind9 start - -# get rid of hosts so go lookup won't resolve 127.0.0.1 to localhost -cat /dev/null >/etc/hosts - -goreman -f /Procfile start & -sleep 7s - -ETCDCTL_API=3 ./etcdctl \ - --cacert=/certs/ca.crt \ - --cert=/certs/server-wildcard.crt \ - --key=/certs//server-wildcard.key.insecure \ - --discovery-srv etcd.local \ - put foo bar