From 78d2ead8047457575af4c5751fdc497a25510ef7 Mon Sep 17 00:00:00 2001 From: Wei Fu Date: Sun, 9 Apr 2023 12:37:12 +0800 Subject: [PATCH 1/5] chore: deprecate tests/manual folder REF: #15514 Signed-off-by: Wei Fu --- tests/manual/Makefile | 283 ------------------ tests/manual/docker-dns-srv/Dockerfile | 44 --- .../docker-dns-srv/certs-gateway/Procfile | 7 - .../docker-dns-srv/certs-gateway/ca-csr.json | 19 -- .../docker-dns-srv/certs-gateway/ca.crt | 22 -- .../docker-dns-srv/certs-gateway/gencert.json | 13 - .../docker-dns-srv/certs-gateway/gencerts.sh | 26 -- .../docker-dns-srv/certs-gateway/run.sh | 47 --- .../certs-gateway/server-ca-csr.json | 23 -- .../docker-dns-srv/certs-gateway/server.crt | 25 -- .../certs-gateway/server.key.insecure | 27 -- .../docker-dns-srv/certs-wildcard/Procfile | 5 - .../docker-dns-srv/certs-wildcard/ca-csr.json | 19 -- .../docker-dns-srv/certs-wildcard/ca.crt | 22 -- .../certs-wildcard/gencert.json | 13 - .../docker-dns-srv/certs-wildcard/gencerts.sh | 26 -- .../docker-dns-srv/certs-wildcard/run.sh | 33 -- .../certs-wildcard/server-ca-csr.json | 21 -- .../docker-dns-srv/certs-wildcard/server.crt | 24 -- .../certs-wildcard/server.key.insecure | 27 -- tests/manual/docker-dns-srv/certs/Procfile | 11 - tests/manual/docker-dns-srv/certs/ca-csr.json | 19 -- tests/manual/docker-dns-srv/certs/ca.crt | 22 -- .../manual/docker-dns-srv/certs/gencert.json | 13 - tests/manual/docker-dns-srv/certs/gencerts.sh | 26 -- tests/manual/docker-dns-srv/certs/run.sh | 57 ---- .../docker-dns-srv/certs/server-ca-csr.json | 26 -- tests/manual/docker-dns-srv/certs/server.crt | 26 -- .../docker-dns-srv/certs/server.key.insecure | 27 -- tests/manual/docker-dns-srv/etcd.zone | 32 -- tests/manual/docker-dns-srv/named.conf | 23 -- tests/manual/docker-dns-srv/rdns.zone | 17 -- tests/manual/docker-dns-srv/resolv.conf | 1 - tests/manual/docker-dns/Dockerfile | 45 --- .../certs-common-name-auth/Procfile | 6 - .../certs-common-name-auth/ca-csr.json | 19 -- .../docker-dns/certs-common-name-auth/ca.crt | 22 -- .../certs-common-name-auth/gencert.json | 13 - .../certs-common-name-auth/gencerts.sh | 26 -- .../docker-dns/certs-common-name-auth/run.sh | 255 ---------------- .../certs-common-name-auth/server-ca-csr.json | 23 -- .../certs-common-name-auth/server.crt | 25 -- .../server.key.insecure | 27 -- .../certs-common-name-multi/Procfile | 6 - .../certs-common-name-multi/ca-csr.json | 19 -- .../docker-dns/certs-common-name-multi/ca.crt | 23 -- .../certs-common-name-multi/gencert.json | 13 - .../certs-common-name-multi/gencerts.sh | 42 --- .../docker-dns/certs-common-name-multi/run.sh | 33 -- .../certs-common-name-multi/server-1.crt | 25 -- .../server-1.key.insecure | 27 -- .../certs-common-name-multi/server-2.crt | 25 -- .../server-2.key.insecure | 27 -- .../certs-common-name-multi/server-3.crt | 25 -- .../server-3.key.insecure | 27 -- .../server-ca-csr-1.json | 21 -- .../server-ca-csr-2.json | 21 -- .../server-ca-csr-3.json | 21 -- .../manual/docker-dns/certs-gateway/Procfile | 8 - .../docker-dns/certs-gateway/ca-csr.json | 19 -- tests/manual/docker-dns/certs-gateway/ca.crt | 22 -- .../docker-dns/certs-gateway/gencert.json | 13 - .../docker-dns/certs-gateway/gencerts.sh | 26 -- tests/manual/docker-dns/certs-gateway/run.sh | 47 --- .../certs-gateway/server-ca-csr.json | 22 -- .../docker-dns/certs-gateway/server.crt | 25 -- .../certs-gateway/server.key.insecure | 27 -- .../manual/docker-dns/certs-san-dns/Procfile | 6 - .../docker-dns/certs-san-dns/ca-csr.json | 19 -- tests/manual/docker-dns/certs-san-dns/ca.crt | 22 -- .../docker-dns/certs-san-dns/gencert.json | 13 - .../docker-dns/certs-san-dns/gencerts.sh | 42 --- tests/manual/docker-dns/certs-san-dns/run.sh | 51 ---- .../docker-dns/certs-san-dns/server-1.crt | 24 -- .../certs-san-dns/server-1.key.insecure | 27 -- .../docker-dns/certs-san-dns/server-2.crt | 24 -- .../certs-san-dns/server-2.key.insecure | 27 -- .../docker-dns/certs-san-dns/server-3.crt | 24 -- .../certs-san-dns/server-3.key.insecure | 27 -- .../certs-san-dns/server-ca-csr-1.json | 19 -- .../certs-san-dns/server-ca-csr-2.json | 19 -- .../certs-san-dns/server-ca-csr-3.json | 19 -- .../manual/docker-dns/certs-wildcard/Procfile | 6 - .../docker-dns/certs-wildcard/ca-csr.json | 19 -- tests/manual/docker-dns/certs-wildcard/ca.crt | 22 -- .../docker-dns/certs-wildcard/gencert.json | 13 - .../docker-dns/certs-wildcard/gencerts.sh | 26 -- tests/manual/docker-dns/certs-wildcard/run.sh | 33 -- .../certs-wildcard/server-ca-csr.json | 20 -- .../docker-dns/certs-wildcard/server.crt | 24 -- .../certs-wildcard/server.key.insecure | 27 -- tests/manual/docker-dns/certs/Procfile | 6 - tests/manual/docker-dns/certs/ca-csr.json | 19 -- tests/manual/docker-dns/certs/ca.crt | 22 -- tests/manual/docker-dns/certs/gencert.json | 13 - tests/manual/docker-dns/certs/gencerts.sh | 26 -- tests/manual/docker-dns/certs/run.sh | 82 ----- .../docker-dns/certs/server-ca-csr.json | 22 -- tests/manual/docker-dns/certs/server.crt | 25 -- .../docker-dns/certs/server.key.insecure | 27 -- tests/manual/docker-dns/etcd.zone | 14 - tests/manual/docker-dns/insecure/Procfile | 6 - tests/manual/docker-dns/insecure/run.sh | 89 ------ tests/manual/docker-dns/named.conf | 23 -- tests/manual/docker-dns/rdns.zone | 13 - tests/manual/docker-dns/resolv.conf | 1 - tests/manual/docker-static-ip/Dockerfile | 37 --- .../certs-metrics-proxy/Procfile | 8 - .../certs-metrics-proxy/ca-csr.json | 19 -- .../certs-metrics-proxy/ca.crt | 22 -- .../certs-metrics-proxy/gencert.json | 13 - .../certs-metrics-proxy/gencerts.sh | 26 -- .../certs-metrics-proxy/run.sh | 119 -------- .../certs-metrics-proxy/server-ca-csr.json | 19 -- .../certs-metrics-proxy/server.crt | 24 -- .../certs-metrics-proxy/server.key.insecure | 27 -- tests/manual/docker-static-ip/certs/Procfile | 6 - .../manual/docker-static-ip/certs/ca-csr.json | 19 -- tests/manual/docker-static-ip/certs/ca.crt | 22 -- .../docker-static-ip/certs/gencert.json | 13 - .../manual/docker-static-ip/certs/gencerts.sh | 26 -- tests/manual/docker-static-ip/certs/run.sh | 28 -- .../docker-static-ip/certs/server-ca-csr.json | 19 -- .../manual/docker-static-ip/certs/server.crt | 24 -- .../certs/server.key.insecure | 27 -- 125 files changed, 3490 deletions(-) delete mode 100644 tests/manual/Makefile delete mode 100644 tests/manual/docker-dns-srv/Dockerfile delete mode 100644 tests/manual/docker-dns-srv/certs-gateway/Procfile delete mode 100644 tests/manual/docker-dns-srv/certs-gateway/ca-csr.json delete mode 100644 tests/manual/docker-dns-srv/certs-gateway/ca.crt delete mode 100644 tests/manual/docker-dns-srv/certs-gateway/gencert.json delete mode 100755 tests/manual/docker-dns-srv/certs-gateway/gencerts.sh delete mode 100755 tests/manual/docker-dns-srv/certs-gateway/run.sh delete mode 100644 tests/manual/docker-dns-srv/certs-gateway/server-ca-csr.json delete mode 100644 tests/manual/docker-dns-srv/certs-gateway/server.crt delete mode 100644 tests/manual/docker-dns-srv/certs-gateway/server.key.insecure delete mode 100644 tests/manual/docker-dns-srv/certs-wildcard/Procfile delete mode 100644 tests/manual/docker-dns-srv/certs-wildcard/ca-csr.json delete mode 100644 tests/manual/docker-dns-srv/certs-wildcard/ca.crt delete mode 100644 tests/manual/docker-dns-srv/certs-wildcard/gencert.json delete mode 100755 tests/manual/docker-dns-srv/certs-wildcard/gencerts.sh delete mode 100755 tests/manual/docker-dns-srv/certs-wildcard/run.sh delete mode 100644 tests/manual/docker-dns-srv/certs-wildcard/server-ca-csr.json delete mode 100644 tests/manual/docker-dns-srv/certs-wildcard/server.crt delete mode 100644 tests/manual/docker-dns-srv/certs-wildcard/server.key.insecure delete mode 100644 tests/manual/docker-dns-srv/certs/Procfile delete mode 100644 tests/manual/docker-dns-srv/certs/ca-csr.json delete mode 100644 tests/manual/docker-dns-srv/certs/ca.crt delete mode 100644 tests/manual/docker-dns-srv/certs/gencert.json delete mode 100755 tests/manual/docker-dns-srv/certs/gencerts.sh delete mode 100755 tests/manual/docker-dns-srv/certs/run.sh delete mode 100644 tests/manual/docker-dns-srv/certs/server-ca-csr.json delete mode 100644 tests/manual/docker-dns-srv/certs/server.crt delete mode 100644 tests/manual/docker-dns-srv/certs/server.key.insecure delete mode 100644 tests/manual/docker-dns-srv/etcd.zone delete mode 100644 tests/manual/docker-dns-srv/named.conf delete mode 100644 tests/manual/docker-dns-srv/rdns.zone delete mode 100644 tests/manual/docker-dns-srv/resolv.conf delete mode 100644 tests/manual/docker-dns/Dockerfile delete mode 100644 tests/manual/docker-dns/certs-common-name-auth/Procfile delete mode 100644 tests/manual/docker-dns/certs-common-name-auth/ca-csr.json delete mode 100644 tests/manual/docker-dns/certs-common-name-auth/ca.crt delete mode 100644 tests/manual/docker-dns/certs-common-name-auth/gencert.json delete mode 100755 tests/manual/docker-dns/certs-common-name-auth/gencerts.sh delete mode 100755 tests/manual/docker-dns/certs-common-name-auth/run.sh delete mode 100644 tests/manual/docker-dns/certs-common-name-auth/server-ca-csr.json delete mode 100644 tests/manual/docker-dns/certs-common-name-auth/server.crt delete mode 100644 tests/manual/docker-dns/certs-common-name-auth/server.key.insecure delete mode 100644 tests/manual/docker-dns/certs-common-name-multi/Procfile delete mode 100644 tests/manual/docker-dns/certs-common-name-multi/ca-csr.json delete mode 100644 tests/manual/docker-dns/certs-common-name-multi/ca.crt delete mode 100644 tests/manual/docker-dns/certs-common-name-multi/gencert.json delete mode 100755 tests/manual/docker-dns/certs-common-name-multi/gencerts.sh delete mode 100755 tests/manual/docker-dns/certs-common-name-multi/run.sh delete mode 100644 tests/manual/docker-dns/certs-common-name-multi/server-1.crt delete mode 100644 tests/manual/docker-dns/certs-common-name-multi/server-1.key.insecure delete mode 100644 tests/manual/docker-dns/certs-common-name-multi/server-2.crt delete mode 100644 tests/manual/docker-dns/certs-common-name-multi/server-2.key.insecure delete mode 100644 tests/manual/docker-dns/certs-common-name-multi/server-3.crt delete mode 100644 tests/manual/docker-dns/certs-common-name-multi/server-3.key.insecure delete mode 100644 tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-1.json delete mode 100644 tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-2.json delete mode 100644 tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-3.json delete mode 100644 tests/manual/docker-dns/certs-gateway/Procfile delete mode 100644 tests/manual/docker-dns/certs-gateway/ca-csr.json delete mode 100644 tests/manual/docker-dns/certs-gateway/ca.crt delete mode 100644 tests/manual/docker-dns/certs-gateway/gencert.json delete mode 100755 tests/manual/docker-dns/certs-gateway/gencerts.sh delete mode 100755 tests/manual/docker-dns/certs-gateway/run.sh delete mode 100644 tests/manual/docker-dns/certs-gateway/server-ca-csr.json delete mode 100644 tests/manual/docker-dns/certs-gateway/server.crt delete mode 100644 tests/manual/docker-dns/certs-gateway/server.key.insecure delete mode 100644 tests/manual/docker-dns/certs-san-dns/Procfile delete mode 100644 tests/manual/docker-dns/certs-san-dns/ca-csr.json delete mode 100644 tests/manual/docker-dns/certs-san-dns/ca.crt delete mode 100644 tests/manual/docker-dns/certs-san-dns/gencert.json delete mode 100755 tests/manual/docker-dns/certs-san-dns/gencerts.sh delete mode 100755 tests/manual/docker-dns/certs-san-dns/run.sh delete mode 100644 tests/manual/docker-dns/certs-san-dns/server-1.crt delete mode 100644 tests/manual/docker-dns/certs-san-dns/server-1.key.insecure delete mode 100644 tests/manual/docker-dns/certs-san-dns/server-2.crt delete mode 100644 tests/manual/docker-dns/certs-san-dns/server-2.key.insecure delete mode 100644 tests/manual/docker-dns/certs-san-dns/server-3.crt delete mode 100644 tests/manual/docker-dns/certs-san-dns/server-3.key.insecure delete mode 100644 tests/manual/docker-dns/certs-san-dns/server-ca-csr-1.json delete mode 100644 tests/manual/docker-dns/certs-san-dns/server-ca-csr-2.json delete mode 100644 tests/manual/docker-dns/certs-san-dns/server-ca-csr-3.json delete mode 100644 tests/manual/docker-dns/certs-wildcard/Procfile delete mode 100644 tests/manual/docker-dns/certs-wildcard/ca-csr.json delete mode 100644 tests/manual/docker-dns/certs-wildcard/ca.crt delete mode 100644 tests/manual/docker-dns/certs-wildcard/gencert.json delete mode 100755 tests/manual/docker-dns/certs-wildcard/gencerts.sh delete mode 100755 tests/manual/docker-dns/certs-wildcard/run.sh delete mode 100644 tests/manual/docker-dns/certs-wildcard/server-ca-csr.json delete mode 100644 tests/manual/docker-dns/certs-wildcard/server.crt delete mode 100644 tests/manual/docker-dns/certs-wildcard/server.key.insecure delete mode 100644 tests/manual/docker-dns/certs/Procfile delete mode 100644 tests/manual/docker-dns/certs/ca-csr.json delete mode 100644 tests/manual/docker-dns/certs/ca.crt delete mode 100644 tests/manual/docker-dns/certs/gencert.json delete mode 100755 tests/manual/docker-dns/certs/gencerts.sh delete mode 100755 tests/manual/docker-dns/certs/run.sh delete mode 100644 tests/manual/docker-dns/certs/server-ca-csr.json delete mode 100644 tests/manual/docker-dns/certs/server.crt delete mode 100644 tests/manual/docker-dns/certs/server.key.insecure delete mode 100644 tests/manual/docker-dns/etcd.zone delete mode 100644 tests/manual/docker-dns/insecure/Procfile delete mode 100755 tests/manual/docker-dns/insecure/run.sh delete mode 100644 tests/manual/docker-dns/named.conf delete mode 100644 tests/manual/docker-dns/rdns.zone delete mode 100644 tests/manual/docker-dns/resolv.conf delete mode 100644 tests/manual/docker-static-ip/Dockerfile delete mode 100644 tests/manual/docker-static-ip/certs-metrics-proxy/Procfile delete mode 100644 tests/manual/docker-static-ip/certs-metrics-proxy/ca-csr.json delete mode 100644 tests/manual/docker-static-ip/certs-metrics-proxy/ca.crt delete mode 100644 tests/manual/docker-static-ip/certs-metrics-proxy/gencert.json delete mode 100755 tests/manual/docker-static-ip/certs-metrics-proxy/gencerts.sh delete mode 100755 tests/manual/docker-static-ip/certs-metrics-proxy/run.sh delete mode 100644 tests/manual/docker-static-ip/certs-metrics-proxy/server-ca-csr.json delete mode 100644 tests/manual/docker-static-ip/certs-metrics-proxy/server.crt delete mode 100644 tests/manual/docker-static-ip/certs-metrics-proxy/server.key.insecure delete mode 100644 tests/manual/docker-static-ip/certs/Procfile delete mode 100644 tests/manual/docker-static-ip/certs/ca-csr.json delete mode 100644 tests/manual/docker-static-ip/certs/ca.crt delete mode 100644 tests/manual/docker-static-ip/certs/gencert.json delete mode 100755 tests/manual/docker-static-ip/certs/gencerts.sh delete mode 100755 tests/manual/docker-static-ip/certs/run.sh delete mode 100644 tests/manual/docker-static-ip/certs/server-ca-csr.json delete mode 100644 tests/manual/docker-static-ip/certs/server.crt delete mode 100644 tests/manual/docker-static-ip/certs/server.key.insecure diff --git a/tests/manual/Makefile b/tests/manual/Makefile deleted file mode 100644 index 35a16b9b1..000000000 --- a/tests/manual/Makefile +++ /dev/null @@ -1,283 +0,0 @@ -TMP_DOCKERFILE:=$(shell mktemp) -GO_VERSION ?= 1.19.8 -TMP_DIR_MOUNT_FLAG = --tmpfs=/tmp:exec -ifdef HOST_TMP_DIR - TMP_DIR_MOUNT_FLAG = --mount type=bind,source=$(HOST_TMP_DIR),destination=/tmp -endif - -# Example: -# make build-docker-test -# make compile-with-docker-test -# make build-docker-static-ip-test -# -# gcloud auth configure-docker -# make push-docker-static-ip-test -# -# gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com -# make pull-docker-static-ip-test -# -# make docker-static-ip-test-certs-run -# make docker-static-ip-test-certs-metrics-proxy-run - -build-docker-static-ip-test: - $(info GO_VERSION: $(GO_VERSION)) - @sed 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./docker-static-ip/Dockerfile > $(TMP_DOCKERFILE) - docker build \ - --network=host \ - --tag gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) \ - --file ./docker-static-ip/Dockerfile \ - $(TMP_DOCKERFILE) - -push-docker-static-ip-test: - $(info GO_VERSION: $(GO_VERSION)) - docker push gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) - -pull-docker-static-ip-test: - $(info GO_VERSION: $(GO_VERSION)) - docker pull gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) - -docker-static-ip-test-certs-run: - $(info GO_VERSION: $(GO_VERSION)) - $(info HOST_TMP_DIR: $(HOST_TMP_DIR)) - $(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG)) - docker run \ - --rm \ - --tty \ - $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/tests/docker-static-ip/certs,destination=/certs \ - gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) \ - /bin/bash -c "cd /etcd && /certs/run.sh && rm -rf m*.etcd" - -docker-static-ip-test-certs-metrics-proxy-run: - $(info GO_VERSION: $(GO_VERSION)) - $(info HOST_TMP_DIR: $(HOST_TMP_DIR)) - $(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG)) - docker run \ - --rm \ - --tty \ - $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/tests/docker-static-ip/certs-metrics-proxy,destination=/certs-metrics-proxy \ - gcr.io/etcd-development/etcd-static-ip-test:go$(GO_VERSION) \ - /bin/bash -c "cd /etcd && /certs-metrics-proxy/run.sh && rm -rf m*.etcd" - - - -# Example: -# make build-docker-test -# make compile-with-docker-test -# make build-docker-dns-test -# -# gcloud auth configure-docker -# make push-docker-dns-test -# -# gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com -# make pull-docker-dns-test -# -# make docker-dns-test-insecure-run -# make docker-dns-test-certs-run -# make docker-dns-test-certs-gateway-run -# make docker-dns-test-certs-wildcard-run -# make docker-dns-test-certs-common-name-auth-run -# make docker-dns-test-certs-common-name-multi-run -# make docker-dns-test-certs-san-dns-run - -build-docker-dns-test: - $(info GO_VERSION: $(GO_VERSION)) - @sed 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' ./docker-dns/Dockerfile > $(TMP_DOCKERFILE) - docker build \ - --network=host \ - --tag gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \ - --file ./docker-dns/Dockerfile \ - $(TMP_DOCKERFILE) - - docker run \ - --rm \ - --dns 127.0.0.1 \ - gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \ - /bin/bash -c "/etc/init.d/bind9 start && cat /dev/null >/etc/hosts && dig etcd.local" - -push-docker-dns-test: - $(info GO_VERSION: $(GO_VERSION)) - docker push gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) - -pull-docker-dns-test: - $(info GO_VERSION: $(GO_VERSION)) - docker pull gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) - -docker-dns-test-insecure-run: - $(info GO_VERSION: $(GO_VERSION)) - $(info HOST_TMP_DIR: $(HOST_TMP_DIR)) - $(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG)) - docker run \ - --rm \ - --tty \ - --dns 127.0.0.1 \ - $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/tests/docker-dns/insecure,destination=/insecure \ - gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \ - /bin/bash -c "cd /etcd && /insecure/run.sh && rm -rf m*.etcd" - -docker-dns-test-certs-run: - $(info GO_VERSION: $(GO_VERSION)) - $(info HOST_TMP_DIR: $(HOST_TMP_DIR)) - $(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG)) - docker run \ - --rm \ - --tty \ - --dns 127.0.0.1 \ - $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/tests/docker-dns/certs,destination=/certs \ - gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \ - /bin/bash -c "cd /etcd && /certs/run.sh && rm -rf m*.etcd" - -docker-dns-test-certs-gateway-run: - $(info GO_VERSION: $(GO_VERSION)) - $(info HOST_TMP_DIR: $(HOST_TMP_DIR)) - $(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG)) - docker run \ - --rm \ - --tty \ - --dns 127.0.0.1 \ - $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/tests/docker-dns/certs-gateway,destination=/certs-gateway \ - gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \ - /bin/bash -c "cd /etcd && /certs-gateway/run.sh && rm -rf m*.etcd" - -docker-dns-test-certs-wildcard-run: - $(info GO_VERSION: $(GO_VERSION)) - $(info HOST_TMP_DIR: $(HOST_TMP_DIR)) - $(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG)) - docker run \ - --rm \ - --tty \ - --dns 127.0.0.1 \ - $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/tests/docker-dns/certs-wildcard,destination=/certs-wildcard \ - gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \ - /bin/bash -c "cd /etcd && /certs-wildcard/run.sh && rm -rf m*.etcd" - -docker-dns-test-certs-common-name-auth-run: - $(info GO_VERSION: $(GO_VERSION)) - $(info HOST_TMP_DIR: $(HOST_TMP_DIR)) - $(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG)) - docker run \ - --rm \ - --tty \ - --dns 127.0.0.1 \ - $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/tests/docker-dns/certs-common-name-auth,destination=/certs-common-name-auth \ - gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \ - /bin/bash -c "cd /etcd && /certs-common-name-auth/run.sh && rm -rf m*.etcd" - -docker-dns-test-certs-common-name-multi-run: - $(info GO_VERSION: $(GO_VERSION)) - $(info HOST_TMP_DIR: $(HOST_TMP_DIR)) - $(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG)) - docker run \ - --rm \ - --tty \ - --dns 127.0.0.1 \ - $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/tests/docker-dns/certs-common-name-multi,destination=/certs-common-name-multi \ - gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \ - /bin/bash -c "cd /etcd && /certs-common-name-multi/run.sh && rm -rf m*.etcd" - -docker-dns-test-certs-san-dns-run: - $(info GO_VERSION: $(GO_VERSION)) - $(info HOST_TMP_DIR: $(HOST_TMP_DIR)) - $(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG)) - docker run \ - --rm \ - --tty \ - --dns 127.0.0.1 \ - $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/tests/docker-dns/certs-san-dns,destination=/certs-san-dns \ - gcr.io/etcd-development/etcd-dns-test:go$(GO_VERSION) \ - /bin/bash -c "cd /etcd && /certs-san-dns/run.sh && rm -rf m*.etcd" - - -# Example: -# make build-docker-test -# make compile-with-docker-test -# make build-docker-dns-srv-test -# gcloud auth configure-docker -# make push-docker-dns-srv-test -# gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com -# make pull-docker-dns-srv-test -# make docker-dns-srv-test-certs-run -# make docker-dns-srv-test-certs-gateway-run -# make docker-dns-srv-test-certs-wildcard-run - -build-docker-dns-srv-test: - $(info GO_VERSION: $(GO_VERSION)) - @sed 's|REPLACE_ME_GO_VERSION|$(GO_VERSION)|g' > $(TMP_DOCKERFILE) - docker build \ - --network=host \ - --tag gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \ - --file ./docker-dns-srv/Dockerfile \ - $(TMP_DOCKERFILE) - - docker run \ - --rm \ - --dns 127.0.0.1 \ - gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \ - /bin/bash -c "/etc/init.d/bind9 start && cat /dev/null >/etc/hosts && dig +noall +answer SRV _etcd-client-ssl._tcp.etcd.local && dig +noall +answer SRV _etcd-server-ssl._tcp.etcd.local && dig +noall +answer m1.etcd.local m2.etcd.local m3.etcd.local" - -push-docker-dns-srv-test: - $(info GO_VERSION: $(GO_VERSION)) - docker push gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) - -pull-docker-dns-srv-test: - $(info GO_VERSION: $(GO_VERSION)) - docker pull gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) - -docker-dns-srv-test-certs-run: - $(info GO_VERSION: $(GO_VERSION)) - $(info HOST_TMP_DIR: $(HOST_TMP_DIR)) - $(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG)) - docker run \ - --rm \ - --tty \ - --dns 127.0.0.1 \ - $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/tests/docker-dns-srv/certs,destination=/certs \ - gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \ - /bin/bash -c "cd /etcd && /certs/run.sh && rm -rf m*.etcd" - -docker-dns-srv-test-certs-gateway-run: - $(info GO_VERSION: $(GO_VERSION)) - $(info HOST_TMP_DIR: $(HOST_TMP_DIR)) - $(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG)) - docker run \ - --rm \ - --tty \ - --dns 127.0.0.1 \ - $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/tests/docker-dns-srv/certs-gateway,destination=/certs-gateway \ - gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \ - /bin/bash -c "cd /etcd && /certs-gateway/run.sh && rm -rf m*.etcd" - -docker-dns-srv-test-certs-wildcard-run: - $(info GO_VERSION: $(GO_VERSION)) - $(info HOST_TMP_DIR: $(HOST_TMP_DIR)) - $(info TMP_DIR_MOUNT_FLAG: $(TMP_DIR_MOUNT_FLAG)) - docker run \ - --rm \ - --tty \ - --dns 127.0.0.1 \ - $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`/bin,destination=/etcd \ - --mount type=bind,source=`pwd`/tests/docker-dns-srv/certs-wildcard,destination=/certs-wildcard \ - gcr.io/etcd-development/etcd-dns-srv-test:go$(GO_VERSION) \ - /bin/bash -c "cd /etcd && /certs-wildcard/run.sh && rm -rf m*.etcd" diff --git a/tests/manual/docker-dns-srv/Dockerfile b/tests/manual/docker-dns-srv/Dockerfile deleted file mode 100644 index dbc3f4bdc..000000000 --- a/tests/manual/docker-dns-srv/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM ubuntu:18.04 - -RUN rm /bin/sh && ln -s /bin/bash /bin/sh -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections - -RUN apt-get -y update \ - && apt-get -y install \ - build-essential \ - gcc \ - apt-utils \ - pkg-config \ - software-properties-common \ - apt-transport-https \ - libssl-dev \ - sudo \ - bash \ - curl \ - tar \ - git \ - netcat \ - bind9 \ - dnsutils \ - && apt-get -y update \ - && apt-get -y upgrade \ - && apt-get -y autoremove \ - && apt-get -y autoclean - -ENV GOROOT /usr/local/go -ENV GOPATH /go -ENV PATH ${GOPATH}/bin:${GOROOT}/bin:${PATH} -ENV GO_VERSION REPLACE_ME_GO_VERSION -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 get -v -u github.com/mattn/goreman - -RUN mkdir -p /var/bind /etc/bind -RUN chown root:bind /var/bind /etc/bind - -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 diff --git a/tests/manual/docker-dns-srv/certs-gateway/Procfile b/tests/manual/docker-dns-srv/certs-gateway/Procfile deleted file mode 100644 index 7e3c3d936..000000000 --- a/tests/manual/docker-dns-srv/certs-gateway/Procfile +++ /dev/null @@ -1,7 +0,0 @@ -etcd1: ./etcd --name m1 --data-dir /tmp/m1.data --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-gateway/server.crt --peer-key-file=/certs-gateway/server.key.insecure --peer-trusted-ca-file=/certs-gateway/ca.crt --peer-client-cert-auth --cert-file=/certs-gateway/server.crt --key-file=/certs-gateway/server.key.insecure --trusted-ca-file=/certs-gateway/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd2: ./etcd --name m2 --data-dir /tmp/m2.data --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-gateway/server.crt --peer-key-file=/certs-gateway/server.key.insecure --peer-trusted-ca-file=/certs-gateway/ca.crt --peer-client-cert-auth --cert-file=/certs-gateway/server.crt --key-file=/certs-gateway/server.key.insecure --trusted-ca-file=/certs-gateway/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd3: ./etcd --name m3 --data-dir /tmp/m3.data --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-gateway/server.crt --peer-key-file=/certs-gateway/server.key.insecure --peer-trusted-ca-file=/certs-gateway/ca.crt --peer-client-cert-auth --cert-file=/certs-gateway/server.crt --key-file=/certs-gateway/server.key.insecure --trusted-ca-file=/certs-gateway/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -gateway: ./etcd gateway start --discovery-srv etcd.local --trusted-ca-file /certs-gateway/ca.crt --listen-addr 127.0.0.1:23790 diff --git a/tests/manual/docker-dns-srv/certs-gateway/ca-csr.json b/tests/manual/docker-dns-srv/certs-gateway/ca-csr.json deleted file mode 100644 index ecafabaad..000000000 --- a/tests/manual/docker-dns-srv/certs-gateway/ca-csr.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "ca", - "ca": { - "expiry": "87600h" - } -} diff --git a/tests/manual/docker-dns-srv/certs-gateway/ca.crt b/tests/manual/docker-dns-srv/certs-gateway/ca.crt deleted file mode 100644 index 19b26c455..000000000 --- a/tests/manual/docker-dns-srv/certs-gateway/ca.crt +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDsTCCApmgAwIBAgIUbQA3lX1hcR1W8D5wmmAwaLp4AWQwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xNzEyMDExOTI5MDBaFw0yNzExMjkxOTI5 -MDBaMG8xDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTELMAkGA1UEAxMCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQDdZjG+dJixdUuZLIlPVE/qvqNqbgIQy3Hrgq9OlPevLu3FAKIgTHoSKugq -jOuBjzAtmbGTky3PPmkjWrOUWKEUYMuJJzXA1fO2NALXle47NVyVVfuwCmDnaAAL -Sw4QTZKREoe3EwswbeYguQinCqazRwbXMzzfypIfaHAyGrqFCq12IvarrjfDcamm -egtPkxNNdj1QHbkeYXcp76LOSBRjD2B3bzZvyVv/wPORaGTFXQ0feGz/93/Y/E0z -BL5TdZ84qmgKxW04hxkhhuuxsL5zDNpbXcGm//Zw9qzO/AvtEux6ag9t0JziiEtj -zLz5M7yXivfG4oxEeLKTieS/1ZkbAgMBAAGjRTBDMA4GA1UdDwEB/wQEAwIBBjAS -BgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBR7XtZP3fc6ElgHl6hdSHLmrFWj -MzANBgkqhkiG9w0BAQsFAAOCAQEAPy3ol3CPyFxuWD0IGKde26p1mT8cdoaeRbOa -2Z3GMuRrY2ojaKMfXuroOi+5ZbR9RSvVXhVX5tEMOSy81tb5OGPZP24Eroh4CUfK -bw7dOeBNCm9tcmHkV+5frJwOgjN2ja8W8jBlV1flLx+Jpyk2PSGun5tQPsDlqzor -E8QQ2FzCzxoGiEpB53t5gKeX+mH6gS1c5igJ5WfsEGXBC4xJm/u8/sg30uCGP6kT -tCoQ8gnvGen2OqYJEfCIEk28/AZJvJ90TJFS3ExXJpyfImK9j5VcTohW+KvcX5xF -W7M6KCGVBQtophobt3v/Zs4f11lWck9xVFCPGn9+LI1dbJUIIQ== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns-srv/certs-gateway/gencert.json b/tests/manual/docker-dns-srv/certs-gateway/gencert.json deleted file mode 100644 index 09b67267b..000000000 --- a/tests/manual/docker-dns-srv/certs-gateway/gencert.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "signing": { - "default": { - "usages": [ - "signing", - "key encipherment", - "server auth", - "client auth" - ], - "expiry": "87600h" - } - } -} diff --git a/tests/manual/docker-dns-srv/certs-gateway/gencerts.sh b/tests/manual/docker-dns-srv/certs-gateway/gencerts.sh deleted file mode 100755 index af8663e09..000000000 --- a/tests/manual/docker-dns-srv/certs-gateway/gencerts.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -if ! [[ "$0" =~ "./gencerts.sh" ]]; then - echo "must be run from 'fixtures'" - exit 255 -fi - -if ! which cfssl; then - echo "cfssl is not installed" - exit 255 -fi - -cfssl gencert --initca=true ./ca-csr.json | cfssljson --bare ./ca -mv ca.pem ca.crt -openssl x509 -in ca.crt -noout -text - -# generate wildcard certificates DNS: *.etcd.local -cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr.json | cfssljson --bare ./server -mv server.pem server.crt -mv server-key.pem server.key.insecure - -rm -f *.csr *.pem *.stderr *.txt diff --git a/tests/manual/docker-dns-srv/certs-gateway/run.sh b/tests/manual/docker-dns-srv/certs-gateway/run.sh deleted file mode 100755 index d70cb1e76..000000000 --- a/tests/manual/docker-dns-srv/certs-gateway/run.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -rm -rf /tmp/m1.data /tmp/m2.data /tmp/m3.data - -/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 /certs-gateway/Procfile start & - -# TODO: remove random sleeps -sleep 7s - -./etcdctl \ - --cacert=/certs-gateway/ca.crt \ - --cert=/certs-gateway/server.crt \ - --key=/certs-gateway/server.key.insecure \ - --discovery-srv etcd.local \ - endpoint health --cluster - -./etcdctl \ - --cacert=/certs-gateway/ca.crt \ - --cert=/certs-gateway/server.crt \ - --key=/certs-gateway/server.key.insecure \ - --discovery-srv etcd.local \ - put abc def - -./etcdctl \ - --cacert=/certs-gateway/ca.crt \ - --cert=/certs-gateway/server.crt \ - --key=/certs-gateway/server.key.insecure \ - --discovery-srv etcd.local \ - get abc - -./etcdctl \ - --cacert=/certs-gateway/ca.crt \ - --cert=/certs-gateway/server.crt \ - --key=/certs-gateway/server.key.insecure \ - --endpoints=127.0.0.1:23790 \ - put ghi jkl - -./etcdctl \ - --cacert=/certs-gateway/ca.crt \ - --cert=/certs-gateway/server.crt \ - --key=/certs-gateway/server.key.insecure \ - --endpoints=127.0.0.1:23790 \ - get ghi diff --git a/tests/manual/docker-dns-srv/certs-gateway/server-ca-csr.json b/tests/manual/docker-dns-srv/certs-gateway/server-ca-csr.json deleted file mode 100644 index 72bd38082..000000000 --- a/tests/manual/docker-dns-srv/certs-gateway/server-ca-csr.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "hosts": [ - "m1.etcd.local", - "m2.etcd.local", - "m3.etcd.local", - "etcd.local", - "127.0.0.1", - "localhost" - ] -} diff --git a/tests/manual/docker-dns-srv/certs-gateway/server.crt b/tests/manual/docker-dns-srv/certs-gateway/server.crt deleted file mode 100644 index ef591cc7c..000000000 --- a/tests/manual/docker-dns-srv/certs-gateway/server.crt +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIENTCCAx2gAwIBAgIUcviGEkA57QgUUFUIuB23kO/jHWIwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xNzEyMDExOTI5MDBaFw0yNzExMjkxOTI5 -MDBaMGIxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6rB1Kh08Fo -FieWqzB4WvKxSFjLWlNfAXbSC1IEPEc/2JOSTF/VfsEX7Xf4eDlTUIZ/TpMS4nUE -Jn0rOIxDJWieQgF99a88CKCwVeqyiQ1iGlI/Ls78P7712QJ1QvcYPBRCvAFo2VLg -TSNhq4taRtAnP690TJVKMSxHg7qtMIpiBLc8ryNbtNUkQHl7/puiBZVVFwHQZm6d -ZRkfMqXWs4+VKLTx0pqJaM0oWVISQlLWQV83buVsuDVyLAZu2MjRYZwBj9gQwZDO -15VGvacjMU+l1+nLRuODrpGeGlxwfT57jqipbUtTsoZFsGxPdIWn14M6Pzw/mML4 -guYLKv3UqkkCAwEAAaOB1TCB0jAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI -KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFKYKYVPu -XPnZ2j0NORiNPUJpBnhkMB8GA1UdIwQYMBaAFHte1k/d9zoSWAeXqF1IcuasVaMz -MFMGA1UdEQRMMEqCDW0xLmV0Y2QubG9jYWyCDW0yLmV0Y2QubG9jYWyCDW0zLmV0 -Y2QubG9jYWyCCmV0Y2QubG9jYWyCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0B -AQsFAAOCAQEAK40lD6Nx/V6CaShL95fQal7mFp/LXiyrlFTqCqrCruVnntwpukSx -I864bNMxVSTStEA3NM5V4mGuYjRvdjS65LBhaS1MQDPb4ofPj0vnxDOx6fryRIsB -wYKDuT4LSQ7pV/hBfL/bPb+itvb24G4/ECbduOprrywxmZskeEm/m0WqUb1A08Hv -6vDleyt382Wnxahq8txhMU+gNLTGVne60hhfLR+ePK7MJ4oyk3yeUxsmsnBkYaOu -gYOak5nWzRa09dLq6/vHQLt6n0AB0VurMAjshzO2rsbdOkD233sdkvKiYpayAyEf -Iu7S5vNjP9jiUgmws6G95wgJOd2xv54D4Q== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns-srv/certs-gateway/server.key.insecure b/tests/manual/docker-dns-srv/certs-gateway/server.key.insecure deleted file mode 100644 index 623457b5d..000000000 --- a/tests/manual/docker-dns-srv/certs-gateway/server.key.insecure +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAvqsHUqHTwWgWJ5arMHha8rFIWMtaU18BdtILUgQ8Rz/Yk5JM -X9V+wRftd/h4OVNQhn9OkxLidQQmfSs4jEMlaJ5CAX31rzwIoLBV6rKJDWIaUj8u -zvw/vvXZAnVC9xg8FEK8AWjZUuBNI2Gri1pG0Cc/r3RMlUoxLEeDuq0wimIEtzyv -I1u01SRAeXv+m6IFlVUXAdBmbp1lGR8ypdazj5UotPHSmolozShZUhJCUtZBXzdu -5Wy4NXIsBm7YyNFhnAGP2BDBkM7XlUa9pyMxT6XX6ctG44OukZ4aXHB9PnuOqKlt -S1OyhkWwbE90hafXgzo/PD+YwviC5gsq/dSqSQIDAQABAoIBAEAOsb0fRUdbMuZG -BmmYZeXXjdjXKReNea5zzv3VEnNVjeu2YRZpYdZ5tXxy6+FGjm1BZCKhW5e4tz2i -QbNN88l8MezSZrJi1vs1gwgAx27JoNI1DALaWIhNjIT45HCjobuk2AkZMrpXRVM3 -wyxkPho8tXa6+efGL1MTC7yx5vb2dbhnEsjrPdUO0GLVP56bgrz7vRk+hE772uq2 -QDenZg+PcH+hOhptbY1h9CYotGWYXCpi0+yoHhsh5PTcEpyPmLWSkACsHovm3MIn -a5oU0uh28nVBfYE0Sk6I9XBERHVO/OrCvz4Y3ZbVyGpCdLcaMB5wI1P4a5ULV52+ -VPrALQkCgYEA+w85KYuL+eUjHeMqa8V8A9xgcl1+dvB8SXgfRRm5QTqxgetzurD9 -G7vgMex42nqgoW1XUx6i9roRk3Qn3D2NKvBJcpMohYcY3HcGkCsBwtNUCyOWKasS -Oj2q9LzPjVqTFII0zzarQ85XuuZyTRieFAMoYmsS8O/GcapKqYhPIDMCgYEAwmuR -ctnCNgoEj1NaLBSAcq7njONvYUFvbXO8BCyd1WeLZyz/krgXxuhQh9oXIccWAKX2 -uxIDaoWV8F5c8bNOkeebHzVHfaLpwl4IlLa/i5WTIc+IZmpBR0aiS021k/M3KkDg -KnQXAer6jEymT3lUL0AqZd+GX6DjFw61zPOFH5MCgYAnCiv6YN/IYTA/woZjMddi -Bk/dGNrEhgrdpdc++IwNL6JQsJtTaZhCSsnHGZ2FY9I8p/MPUtFGipKXGlXkcpHU -Hn9dWLLRaLud9MhJfNaORCxqewMrwZVZByPhYMbplS8P3lt16WtiZODRiGo3wN87 -/221OC8+1hpGrJNln3OmbwKBgDV8voEoY4PWcba0qcQix8vFTrK2B3hsNimYg4tq -cum5GOMDwDQvLWttkmotl9uVF/qJrj19ES+HHN8KNuvP9rexTj3hvI9V+JWepSG0 -vTG7rsTIgbAbX2Yqio/JC0Fu0ihvvLwxP/spGFDs7XxD1uNA9ekc+6znaFJ5m46N -GHy9AoGBAJmGEv5+rM3cucRyYYhE7vumXeCLXyAxxaf0f7+1mqRVO6uNGNGbNY6U -Heq6De4yc1VeAXUpkGQi/afPJNMU+fy8paCjFyzID1yLvdtFOG38KDbgMmj4t+cH -xTp2RT3MkcCWPq2+kXZeQjPdesPkzdB+nA8ckaSursV908n6AHcM ------END RSA PRIVATE KEY----- diff --git a/tests/manual/docker-dns-srv/certs-wildcard/Procfile b/tests/manual/docker-dns-srv/certs-wildcard/Procfile deleted file mode 100644 index 3d5dc6eae..000000000 --- a/tests/manual/docker-dns-srv/certs-wildcard/Procfile +++ /dev/null @@ -1,5 +0,0 @@ -etcd1: ./etcd --name m1 --data-dir /tmp/m1.data --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-wildcard/server.crt --peer-key-file=/certs-wildcard/server.key.insecure --peer-trusted-ca-file=/certs-wildcard/ca.crt --peer-client-cert-auth --cert-file=/certs-wildcard/server.crt --key-file=/certs-wildcard/server.key.insecure --trusted-ca-file=/certs-wildcard/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd2: ./etcd --name m2 --data-dir /tmp/m2.data --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-wildcard/server.crt --peer-key-file=/certs-wildcard/server.key.insecure --peer-trusted-ca-file=/certs-wildcard/ca.crt --peer-client-cert-auth --cert-file=/certs-wildcard/server.crt --key-file=/certs-wildcard/server.key.insecure --trusted-ca-file=/certs-wildcard/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd3: ./etcd --name m3 --data-dir /tmp/m3.data --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-wildcard/server.crt --peer-key-file=/certs-wildcard/server.key.insecure --peer-trusted-ca-file=/certs-wildcard/ca.crt --peer-client-cert-auth --cert-file=/certs-wildcard/server.crt --key-file=/certs-wildcard/server.key.insecure --trusted-ca-file=/certs-wildcard/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr diff --git a/tests/manual/docker-dns-srv/certs-wildcard/ca-csr.json b/tests/manual/docker-dns-srv/certs-wildcard/ca-csr.json deleted file mode 100644 index ecafabaad..000000000 --- a/tests/manual/docker-dns-srv/certs-wildcard/ca-csr.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "ca", - "ca": { - "expiry": "87600h" - } -} diff --git a/tests/manual/docker-dns-srv/certs-wildcard/ca.crt b/tests/manual/docker-dns-srv/certs-wildcard/ca.crt deleted file mode 100644 index c89d6531c..000000000 --- a/tests/manual/docker-dns-srv/certs-wildcard/ca.crt +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDsTCCApmgAwIBAgIUWzsBehxAkgLLYBUZEUpSjHkIaMowDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xNzExMTUxODAyMDBaFw0yNzExMTMxODAy -MDBaMG8xDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTELMAkGA1UEAxMCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQCxjHVNtcCSCz1w9AiN7zAql0ZsPN6MNQWJ2j3iPCvmy9oi0wqSfYXTs+xw -Y4Q+j0dfA54+PcyIOSBQCZBeLLIwCaXN+gLkMxYEWCCVgWYUa6UY+NzPKRCfkbwG -oE2Ilv3R1FWIpMqDVE2rLmTb3YxSiw460Ruv4l16kodEzfs4BRcqrEiobBwaIMLd -0rDJju7Q2TcioNji+HFoXV2aLN58LDgKO9AqszXxW88IKwUspfGBcsA4Zti/OHr+ -W+i/VxsxnQSJiAoKYbv9SkS8fUWw2hQ9SBBCKqE3jLzI71HzKgjS5TiQVZJaD6oK -cw8FjexOELZd4r1+/p+nQdKqwnb5AgMBAAGjRTBDMA4GA1UdDwEB/wQEAwIBBjAS -BgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBRLfPxmhlZix1eTdBMAzMVlAnOV -gTANBgkqhkiG9w0BAQsFAAOCAQEAeT2NfOt3WsBLUVcnyGMeVRQ0gXazxJXD/Z+3 -2RF3KClqBLuGmPUZVl0FU841J6hLlwNjS33mye7k2OHrjJcouElbV3Olxsgh/EV0 -J7b7Wf4zWYHFNZz/VxwGHunsEZ+SCXUzU8OiMrEcHkOVzhtbC2veVPJzrESqd88z -m1MseGW636VIcrg4fYRS9EebRPFvlwfymMd+bqLky9KsUbjNupYd/TlhpAudrIzA -wO9ZUDb/0P44iOo+xURCoodxDTM0vvfZ8eJ6VZ/17HIf/a71kvk1oMqEhf060nmF -IxnbK6iUqqhV8DLE1869vpFvgbDdOxP7BeabN5FXEnZFDTLDqg== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns-srv/certs-wildcard/gencert.json b/tests/manual/docker-dns-srv/certs-wildcard/gencert.json deleted file mode 100644 index 09b67267b..000000000 --- a/tests/manual/docker-dns-srv/certs-wildcard/gencert.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "signing": { - "default": { - "usages": [ - "signing", - "key encipherment", - "server auth", - "client auth" - ], - "expiry": "87600h" - } - } -} diff --git a/tests/manual/docker-dns-srv/certs-wildcard/gencerts.sh b/tests/manual/docker-dns-srv/certs-wildcard/gencerts.sh deleted file mode 100755 index af8663e09..000000000 --- a/tests/manual/docker-dns-srv/certs-wildcard/gencerts.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -if ! [[ "$0" =~ "./gencerts.sh" ]]; then - echo "must be run from 'fixtures'" - exit 255 -fi - -if ! which cfssl; then - echo "cfssl is not installed" - exit 255 -fi - -cfssl gencert --initca=true ./ca-csr.json | cfssljson --bare ./ca -mv ca.pem ca.crt -openssl x509 -in ca.crt -noout -text - -# generate wildcard certificates DNS: *.etcd.local -cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr.json | cfssljson --bare ./server -mv server.pem server.crt -mv server-key.pem server.key.insecure - -rm -f *.csr *.pem *.stderr *.txt diff --git a/tests/manual/docker-dns-srv/certs-wildcard/run.sh b/tests/manual/docker-dns-srv/certs-wildcard/run.sh deleted file mode 100755 index cc4000ef0..000000000 --- a/tests/manual/docker-dns-srv/certs-wildcard/run.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -rm -rf /tmp/m1.data /tmp/m2.data /tmp/m3.data - -/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 /certs-wildcard/Procfile start & - -# TODO: remove random sleeps -sleep 7s - -./etcdctl \ - --cacert=/certs-wildcard/ca.crt \ - --cert=/certs-wildcard/server.crt \ - --key=/certs-wildcard/server.key.insecure \ - --discovery-srv etcd.local \ - endpoint health --cluster - -./etcdctl \ - --cacert=/certs-wildcard/ca.crt \ - --cert=/certs-wildcard/server.crt \ - --key=/certs-wildcard/server.key.insecure \ - --discovery-srv etcd.local \ - put abc def - -./etcdctl \ - --cacert=/certs-wildcard/ca.crt \ - --cert=/certs-wildcard/server.crt \ - --key=/certs-wildcard/server.key.insecure \ - --discovery-srv etcd.local \ - get abc diff --git a/tests/manual/docker-dns-srv/certs-wildcard/server-ca-csr.json b/tests/manual/docker-dns-srv/certs-wildcard/server-ca-csr.json deleted file mode 100644 index fd9adae03..000000000 --- a/tests/manual/docker-dns-srv/certs-wildcard/server-ca-csr.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "hosts": [ - "*.etcd.local", - "etcd.local", - "127.0.0.1", - "localhost" - ] -} diff --git a/tests/manual/docker-dns-srv/certs-wildcard/server.crt b/tests/manual/docker-dns-srv/certs-wildcard/server.crt deleted file mode 100644 index 385f0321c..000000000 --- a/tests/manual/docker-dns-srv/certs-wildcard/server.crt +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEFjCCAv6gAwIBAgIUCIUuNuEPRjp/EeDBNHipRI/qoAcwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xNzExMTUxODAyMDBaFw0yNzExMTMxODAy -MDBaMGIxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMzoOebyKdXF -5QiVs0mB3cVqMRgRoRGWt9emIOsYCX89SBaRNOIAByop98Vb1GmUDNDv1qR4Oq+m -4JlWhgZniABWpekFw8mpN8wMIT86DoNnTe64ouLkDQRZDYOBO9I2+r4EuschRxNs -+Hh5W9JzX/eOomnOhaZfTp6EaxczRHnVmgkWuFUnacfUf7W2FE/HAYfjYpvXw5/+ -eT9AW+Jg/b9SkyU9XKEpWZT7NMqF9OXDXYdxHtRNTGxasLEqPZnG58mqR2QFU2me -/motY24faZpHo8i9ASb03Vy6xee2/FlS6cj2POCGQx3oLZsiQdgIOva7JrQtRsCn -e5P0Wk4qk+cCAwEAAaOBtjCBszAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI -KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFCI+fP2T -xgvJG68Xdgamg4lzGRX1MB8GA1UdIwQYMBaAFEt8/GaGVmLHV5N0EwDMxWUCc5WB -MDQGA1UdEQQtMCuCDCouZXRjZC5sb2NhbIIKZXRjZC5sb2NhbIIJbG9jYWxob3N0 -hwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQASub3+YZAXJ8x8b55Hl7FkkIt+rML1 -LdgPHsolNntNXeSqVJ4oi4KvuaM0ueFf/+AlTusTAbXWbi/qiG5Tw24xyzY6NGgV -/vCs56YqNlFyr3bNp1QJlnV3JQ4d3KqosulJ5jk+InhjAKJKomMH01pYhhStRAKg -1fNwSyD34oyZpSQL0Z7X7wdaMGdOmzxwE99EG6jmYl/P7MiP6rC0WP1elIF4sCGM -jY6oewvIMj0zWloBf/NlzrcY7VKpPqvBnV65Tllyo5n4y1sc8y2uzgJO/QnVKqhp -Sdd/74mU8dSh3ALSOqkbmIBhqig21jP7GBgNCNdmsaR2LvPI97n1PYE7 ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns-srv/certs-wildcard/server.key.insecure b/tests/manual/docker-dns-srv/certs-wildcard/server.key.insecure deleted file mode 100644 index 2b6595fa8..000000000 --- a/tests/manual/docker-dns-srv/certs-wildcard/server.key.insecure +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAzOg55vIp1cXlCJWzSYHdxWoxGBGhEZa316Yg6xgJfz1IFpE0 -4gAHKin3xVvUaZQM0O/WpHg6r6bgmVaGBmeIAFal6QXDyak3zAwhPzoOg2dN7rii -4uQNBFkNg4E70jb6vgS6xyFHE2z4eHlb0nNf946iac6Fpl9OnoRrFzNEedWaCRa4 -VSdpx9R/tbYUT8cBh+Nim9fDn/55P0Bb4mD9v1KTJT1coSlZlPs0yoX05cNdh3Ee -1E1MbFqwsSo9mcbnyapHZAVTaZ7+ai1jbh9pmkejyL0BJvTdXLrF57b8WVLpyPY8 -4IZDHegtmyJB2Ag69rsmtC1GwKd7k/RaTiqT5wIDAQABAoIBAF0nTfuCKCa5WtA2 -TlWippGzHzKUASef32A4dEqsmNSxpW4tAV+lJ5yxi6S7hKui1Ni/0FLhHbzxHrZX -MYMD2j5dJfvz1Ph+55DqCstVt3dhpXpbkiGYD5rkaVJZlDqTKBbuy4LvzAI2zhbn -BSl9rik7PPbhHr1uIq3KAW2Arya7dlpPZiEX04Dg9xqZvxZkxt9IM25E+uzTWKSR -v5BRmijWiGJ6atujgmP7KcYtgBC5EDR9yZf2uK+hnsKEcH94TUkTnJriTcOCKVbb -isAuzsxStLpmyibfiLXD55aYjzr7KRVzQpoVXGJ4vJfs7lTxqxXBjUIsBJMPBcck -ATabIcECgYEA8C8JeKPmcA4KaGFSusF5OsXt4SM9jz5Kr7larA+ozuuR/z0m4pnx -AdjwQiGlhXaMtyziZ7Uwx+tmfnJDijpE/hUnkcAIKheDLXB/r1VpJdj/mqXtK49Y -mnOxV66TcWAmXav31TgmLVSj0SYLGEnvV4MPbgJroMg3VO7LnNbNL7cCgYEA2maB -Edbn4pJqUjVCZG68m0wQHmFZFOaoYZLeR3FgH+PQYIzUj96TP9XFpOwBmYAl2jiM -kQZ3Q6VQY37rwu0M+2BVFkQFnFbelH5jXbHDLdoeFDGCRnJkH2VG1kE/rPfzVsiz -NFDJD+17kPw3tTdHwDYGHwxyNuEoBQw3q6hfXVECgYBEUfzttiGMalIHkveHbBVh -5H9f9ThDkMKJ7b2fB+1KvrOO2QRAnO1zSxQ8m3mL10b7q+bS/TVdCNbkzPftT9nk -NHxG90rbPkjwGfoYE8GPJITApsYqB+J6PMKLYHtMWr9PEeWzXv9tEZBvo9SwGgfc -6sjuz/1xhMJIhIyilm9TTQKBgHRsYDGaVlK5qmPYcGQJhBFlItKPImW579jT6ho7 -nfph/xr49/cZt3U4B/w6sz+YyJTjwEsvHzS4U3o2lod6xojaeYE9EaCdzllqZp3z -vRAcThyFp+TV5fm2i2R7s+4I33dL1fv1dLlA57YKPcgkh+M26Vxzzg7jR+oo8SRY -xT2BAoGBAKNR60zpSQZ2SuqEoWcj1Nf+KloZv2tZcnsHhqhiugbYhZOQVyTCNipa -Ib3/BGERCyI7oWMk0yTTQK4wg3+0EsxQX10hYJ5+rd4btWac7G/tjo2+BSaTnWSW -0vWM/nu33Pq0JHYIo0q0Jee0evTgizqH9UJ3wI5LG29LKwurXxPW ------END RSA PRIVATE KEY----- diff --git a/tests/manual/docker-dns-srv/certs/Procfile b/tests/manual/docker-dns-srv/certs/Procfile deleted file mode 100644 index 9be48cb87..000000000 --- a/tests/manual/docker-dns-srv/certs/Procfile +++ /dev/null @@ -1,11 +0,0 @@ -etcd1: ./etcd --name m1 --data-dir /tmp/m1.data --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.crt --peer-key-file=/certs/server.key.insecure --peer-trusted-ca-file=/certs/ca.crt --peer-client-cert-auth --cert-file=/certs/server.crt --key-file=/certs/server.key.insecure --trusted-ca-file=/certs/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd2: ./etcd --name m2 --data-dir /tmp/m2.data --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.crt --peer-key-file=/certs/server.key.insecure --peer-trusted-ca-file=/certs/ca.crt --peer-client-cert-auth --cert-file=/certs/server.crt --key-file=/certs/server.key.insecure --trusted-ca-file=/certs/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd3: ./etcd --name m3 --data-dir /tmp/m3.data --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.crt --peer-key-file=/certs/server.key.insecure --peer-trusted-ca-file=/certs/ca.crt --peer-client-cert-auth --cert-file=/certs/server.crt --key-file=/certs/server.key.insecure --trusted-ca-file=/certs/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd4: ./etcd --name m4 --data-dir /tmp/m4.data --listen-client-urls https://127.0.0.1:13791 --advertise-client-urls https://m4.etcd.local:13791 --listen-peer-urls https://127.0.0.1:13880 --initial-advertise-peer-urls=https://m1.etcd.local:13880 --initial-cluster-token tkn --discovery-srv=etcd.local --discovery-srv-name=c1 --initial-cluster-state new --peer-cert-file=/certs/server.crt --peer-key-file=/certs/server.key.insecure --peer-trusted-ca-file=/certs/ca.crt --peer-client-cert-auth --cert-file=/certs/server.crt --key-file=/certs/server.key.insecure --trusted-ca-file=/certs/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd5: ./etcd --name m5 --data-dir /tmp/m5.data --listen-client-urls https://127.0.0.1:23791 --advertise-client-urls https://m5.etcd.local:23791 --listen-peer-urls https://127.0.0.1:23880 --initial-advertise-peer-urls=https://m5.etcd.local:23880 --initial-cluster-token tkn --discovery-srv=etcd.local --discovery-srv-name=c1 --initial-cluster-state new --peer-cert-file=/certs/server.crt --peer-key-file=/certs/server.key.insecure --peer-trusted-ca-file=/certs/ca.crt --peer-client-cert-auth --cert-file=/certs/server.crt --key-file=/certs/server.key.insecure --trusted-ca-file=/certs/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd6: ./etcd --name m6 --data-dir /tmp/m6.data --listen-client-urls https://127.0.0.1:33791 --advertise-client-urls https://m6.etcd.local:33791 --listen-peer-urls https://127.0.0.1:33880 --initial-advertise-peer-urls=https://m6.etcd.local:33880 --initial-cluster-token tkn --discovery-srv=etcd.local --discovery-srv-name=c1 --initial-cluster-state new --peer-cert-file=/certs/server.crt --peer-key-file=/certs/server.key.insecure --peer-trusted-ca-file=/certs/ca.crt --peer-client-cert-auth --cert-file=/certs/server.crt --key-file=/certs/server.key.insecure --trusted-ca-file=/certs/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr diff --git a/tests/manual/docker-dns-srv/certs/ca-csr.json b/tests/manual/docker-dns-srv/certs/ca-csr.json deleted file mode 100644 index ecafabaad..000000000 --- a/tests/manual/docker-dns-srv/certs/ca-csr.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "ca", - "ca": { - "expiry": "87600h" - } -} diff --git a/tests/manual/docker-dns-srv/certs/ca.crt b/tests/manual/docker-dns-srv/certs/ca.crt deleted file mode 100644 index ebe259d0b..000000000 --- a/tests/manual/docker-dns-srv/certs/ca.crt +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDrjCCApagAwIBAgIUb8ICEcp5me1o5zF4mh4GKnf57hUwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xODExMDkxNzQ2MDBaFw0yODExMDYxNzQ2 -MDBaMG8xDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTELMAkGA1UEAxMCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQDEBKTfgg0MFy62Sslp8nJPLknl+qTO8ohan80CealThTMuRoGMYpXha0sx -d+mv13sm+vRwEMaRU0FTmxtE9nrM/DNfRoeDd+ZW+Q/hNRuQ0mf0xvmY/h25M+It -uaDbAD3m+UhmOCC1nzdwyBOxm4DQONMwMGtfCOZ8OkIVsKkubx3/pgRB/LdJZRdL -1KWGucjMFxEaTGdwAIxdRyPS9pIX9g+B3zC7T3sYk7YbCGyvi1KLVR45Lm1MPcFY -Gy3hU+CVHiljT6+87N+c98lv8wjnTFJXDkouLm6CxyxGgfGop8fHzpMpGcNmcN5t -Yb3exRWn9u9BfNVH1YEOfiRVB+ylAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP -BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQe5E9CeqoDpGgJ1u++mp72Ajvt6DAN -BgkqhkiG9w0BAQsFAAOCAQEAUCj9oKV43RyjvcqKSs00mFKctHZih4Kf0HWGC47M -ny8c/FzCcC66q9TZx1vuf2PHkLsY8Z8f7Rjig2G6hbPKwU05JSFzKCwJhnRSxX4f -ELDqQXbidlQ6wOcj2zoLSVC6WIjVmLyXCu0Zrcp+YwHyGb5x7SQcA1wNmJKOba+h -ooXl5Ea4R1bxK+43lB2bsFovJVhS+6iyBih6oMlLycaSu6c5X38i0mcxQu6Ul/Ua -I8nW1cAXnQC53VzQGkhfxnvWsc98XU/NzF778EaLwLECE7R4zkHWKSUktge1x+co -bRXtQ/C7BoEVaTmQnl211O3rA8gnZ0cmmNBO1S0hIiZIBQ== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns-srv/certs/gencert.json b/tests/manual/docker-dns-srv/certs/gencert.json deleted file mode 100644 index 09b67267b..000000000 --- a/tests/manual/docker-dns-srv/certs/gencert.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "signing": { - "default": { - "usages": [ - "signing", - "key encipherment", - "server auth", - "client auth" - ], - "expiry": "87600h" - } - } -} diff --git a/tests/manual/docker-dns-srv/certs/gencerts.sh b/tests/manual/docker-dns-srv/certs/gencerts.sh deleted file mode 100755 index af8663e09..000000000 --- a/tests/manual/docker-dns-srv/certs/gencerts.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -if ! [[ "$0" =~ "./gencerts.sh" ]]; then - echo "must be run from 'fixtures'" - exit 255 -fi - -if ! which cfssl; then - echo "cfssl is not installed" - exit 255 -fi - -cfssl gencert --initca=true ./ca-csr.json | cfssljson --bare ./ca -mv ca.pem ca.crt -openssl x509 -in ca.crt -noout -text - -# generate wildcard certificates DNS: *.etcd.local -cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr.json | cfssljson --bare ./server -mv server.pem server.crt -mv server-key.pem server.key.insecure - -rm -f *.csr *.pem *.stderr *.txt diff --git a/tests/manual/docker-dns-srv/certs/run.sh b/tests/manual/docker-dns-srv/certs/run.sh deleted file mode 100755 index d70f355ba..000000000 --- a/tests/manual/docker-dns-srv/certs/run.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -rm -rf /tmp/m{1,2,3,4,5,6}.data - -/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 /certs/Procfile start & - -# TODO: remove random sleeps -sleep 7s - -./etcdctl \ - --cacert=/certs/ca.crt \ - --cert=/certs/server.crt \ - --key=/certs/server.key.insecure \ - --discovery-srv etcd.local \ - endpoint health --cluster - -./etcdctl \ - --cacert=/certs/ca.crt \ - --cert=/certs/server.crt \ - --key=/certs/server.key.insecure \ - --discovery-srv etcd.local \ - put abc def - -./etcdctl \ - --cacert=/certs/ca.crt \ - --cert=/certs/server.crt \ - --key=/certs/server.key.insecure \ - --discovery-srv etcd.local \ - get abc - -./etcdctl \ - --cacert=/certs/ca.crt \ - --cert=/certs/server.crt \ - --key=/certs/server.key.insecure \ - --discovery-srv etcd.local \ - --discovery-srv-name c1 \ - endpoint health --cluster - -./etcdctl \ - --cacert=/certs/ca.crt \ - --cert=/certs/server.crt \ - --key=/certs/server.key.insecure \ - --discovery-srv etcd.local \ - --discovery-srv-name c1 \ - put ghi jkl - -./etcdctl \ - --cacert=/certs/ca.crt \ - --cert=/certs/server.crt \ - --key=/certs/server.key.insecure \ - --discovery-srv etcd.local \ - --discovery-srv-name c1 \ - get ghi diff --git a/tests/manual/docker-dns-srv/certs/server-ca-csr.json b/tests/manual/docker-dns-srv/certs/server-ca-csr.json deleted file mode 100644 index 661de3799..000000000 --- a/tests/manual/docker-dns-srv/certs/server-ca-csr.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "hosts": [ - "m1.etcd.local", - "m2.etcd.local", - "m3.etcd.local", - "m4.etcd.local", - "m5.etcd.local", - "m6.etcd.local", - "etcd.local", - "127.0.0.1", - "localhost" - ] -} diff --git a/tests/manual/docker-dns-srv/certs/server.crt b/tests/manual/docker-dns-srv/certs/server.crt deleted file mode 100644 index 83c2fd9d4..000000000 --- a/tests/manual/docker-dns-srv/certs/server.crt +++ /dev/null @@ -1,26 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEZTCCA02gAwIBAgIULBrfr3JYYypJkYr+LK0oWAqHsCowDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xODExMDkxNzQ3MDBaFw0yODExMDYxNzQ3 -MDBaMGIxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBFVoY2gbx/ -z9ciHrH6LzxIwIDmeVbOIMyooTun3iCtM8OjSkw15fl6WvM0KLKb6D2B+N7MLGa8 -T+KqKHIrzCudK21WGV8g5Pwc56fjRT796zQsyMjcjMlf9AEtP4ZdY4aap4r0d28m -ZiUx9hccUtC6b0AFVgBuHjGNw4Ym6zmz38ZWEfnJ/R71uccmQpB5CoOZ7dN1bCJa -gZqaWwRCYNG5XAQD2GMcn6r7oFijhlVO99auT04Et2lpoOzg2P4a8pPGgzsUCFOP -WnuqNh78p61AHnEpUM0eLzzENFAmSSzwMr9jFkNF4gMgLrn0t3M1JUrbzXWIk9EX -5G6pafkxXlkCAwEAAaOCAQQwggEAMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAU -BggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUtaRC -6qucn6KvF+/u/esMahneemswHwYDVR0jBBgwFoAUHuRPQnqqA6RoCdbvvpqe9gI7 -7egwgYAGA1UdEQR5MHeCDW0xLmV0Y2QubG9jYWyCDW0yLmV0Y2QubG9jYWyCDW0z -LmV0Y2QubG9jYWyCDW00LmV0Y2QubG9jYWyCDW01LmV0Y2QubG9jYWyCDW02LmV0 -Y2QubG9jYWyCCmV0Y2QubG9jYWyCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0B -AQsFAAOCAQEAFfdWclzi+J7vI0p/7F0UaJ54JkRx4zR9+qcmDHqRbLdiGOYsTiDq -AudryZjbCsl8koj9k1f7MvDGSIQpCp3jyAJpv/NE9NxuSagDO3vIvAuKfox2HcHV -RPyoo6igp9FY6F8af0h7CyCXgX0+4PFaLnyJgpQ3tV4jCKduyjCYkAiC1QwoNB8H -wZEw0zlyFml/5GlQoqtjJyZ7JFIJhrFIUbRIFO7gZZSIipsON7teOjA2HvYme33Y -uvx/FWr7GBXqpHUamQqWS6ixWBM/rj0lEViYtuWkitek41YHJuktxKs1+peXPjpb -rYCK5H6Bn/zLKOo2zikqfq41+g/mui3/jQ== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns-srv/certs/server.key.insecure b/tests/manual/docker-dns-srv/certs/server.key.insecure deleted file mode 100644 index 5030a91dc..000000000 --- a/tests/manual/docker-dns-srv/certs/server.key.insecure +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAsEVWhjaBvH/P1yIesfovPEjAgOZ5Vs4gzKihO6feIK0zw6NK -TDXl+Xpa8zQospvoPYH43swsZrxP4qoocivMK50rbVYZXyDk/Bznp+NFPv3rNCzI -yNyMyV/0AS0/hl1jhpqnivR3byZmJTH2FxxS0LpvQAVWAG4eMY3DhibrObPfxlYR -+cn9HvW5xyZCkHkKg5nt03VsIlqBmppbBEJg0blcBAPYYxyfqvugWKOGVU731q5P -TgS3aWmg7ODY/hryk8aDOxQIU49ae6o2HvynrUAecSlQzR4vPMQ0UCZJLPAyv2MW -Q0XiAyAuufS3czUlStvNdYiT0Rfkbqlp+TFeWQIDAQABAoIBAHj6LacRc7secVPy -a+S0k4SpXc1Z4L9N2z77ISVjUdVVaiiEQnLJrxuo+RDfpGrpC9xi/p5SvMqJxb4I -EJhDLO5mAS8aH3GljuLlJ6yXE6hm9u0pK2iHzexLeZjxKB8cqzjvnbuFiw7y6Lnw -bzhvTPtKaR4kS2EiMoDKDf5daaWAhaJSlLpVnSW7COrVd12vF8YhKkGeyoXEVrAH -GjdHmpZKI3qzvNJNe8ZQq8VXxMmQs8bryKFO1k7rN6ypMFILYuze7+x+DQ1/Kbee -UoCN6HIja5GGF77ZggDdyDMrcWv0t1ib/6mFV03m+Iv6n2GBOOkrDSi+rRACdRtF -5YRXSQECgYEA1sxrz6w0Etg6VrYsOZGSHKh8b/9agGSCtV2T3Jo4LSndFvzy78s0 -lVSuR6irflnaXdngSl8OyZ3s90egWzVpKTq9VCV/Mwk5cscUYaMSBNw75H1Yxfrq -wyiygL38m/gKZ6L1kjGEdFH80ODr26tQM/npruYRyd33R7/YO6QRJrkCgYEA0hUI -uEiZDdudtpifAODzVvuxptCH1V1sXJLpdy2XSk2PWBKJ+ePHVhkx9sOnIX1m7DuE -RsdFVunUz1jVEy4UYxMwpQK7KxZZB05daiwhUI5qMSuwwOKqQbyjCOBIAlgcRWow -fVbIWbOsza/a9bjgZ3QQFWAbCVxrAuG9Re2mJKECgYBUnZjG6YZl+goZSJBpaUAO -zAyhLg2f0HhxK9joqVQB7qDqwmCNOBaR0RcKoZZVIt5T5FVn1sSDhhPoYa344DR6 -Cmq08ESIfVTFM0mDIPMjOQLbAsnqy+qZULno327YnkCzDM4CdkFAdV/LhR9EnNru -br+wp29Qf4E/IYL0E7Cx+QKBgHpbGdsLHWl+0Zp5xZHjcpbkvRFlPte8M9KvFh79 -hLIX/jbThVzvlzfEMN+CEKNmwD0yZNY8VVxLkFC7ck5bdjBGCvzwXEa6G1wv/iRK -U5TxfVPqGGYfHf5veZ0/03DaFI0xTdCSbNoh1bFujN60sK5QYNWyRczr8L+a7nv9 -79hBAoGBAMytiRzt0hj06ww3oJSQjxwotJ19pnV52p84BQfsGEAgfVRqqADMyn5U -dkpT9q+IADivb1ELNWUl4af2levage/rBnaDzer0ywnl50J0TRu+DJppIGJIi3r4 -IufVehZ6F+pntM+UbMcBxNXr3cLzAaEHoIhyKq0UG4P4Ef3v6DeI ------END RSA PRIVATE KEY----- diff --git a/tests/manual/docker-dns-srv/etcd.zone b/tests/manual/docker-dns-srv/etcd.zone deleted file mode 100644 index c80a07f0b..000000000 --- a/tests/manual/docker-dns-srv/etcd.zone +++ /dev/null @@ -1,32 +0,0 @@ -$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 -m4 IN A 127.0.0.1 -m5 IN A 127.0.0.1 -m6 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. - -; discovery-srv-name=c1 -_etcd-client-ssl-c1._tcp IN SRV 0 0 13791 m4.etcd.local. -_etcd-server-ssl-c1._tcp IN SRV 0 0 13880 m4.etcd.local. -_etcd-client-ssl-c1._tcp IN SRV 0 0 23791 m5.etcd.local. -_etcd-server-ssl-c1._tcp IN SRV 0 0 23880 m5.etcd.local. -_etcd-client-ssl-c1._tcp IN SRV 0 0 33791 m6.etcd.local. -_etcd-server-ssl-c1._tcp IN SRV 0 0 33880 m6.etcd.local. diff --git a/tests/manual/docker-dns-srv/named.conf b/tests/manual/docker-dns-srv/named.conf deleted file mode 100644 index 76ce0caa1..000000000 --- a/tests/manual/docker-dns-srv/named.conf +++ /dev/null @@ -1,23 +0,0 @@ -options { - directory "/var/bind"; - listen-on { 127.0.0.1; }; - listen-on-v6 { none; }; - allow-transfer { - none; - }; - // If you have problems and are behind a firewall: - query-source address * port 53; - pid-file "/var/run/named/named.pid"; - allow-recursion { none; }; - recursion no; -}; - -zone "etcd.local" IN { - type main; - file "/etc/bind/etcd.zone"; -}; - -zone "0.0.127.in-addr.arpa" { - type main; - file "/etc/bind/rdns.zone"; -}; diff --git a/tests/manual/docker-dns-srv/rdns.zone b/tests/manual/docker-dns-srv/rdns.zone deleted file mode 100644 index d129188e4..000000000 --- a/tests/manual/docker-dns-srv/rdns.zone +++ /dev/null @@ -1,17 +0,0 @@ -$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 - -1 IN PTR m1.etcd.local. -1 IN PTR m2.etcd.local. -1 IN PTR m3.etcd.local. -1 IN PTR m4.etcd.local. -1 IN PTR m5.etcd.local. -1 IN PTR m6.etcd.local. - diff --git a/tests/manual/docker-dns-srv/resolv.conf b/tests/manual/docker-dns-srv/resolv.conf deleted file mode 100644 index bbc8559cd..000000000 --- a/tests/manual/docker-dns-srv/resolv.conf +++ /dev/null @@ -1 +0,0 @@ -nameserver 127.0.0.1 diff --git a/tests/manual/docker-dns/Dockerfile b/tests/manual/docker-dns/Dockerfile deleted file mode 100644 index 76dfe60b2..000000000 --- a/tests/manual/docker-dns/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM ubuntu:18.04 - -RUN rm /bin/sh && ln -s /bin/bash /bin/sh -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections - -RUN apt-get -y update \ - && apt-get -y install \ - build-essential \ - gcc \ - apt-utils \ - pkg-config \ - software-properties-common \ - apt-transport-https \ - libssl-dev \ - sudo \ - bash \ - curl \ - tar \ - git \ - netcat \ - bind9 \ - dnsutils \ - lsof \ - && apt-get -y update \ - && apt-get -y upgrade \ - && apt-get -y autoremove \ - && apt-get -y autoclean - -ENV GOROOT /usr/local/go -ENV GOPATH /go -ENV PATH ${GOPATH}/bin:${GOROOT}/bin:${PATH} -ENV GO_VERSION REPLACE_ME_GO_VERSION -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 get -v -u github.com/mattn/goreman - -RUN mkdir -p /var/bind /etc/bind -RUN chown root:bind /var/bind /etc/bind - -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 diff --git a/tests/manual/docker-dns/certs-common-name-auth/Procfile b/tests/manual/docker-dns/certs-common-name-auth/Procfile deleted file mode 100644 index 2fb95f5fe..000000000 --- a/tests/manual/docker-dns/certs-common-name-auth/Procfile +++ /dev/null @@ -1,6 +0,0 @@ -# Use goreman to run `go get github.com/mattn/goreman` -etcd1: ./etcd --name m1 --data-dir /tmp/m1.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs-common-name-auth/server.crt --peer-key-file=/certs-common-name-auth/server.key.insecure --peer-trusted-ca-file=/certs-common-name-auth/ca.crt --peer-client-cert-auth --peer-cert-allowed-cn test-common-name --cert-file=/certs-common-name-auth/server.crt --key-file=/certs-common-name-auth/server.key.insecure --trusted-ca-file=/certs-common-name-auth/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd2: ./etcd --name m2 --data-dir /tmp/m2.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs-common-name-auth/server.crt --peer-key-file=/certs-common-name-auth/server.key.insecure --peer-trusted-ca-file=/certs-common-name-auth/ca.crt --peer-client-cert-auth --peer-cert-allowed-cn test-common-name --cert-file=/certs-common-name-auth/server.crt --key-file=/certs-common-name-auth/server.key.insecure --trusted-ca-file=/certs-common-name-auth/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd3: ./etcd --name m3 --data-dir /tmp/m3.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs-common-name-auth/server.crt --peer-key-file=/certs-common-name-auth/server.key.insecure --peer-trusted-ca-file=/certs-common-name-auth/ca.crt --peer-client-cert-auth --peer-cert-allowed-cn test-common-name --cert-file=/certs-common-name-auth/server.crt --key-file=/certs-common-name-auth/server.key.insecure --trusted-ca-file=/certs-common-name-auth/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr \ No newline at end of file diff --git a/tests/manual/docker-dns/certs-common-name-auth/ca-csr.json b/tests/manual/docker-dns/certs-common-name-auth/ca-csr.json deleted file mode 100644 index ecafabaad..000000000 --- a/tests/manual/docker-dns/certs-common-name-auth/ca-csr.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "ca", - "ca": { - "expiry": "87600h" - } -} diff --git a/tests/manual/docker-dns/certs-common-name-auth/ca.crt b/tests/manual/docker-dns/certs-common-name-auth/ca.crt deleted file mode 100644 index 00faeca22..000000000 --- a/tests/manual/docker-dns/certs-common-name-auth/ca.crt +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDsTCCApmgAwIBAgIUdASu5zT1US/6LPyKmczbC3NgdY4wDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xNzExMTQwNjIzMDBaFw0yNzExMTIwNjIz -MDBaMG8xDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTELMAkGA1UEAxMCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQDBbE44RP/Tk9l7KShzxQAypatoqDJQL32hyw8plZIfni5XFIlG2GwyjNvX -wiP6u0YcsApZKc58ytqcHQqMyk68OTTxcM+HVWvKHMKOBPBYgXeeVnD+7Ixuinq/ -X6RK3n2jEipFgE9FiAXDNICF3ZQz+HVNBSbzwCjBtIcYkinWHX+kgnQkFT1NnmuZ -uloz6Uh7/Ngn/XPNSsoMyLrh4TwDsx/fQEpVcrXMbxWux1xEHmfDzRKvE7VhSo39 -/mcpKBOwTg4jwh9tDjxWX4Yat+/cX0cGxQ7JSrdy14ESV5AGBmesGHd2SoWhZK9l -tWm1Eq0JYWD+Cd5yNrODTUxWRNs9AgMBAAGjRTBDMA4GA1UdDwEB/wQEAwIBBjAS -BgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBSZMjlLnc7Vv2mxRMebo5ezJ7gt -pzANBgkqhkiG9w0BAQsFAAOCAQEAA2d2nV4CXjp7xpTQrh8sHzSBDYUNr9DY5hej -52X6q8WV0N3QC7Utvv2Soz6Ol72/xoGajIJvqorsIBB5Ms3dgCzPMy3R01Eb3MzI -7KG/4AGVEiAKUBkNSD8PWD7bREnnv1g9tUftE7jWsgMaPIpi6KhzhyJsClT4UsKQ -6Lp+Be80S293LrlmUSdZ/v7FAvMzDGOLd2iTlTr1fXK6YJJEXpk3+HIi8nbUPvYQ -6O8iOtf5QoCm1yMLJQMFvNr51Z1EeF935HRj8U2MJP5jXPW4/UY2TAUBcWEhlNsK -6od+f1B8xGe/6KHvF0C8bg23kj8QphM/E7HCZiVgdm6FNf54AQ== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns/certs-common-name-auth/gencert.json b/tests/manual/docker-dns/certs-common-name-auth/gencert.json deleted file mode 100644 index 09b67267b..000000000 --- a/tests/manual/docker-dns/certs-common-name-auth/gencert.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "signing": { - "default": { - "usages": [ - "signing", - "key encipherment", - "server auth", - "client auth" - ], - "expiry": "87600h" - } - } -} diff --git a/tests/manual/docker-dns/certs-common-name-auth/gencerts.sh b/tests/manual/docker-dns/certs-common-name-auth/gencerts.sh deleted file mode 100755 index 09819cf22..000000000 --- a/tests/manual/docker-dns/certs-common-name-auth/gencerts.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -if ! [[ "$0" =~ "./gencerts.sh" ]]; then - echo "must be run from 'fixtures'" - exit 255 -fi - -if ! which cfssl; then - echo "cfssl is not installed" - exit 255 -fi - -cfssl gencert --initca=true ./ca-csr.json | cfssljson --bare ./ca -mv ca.pem ca.crt -openssl x509 -in ca.crt -noout -text - -# generate wildcard certificates DNS: m1/m2/m3.etcd.local -cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr.json | cfssljson --bare ./server -mv server.pem server.crt -mv server-key.pem server.key.insecure - -rm -f *.csr *.pem *.stderr *.txt diff --git a/tests/manual/docker-dns/certs-common-name-auth/run.sh b/tests/manual/docker-dns/certs-common-name-auth/run.sh deleted file mode 100755 index f46d642ae..000000000 --- a/tests/manual/docker-dns/certs-common-name-auth/run.sh +++ /dev/null @@ -1,255 +0,0 @@ -#!/bin/sh -rm -rf /tmp/m1.data /tmp/m2.data /tmp/m3.data - -/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 /certs-common-name-auth/Procfile start & - -# TODO: remove random sleeps -sleep 7s - -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379 \ - endpoint health --cluster - -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - put abc def - -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - get abc - -sleep 1s && printf "\n" -echo "Step 1. creating root role" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - role add root - -sleep 1s && printf "\n" -echo "Step 2. granting readwrite 'foo' permission to role 'root'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - role grant-permission root readwrite foo - -sleep 1s && printf "\n" -echo "Step 3. getting role 'root'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - role get root - -sleep 1s && printf "\n" -echo "Step 4. creating user 'root'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - --interactive=false \ - user add root:123 - -sleep 1s && printf "\n" -echo "Step 5. granting role 'root' to user 'root'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - user grant-role root root - -sleep 1s && printf "\n" -echo "Step 6. getting user 'root'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - user get root - -sleep 1s && printf "\n" -echo "Step 7. enabling auth" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - auth enable - -sleep 1s && printf "\n" -echo "Step 8. writing 'foo' with 'root:123'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - --user=root:123 \ - put foo bar - -sleep 1s && printf "\n" -echo "Step 9. writing 'aaa' with 'root:123'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - --user=root:123 \ - put aaa bbb - -sleep 1s && printf "\n" -echo "Step 10. writing 'foo' without 'root:123'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - put foo bar - -sleep 1s && printf "\n" -echo "Step 11. reading 'foo' with 'root:123'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - --user=root:123 \ - get foo - -sleep 1s && printf "\n" -echo "Step 12. reading 'aaa' with 'root:123'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - --user=root:123 \ - get aaa - -sleep 1s && printf "\n" -echo "Step 13. creating a new user 'test-common-name:test-pass'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - --user=root:123 \ - --interactive=false \ - user add test-common-name:test-pass - -sleep 1s && printf "\n" -echo "Step 14. creating a role 'test-role'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - --user=root:123 \ - role add test-role - -sleep 1s && printf "\n" -echo "Step 15. granting readwrite 'aaa' --prefix permission to role 'test-role'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - --user=root:123 \ - role grant-permission test-role readwrite aaa --prefix - -sleep 1s && printf "\n" -echo "Step 16. getting role 'test-role'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - --user=root:123 \ - role get test-role - -sleep 1s && printf "\n" -echo "Step 17. granting role 'test-role' to user 'test-common-name'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - --user=root:123 \ - user grant-role test-common-name test-role - -sleep 1s && printf "\n" -echo "Step 18. writing 'aaa' with 'test-common-name:test-pass'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - --user=test-common-name:test-pass \ - put aaa bbb - -sleep 1s && printf "\n" -echo "Step 19. writing 'bbb' with 'test-common-name:test-pass'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - --user=test-common-name:test-pass \ - put bbb bbb - -sleep 1s && printf "\n" -echo "Step 20. reading 'aaa' with 'test-common-name:test-pass'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - --user=test-common-name:test-pass \ - get aaa - -sleep 1s && printf "\n" -echo "Step 21. reading 'bbb' with 'test-common-name:test-pass'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - --user=test-common-name:test-pass \ - get bbb - -sleep 1s && printf "\n" -echo "Step 22. writing 'aaa' with CommonName 'test-common-name'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - put aaa ccc - -sleep 1s && printf "\n" -echo "Step 23. reading 'aaa' with CommonName 'test-common-name'" -./etcdctl \ - --cacert=/certs-common-name-auth/ca.crt \ - --cert=/certs-common-name-auth/server.crt \ - --key=/certs-common-name-auth/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - get aaa diff --git a/tests/manual/docker-dns/certs-common-name-auth/server-ca-csr.json b/tests/manual/docker-dns/certs-common-name-auth/server-ca-csr.json deleted file mode 100644 index 6a57789b1..000000000 --- a/tests/manual/docker-dns/certs-common-name-auth/server-ca-csr.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "test-common-name", - "hosts": [ - "m1.etcd.local", - "m2.etcd.local", - "m3.etcd.local", - "127.0.0.1", - "localhost" - ] -} diff --git a/tests/manual/docker-dns/certs-common-name-auth/server.crt b/tests/manual/docker-dns/certs-common-name-auth/server.crt deleted file mode 100644 index b9719b2f0..000000000 --- a/tests/manual/docker-dns/certs-common-name-auth/server.crt +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIERDCCAyygAwIBAgIUO500NxhwBHJsodbGKbo5NsW9/p8wDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xNzExMTQwNjIzMDBaFw0yNzExMTIwNjIz -MDBaMH0xDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTEZMBcGA1UEAxMQdGVzdC1jb21tb24tbmFtZTCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBAMRvVMj3+5jAhRng4izVm4zrvMBnHNMh2MOFVTp7 -wdhEF2en7pFsKzWgczewil6v4d6QzJpgB9yQzPT2q0SOvetpbqP950y6MdPHAF9D -qZd0+wC+RLdSmK5oQKzgZER/vH3eSbTa1UdwaLBHlT6PiTzGm+gEYL43gr3kle+A -9c7aT9pkJWQFTCSdqwcQopyHEwgrfPHC8Bdn804soG4HtR9Gg/R4xtlu7ir6LTHn -vpPBScaMZDUQ5UNrEMh8TM8/sXG6oxqo86r5wpVQt6vscnTMrTTUqq+Mo/OJnDAf -plaqkWX5NfIJ9tmE2V06hq1/ptQkl714Wb+ske+aJ2Poc/UCAwEAAaOByTCBxjAO -BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwG -A1UdEwEB/wQCMAAwHQYDVR0OBBYEFEG2hXyVTpxLXTse3fXe0U/g0F8kMB8GA1Ud -IwQYMBaAFJkyOUudztW/abFEx5ujl7MnuC2nMEcGA1UdEQRAMD6CDW0xLmV0Y2Qu -bG9jYWyCDW0yLmV0Y2QubG9jYWyCDW0zLmV0Y2QubG9jYWyCCWxvY2FsaG9zdIcE -fwAAATANBgkqhkiG9w0BAQsFAAOCAQEADtH0NZBrWfXTUvTa3WDsa/JPBhiPu/kH -+gRxOD5UNeDX9+QAx/gxGHrCh4j51OUx55KylUe0qAPHHZ4vhgD2lCRBqFLYx69m -xRIzVnt5NCruriskxId1aFTZ5pln5KK5tTVkAp04MBHZOgv8giXdRWn+7TtMyJxj -wVGf8R7/bwJGPPJFrLNtN4EWwXv/a2/SEoZd8fkTxzw12TeJ8w1PnkH4Zer+nzNb -dH5f+OIBGGZ2fIWANX5g9JEJvvsxBBL8uoCrFE/YdnD0fLyhoplSOVEIvncQLHd8 -3QoIVQ5GXnreMF9vuuEU5LlSsqd/Zv5mAQNrbEAfAL+QZQsnHY12qQ== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns/certs-common-name-auth/server.key.insecure b/tests/manual/docker-dns/certs-common-name-auth/server.key.insecure deleted file mode 100644 index 07417b255..000000000 --- a/tests/manual/docker-dns/certs-common-name-auth/server.key.insecure +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAxG9UyPf7mMCFGeDiLNWbjOu8wGcc0yHYw4VVOnvB2EQXZ6fu -kWwrNaBzN7CKXq/h3pDMmmAH3JDM9ParRI6962luo/3nTLox08cAX0Opl3T7AL5E -t1KYrmhArOBkRH+8fd5JtNrVR3BosEeVPo+JPMab6ARgvjeCveSV74D1ztpP2mQl -ZAVMJJ2rBxCinIcTCCt88cLwF2fzTiygbge1H0aD9HjG2W7uKvotMee+k8FJxoxk -NRDlQ2sQyHxMzz+xcbqjGqjzqvnClVC3q+xydMytNNSqr4yj84mcMB+mVqqRZfk1 -8gn22YTZXTqGrX+m1CSXvXhZv6yR75onY+hz9QIDAQABAoIBABiq+nS6X4gRNSXI -zd5ffMc3m152FHKXH4d+KPPNMsyb0Gyd9CGi+dIkMhPeQaIeaDjw6iDAynvyWyqw -B1X2rvbvKIvDiNZj03oK1YshDh0M/bBcNHjpEG9mfCi5jR3lBKCx14O0r2/nN95b -Puy6TbuqHU4HrrZ0diCuof2Prk6pd0EhQC+C3bZCcoWXOaRTqrMBTT6DdSMQrVKD -eGTXYqCzs/AlGKkOiErKtKWouNpkPpPiba1qp7YWXUasrXqPgPi4d97TmOShGIfc -zXNJT+e2rDX4OEVAJtOt6U2l9QG+PIhpH4P/ZYsvindm4VZBs+Vysrj4xkLgGBBP -ygOfBIECgYEA0IfP9Z9mzvCXiGrkrx2tN/k31cX674P/KwxPgSWM/AdXenYYzsmj -rVcoFx2eCFnBFdPz4BAqEfH70gtsG7OoTmoJSwN6wurIdGcFQwItrghgt9Qp46Dq -AIT9RXSpcB9AjM6p2reCjWcNeBVMrrHU3eaQitCxZbzuxvMMhMs/zzECgYEA8Sak -UhXFtNjxBW6EMNmTpjhShIZmxtPNzTJ5DtmARr8F+SMELp3JGJj/9Bm4TsvqJmGs -j9g/MVvSTjJlOuYPGJ5DBl3egZ5ZlRJx3I2qA4lFFCb71OJzuoR8YdHRlHnhJOu9 -2Jyrki1wrAefby8Fe/+5vswxq2u+Qurjya716AUCgYB+E06ZGzmmLfH/6Vi/wzqC -F+w5FAzGGNECbtv2ogReL/YktRgElgaee45ig2aTd+h0UQQmWL+Gv/3XHU7MZM+C -MTvTHZRwGlD9h3e37q49hRUsr1pwJE6157HU91al0k9NknlBIigNY9vR2VbWW+/u -BUMomkpWz2ax5CqScuvuUQKBgQCE+zYqPe9kpy1iPWuQNKuDQhPfGO6cPjiDK44u -biqa2MRGetTXkBNRCS48QeKtMS3SNJKgUDOo2GXE0W2ZaTxx6vQzEpidCeGEn0NC -yKw0fwIk9spwvt/qvxyIJNhZ9Ev/vDBYvyyt03kKpLl66ocvtfmMCbZqPWQSKs2q -bl0UsQKBgQDDrsPnuVQiv6l0J9VrZc0f5DYZIJmQij1Rcg/fL1Dv2mEpADrH2hkY -HI27Q15dfgvccAGbGXbZt3xi7TCLDDm+Kl9V9bR2e2EhqA84tFryiBZ5XSDRAWPU -UIjejblTgtzrTqUd75XUkNoKvJIGrLApmQiBJRQbcbwtmt2pWbziyQ== ------END RSA PRIVATE KEY----- diff --git a/tests/manual/docker-dns/certs-common-name-multi/Procfile b/tests/manual/docker-dns/certs-common-name-multi/Procfile deleted file mode 100644 index ac1094c08..000000000 --- a/tests/manual/docker-dns/certs-common-name-multi/Procfile +++ /dev/null @@ -1,6 +0,0 @@ -# Use goreman to run `go get github.com/mattn/goreman` -etcd1: ./etcd --name m1 --data-dir /tmp/m1.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs-common-name-multi/server-1.crt --peer-key-file=/certs-common-name-multi/server-1.key.insecure --peer-trusted-ca-file=/certs-common-name-multi/ca.crt --peer-client-cert-auth --peer-cert-allowed-cn etcd.local --cert-file=/certs-common-name-multi/server-1.crt --key-file=/certs-common-name-multi/server-1.key.insecure --trusted-ca-file=/certs-common-name-multi/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd2: ./etcd --name m2 --data-dir /tmp/m2.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs-common-name-multi/server-2.crt --peer-key-file=/certs-common-name-multi/server-2.key.insecure --peer-trusted-ca-file=/certs-common-name-multi/ca.crt --peer-client-cert-auth --peer-cert-allowed-cn etcd.local --cert-file=/certs-common-name-multi/server-2.crt --key-file=/certs-common-name-multi/server-2.key.insecure --trusted-ca-file=/certs-common-name-multi/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd3: ./etcd --name m3 --data-dir /tmp/m3.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs-common-name-multi/server-3.crt --peer-key-file=/certs-common-name-multi/server-3.key.insecure --peer-trusted-ca-file=/certs-common-name-multi/ca.crt --peer-client-cert-auth --peer-cert-allowed-cn etcd.local --cert-file=/certs-common-name-multi/server-3.crt --key-file=/certs-common-name-multi/server-3.key.insecure --trusted-ca-file=/certs-common-name-multi/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr \ No newline at end of file diff --git a/tests/manual/docker-dns/certs-common-name-multi/ca-csr.json b/tests/manual/docker-dns/certs-common-name-multi/ca-csr.json deleted file mode 100644 index ecafabaad..000000000 --- a/tests/manual/docker-dns/certs-common-name-multi/ca-csr.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "ca", - "ca": { - "expiry": "87600h" - } -} diff --git a/tests/manual/docker-dns/certs-common-name-multi/ca.crt b/tests/manual/docker-dns/certs-common-name-multi/ca.crt deleted file mode 100644 index 2e9b32003..000000000 --- a/tests/manual/docker-dns/certs-common-name-multi/ca.crt +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID0jCCArqgAwIBAgIUd3UZnVmZFo8x9MWWhUrYQvZHLrQwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xODAxMjAwNjAwMDBaFw0yODAxMTgwNjAw -MDBaMG8xDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTELMAkGA1UEAxMCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQCqgFTgSFl+ugXkZuiN5PXp84Zv05crwI5x2ePMnc2/3u1s7cQBvXQGCJcq -OwWD7tjcy4K2PDC0DLRa4Mkd8JpwADmf6ojbMH/3a1pXY2B3BJQwmNPFnxRJbDZL -Iti6syWKwyfLVb1KFCU08G+ZrWmGIXPWDiE+rTn/ArD/6WbQI1LYBFJm25NLpttM -mA3HnWoErNGY4Z/AR54ROdQSPL7RSUZBa0Kn1riXeOJ40/05qosR2O/hBSAGkD+m -5Rj+A6oek44zZqVzCSEncLsRJAKqgZIqsBrErAho72irEgTwv4OM0MyOCsY/9erf -hNYRSoQeX+zUvEvgToalfWGt6kT3AgMBAAGjZjBkMA4GA1UdDwEB/wQEAwIBBjAS -BgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBRDePNja5CK4zUfO5x1vzGvdmUF -CzAfBgNVHSMEGDAWgBRDePNja5CK4zUfO5x1vzGvdmUFCzANBgkqhkiG9w0BAQsF -AAOCAQEAZu0a3B7Ef/z5Ct99xgzPy4z9RwglqPuxk446hBWR5TYT9fzm+voHCAwb -MJEaQK3hvAz47qAjyR9/b+nBw4LRTMxg0WqB+UEEVwBGJxtfcOHx4mJHc3lgVJnR -LiEWtIND7lu5Ql0eOjSehQzkJZhUb4SnXD7yk64zukQQv9zlZYZCHPDAQ9LzR2vI -ii4yhwdWl7iiZ0lOyR4xqPB3Cx/2kjtuRiSkbpHGwWBJLng2ZqgO4K+gL3naNgqN -TRtdOSK3j/E5WtAeFUUT68Gjsg7yXxqyjUFq+piunFfQHhPB+6sPPy56OtIogOk4 -dFCfFAygYNrFKz366KY+7CbpB+4WKA== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns/certs-common-name-multi/gencert.json b/tests/manual/docker-dns/certs-common-name-multi/gencert.json deleted file mode 100644 index 09b67267b..000000000 --- a/tests/manual/docker-dns/certs-common-name-multi/gencert.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "signing": { - "default": { - "usages": [ - "signing", - "key encipherment", - "server auth", - "client auth" - ], - "expiry": "87600h" - } - } -} diff --git a/tests/manual/docker-dns/certs-common-name-multi/gencerts.sh b/tests/manual/docker-dns/certs-common-name-multi/gencerts.sh deleted file mode 100755 index b2318fd08..000000000 --- a/tests/manual/docker-dns/certs-common-name-multi/gencerts.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -if ! [[ "$0" =~ "./gencerts.sh" ]]; then - echo "must be run from 'fixtures'" - exit 255 -fi - -if ! which cfssl; then - echo "cfssl is not installed" - exit 255 -fi - -cfssl gencert --initca=true ./ca-csr.json | cfssljson --bare ./ca -mv ca.pem ca.crt -openssl x509 -in ca.crt -noout -text - -# generate wildcard certificates DNS: m1/m2/m3.etcd.local -cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr-1.json | cfssljson --bare ./server-1 -mv server-1.pem server-1.crt -mv server-1-key.pem server-1.key.insecure - -cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr-2.json | cfssljson --bare ./server-2 -mv server-2.pem server-2.crt -mv server-2-key.pem server-2.key.insecure - -cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr-3.json | cfssljson --bare ./server-3 -mv server-3.pem server-3.crt -mv server-3-key.pem server-3.key.insecure - -rm -f *.csr *.pem *.stderr *.txt diff --git a/tests/manual/docker-dns/certs-common-name-multi/run.sh b/tests/manual/docker-dns/certs-common-name-multi/run.sh deleted file mode 100755 index 92c4ca0d8..000000000 --- a/tests/manual/docker-dns/certs-common-name-multi/run.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -rm -rf /tmp/m1.data /tmp/m2.data /tmp/m3.data - -/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 /certs-common-name-multi/Procfile start & - -# TODO: remove random sleeps -sleep 7s - -./etcdctl \ - --cacert=/certs-common-name-multi/ca.crt \ - --cert=/certs-common-name-multi/server-1.crt \ - --key=/certs-common-name-multi/server-1.key.insecure \ - --endpoints=https://m1.etcd.local:2379 \ - endpoint health --cluster - -./etcdctl \ - --cacert=/certs-common-name-multi/ca.crt \ - --cert=/certs-common-name-multi/server-2.crt \ - --key=/certs-common-name-multi/server-2.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - put abc def - -./etcdctl \ - --cacert=/certs-common-name-multi/ca.crt \ - --cert=/certs-common-name-multi/server-3.crt \ - --key=/certs-common-name-multi/server-3.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - get abc diff --git a/tests/manual/docker-dns/certs-common-name-multi/server-1.crt b/tests/manual/docker-dns/certs-common-name-multi/server-1.crt deleted file mode 100644 index f10b27277..000000000 --- a/tests/manual/docker-dns/certs-common-name-multi/server-1.crt +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEIDCCAwigAwIBAgIUaDLXBmJpHrElwENdnVk9hvAvlKcwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xODAxMjAwNjAwMDBaFw0yODAxMTgwNjAw -MDBaMHcxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTETMBEGA1UEAxMKZXRjZC5sb2NhbDCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBAOb5CdovL9QCdgsxnCBikTbJko6r5mrF+eA47gDLcVbWrRW5 -d8eZYV1Fyn5qe80O6LB6LKPrRftxyAGABKqIBCHR57E97UsICC4lGycBWaav6cJ+ -7Spkpf8cSSDjjgb4KC6VVPf9MCsHxBYSTfme8JEFE+6KjlG8Mqt2yv/5aIyRYITN -WzXvV7wxS9aOgDdXLbojW9FJQCuzttOPfvINTyhtvUvCM8S61La5ymCdAdPpx1U9 -m5KC23k6ZbkAC8/jcOV+68adTUuMWLefPf9Ww3qMT8382k86gJgQjZuJDGUl3Xi5 -GXmO0GfrMh+v91yiaiqjsJCDp3uVcUSeH7qSkb0CAwEAAaOBqzCBqDAOBgNVHQ8B -Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB -/wQCMAAwHQYDVR0OBBYEFEwLLCuIHilzynJ7DlTrikyhy2TAMB8GA1UdIwQYMBaA -FEN482NrkIrjNR87nHW/Ma92ZQULMCkGA1UdEQQiMCCCDW0xLmV0Y2QubG9jYWyC -CWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAQEAkERnrIIvkZHWsyih -mFNf/JmFHC+0/UAG9Ti9msRlr9j1fh+vBIid3FAIShX0zFXf+AtN/+Bz5SVvQHUT -tm71AK/vER1Ue059SIty+Uz5mNAjwtXy0WaUgSuF4uju7MkYD5yUnSGv1iBfm88a -q+q1Vd5m6PkOCfuyNQQm5RKUiJiO4OS+2F9/JOpyr0qqdQthOWr266CqXuvVhd+Z -oZZn5TLq5GHCaTxfngSqS3TXl55QEGl65SUgYdGqpIfaQt3QKq2dqVg/syLPkTJt -GNJVLxJuUIu0PLrfuWynUm+1mOOfwXd8NZVZITUxC7Tl5ecFbTaOzU/4a7Cyssny -Wr3dUg== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns/certs-common-name-multi/server-1.key.insecure b/tests/manual/docker-dns/certs-common-name-multi/server-1.key.insecure deleted file mode 100644 index 61f2da4df..000000000 --- a/tests/manual/docker-dns/certs-common-name-multi/server-1.key.insecure +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA5vkJ2i8v1AJ2CzGcIGKRNsmSjqvmasX54DjuAMtxVtatFbl3 -x5lhXUXKfmp7zQ7osHoso+tF+3HIAYAEqogEIdHnsT3tSwgILiUbJwFZpq/pwn7t -KmSl/xxJIOOOBvgoLpVU9/0wKwfEFhJN+Z7wkQUT7oqOUbwyq3bK//lojJFghM1b -Ne9XvDFL1o6AN1ctuiNb0UlAK7O2049+8g1PKG29S8IzxLrUtrnKYJ0B0+nHVT2b -koLbeTpluQALz+Nw5X7rxp1NS4xYt589/1bDeoxPzfzaTzqAmBCNm4kMZSXdeLkZ -eY7QZ+syH6/3XKJqKqOwkIOne5VxRJ4fupKRvQIDAQABAoIBAQCYQsXm6kJqTbEJ -kgutIa0+48TUfqen7Zja4kyrg3HU4DI75wb6MreHqFFj4sh4FoL4i6HP8XIx3wEN -VBo/XOj0bo6BPiSm2MWjvdxXa0Fxa/f6uneYAb+YHEps/vWKzJ6YjuLzlBnj0/vE -3Q5AJzHJOAK6tuY5JYp1lBsggYcVWiQSW6wGQRReU/B/GdFgglL1chqL33Dt11Uv -Y6+oJz/PyqzPLPHcPbhqyQRMOZXnhx+8/+ooq5IojqOHfpa9JQURcHY7isBnpI/G -ZAa8tZctgTqtL4hB1rxDhdq1fS2YC12lxkBZse4jszcm0tYzy2gWmNTH480uo/0J -GOxX7eP1AoGBAO7O+aLhQWrspWQ//8YFbPWNhyscQub+t6WYjc0wn9j0dz8vkhMw -rh5O8uMcZBMDQdq185BcB3aHInw9COWZEcWNIen4ZyNJa5VCN4FY0a2GtFSSGG3f -ilKmQ7cjB950q2jl1AR3t2H7yah+i1ZChzPx+GEe+51LcJZX8mMjGvwjAoGBAPeZ -qJ2W4O2dOyupAfnKpZZclrEBqlyg7Xj85u20eBMUqtaIEcI/u2kaotQPeuaekUH0 -b1ybr3sJBTp3qzHUaNV3iMfgrnbWEOkIV2TCReWQb1Fk93o3gilMIkhGLIhxwWpM -UpQy3JTjGG/Y6gIOs7YnOBGVMA0o+RvouwooU6ifAoGAH6D6H0CGUYsWPLjdP3To -gX1FMciEc+O4nw4dede+1BVM1emPB0ujRBBgywOvnXUI+9atc6k8s84iGyJaU056 -tBeFLl/gCSRoQ1SJ1W/WFY2JxMm0wpig0WGEBnV1TVlWeoY2FoFkoG2gv9hCzCHz -lkWuB+76lFKxjrgHOmoj4NECgYB+COmbzkGQsoh8IPuwe0bu0xKh54cgv4oiHBow -xbyZedu8eGcRyf9L8RMRfw/AdNbcC+Dj8xvQNTdEG8Y5BzaV8tLda7FjLHRPKr/R -ulJ6GJuRgyO2Qqsu+mI5B/+DNOSPh2pBpeJCp5a42GHFylYQUsZnrNlY2ZJ0cnND -KGPtYQKBgQDL30+BB95FtRUvFoJIWwASCp7TIqW7N7RGWgqmsXU0EZ0Mya4dquqG -rJ1QuXQIJ+xV060ehwJR+iDUAY2xUg3/LCoDD0rwBzSdh+NEKjOmRNFRtn7WT03Q -264E80r6VTRSN4sWQwAAbd1VF1uGO5tkzZdJGWGhQhvTUZ498dE+9Q== ------END RSA PRIVATE KEY----- diff --git a/tests/manual/docker-dns/certs-common-name-multi/server-2.crt b/tests/manual/docker-dns/certs-common-name-multi/server-2.crt deleted file mode 100644 index e319fade4..000000000 --- a/tests/manual/docker-dns/certs-common-name-multi/server-2.crt +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEIDCCAwigAwIBAgIUHXDUS+Vry/Tquc6S6OoaeuGozrEwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xODAxMjAwNjAwMDBaFw0yODAxMTgwNjAw -MDBaMHcxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTETMBEGA1UEAxMKZXRjZC5sb2NhbDCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBAOO+FsO+6pwpv+5K+VQTYQb0lT0BjnM7Y2qSZIiTGCDp/M0P -yHSed4oTzxBeA9hEytczH/oddAUuSZNgag5sGFVgjFNdiZli4wQqJaMQRodivuUl -ZscqnWwtP3GYVAfg+t/4YdGB+dQRDQvHBl9BRYmUh2ixOA98OXKfNMr+u+3sh5Gy -dwx5ZEBRvgBcRrgCaIMsvVeIzHQBMHrNySAD1bGgm3xGdLeVPhAp24yUKZ5IbN6/ -+5hyCRARtGwLH/1Q/h10Sr5jxQi00eEXH+CNOvcerH6b2II/BxHIcqKd0u36pUfG -0KsY+ia0fvYi510V6Q0FAn45luEjHEk5ITN/LnMCAwEAAaOBqzCBqDAOBgNVHQ8B -Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB -/wQCMAAwHQYDVR0OBBYEFE69SZun6mXZe6cd3Cb2HWrK281MMB8GA1UdIwQYMBaA -FEN482NrkIrjNR87nHW/Ma92ZQULMCkGA1UdEQQiMCCCDW0yLmV0Y2QubG9jYWyC -CWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAQEAI5nHHULV7eUJMsvv -zk1shv826kOwXbMX10iRaf49/r7TWBq0pbPapvf5VXRsZ5wlDrDzjaNstpsaow/j -fhZ1zpU0h1bdifxE+omFSWZjpVM8kQD/yzT34VdyA+P2HuxG8ZTa8r7wTGrooD60 -TjBBM5gFV4nGVe+KbApQ26KWr+P8biKaWe6MM/jAv6TNeXiWReHqyM5v404PZQXK -cIN+fBb8bQfuaKaN1dkOUI3uSHmVmeYc5OGNJ2QKL9Uzm1VGbbM+1BOLhmF53QSm -5m2B64lPKy+vpTcRLN7oW1FHZOKts+1OEaLMCyjWFKFbdcrmJI+AP2IB+V6ODECn -RwJDtA== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns/certs-common-name-multi/server-2.key.insecure b/tests/manual/docker-dns/certs-common-name-multi/server-2.key.insecure deleted file mode 100644 index 57c3e78cb..000000000 --- a/tests/manual/docker-dns/certs-common-name-multi/server-2.key.insecure +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEA474Ww77qnCm/7kr5VBNhBvSVPQGOcztjapJkiJMYIOn8zQ/I -dJ53ihPPEF4D2ETK1zMf+h10BS5Jk2BqDmwYVWCMU12JmWLjBColoxBGh2K+5SVm -xyqdbC0/cZhUB+D63/hh0YH51BENC8cGX0FFiZSHaLE4D3w5cp80yv677eyHkbJ3 -DHlkQFG+AFxGuAJogyy9V4jMdAEwes3JIAPVsaCbfEZ0t5U+ECnbjJQpnkhs3r/7 -mHIJEBG0bAsf/VD+HXRKvmPFCLTR4Rcf4I069x6sfpvYgj8HEchyop3S7fqlR8bQ -qxj6JrR+9iLnXRXpDQUCfjmW4SMcSTkhM38ucwIDAQABAoIBAQCHYF6N2zYAwDyL -/Ns65A4gIVF5Iyy3SM0u83h5St7j6dNRXhltYSlz1ZSXiRtF+paM16IhflKSJdKs -nXpNumm4jpy7jXWWzRZfSmJ3DNyv673H3rS6nZVYUYlOEBubV1wpuK8E5/tG2R/l -KVibVORuBPF9BSNq6RAJF6Q9KrExmvH4MmG/3Y+iYbZgn0OK1WHxzbeMzdI8OO4z -eg4gTKuMoRFt5B4rZmC5QiXGHdnUXRWfy+yPLTH3hfTek4JT98akFNS01Q4UAi9p -5cC3TOqDNiZdAkN83UKhW9TNAc/vJlq6d5oXW5R+yPt+d8yMvEch4KfpYo33j0oz -qB40pdJRAoGBAP8ZXnWXxhzLhZ4o+aKefnsUUJjaiVhhSRH/kGAAg65lc4IEnt+N -nzyNIwz/2vPv2Gq2BpStrTsTNKVSZCKgZhoBTavP60FaszDSM0bKHTWHW7zaQwc0 -bQG6YvvCiP0iwEzXw7S4BhdAl+x/5C30dUZgKMSDFzuBI187h6dQQNZpAoGBAOSL -/MBuRYBgrHIL9V1v9JGDBeawGc3j2D5c56TeDtGGv8WGeCuE/y9tn+LcKQ+bCGyi -qkW+hobro/iaXODwUZqSKaAVbxC7uBLBTRB716weMzrnD8zSTOiMWg/gh+FOnr/4 -ZfcBco2Pmm5qQ3ZKwVk2jsfLhz6ZKwMrjSaO1Zp7AoGBAJZsajPjRHI0XN0vgkyv -Mxv2lbQcoYKZE1JmpcbGZt/OePdBLEHcq/ozq2h98qmHU9FQ9r5zT0QXhiK6W8vD -U5GgFSHsH+hQyHtQZ+YlRmYLJEBPX9j+xAyR0M5uHwNNm6F0VbXaEdViRHOz0mR6 -0zClgUSnnGp9MtN0MgCqJSGJAoGAJYba3Jn+rYKyLhPKmSoN5Wq3KFbYFdeIpUzJ -+GdB1aOjj4Jx7utqn1YHv89YqqhRLM1U2hjbrAG7LdHi2Eh9jbzcOt3qG7xHEEVP -Kxq6ohdfYBean44UdMa+7wZ2KUeoh2r5CyLgtV/UArdOFnlV4Bk2PpYrwdqSlnWr -Op6PcksCgYEA6HmIHLRTGyOUzS82BEcs5an2mzhQ8XCNdYS6sDaYSiDu2qlPukyZ -jons6P4qpOxlP9Cr6DW7px2fUZrEuPUV8fRJOc+a5AtZ5TmV6N1uH/G1rKmmAMCc -jGAmTJW87QguauTpuUto5u6IhyO2CRsYEy8K1A/1HUQKl721faZBIMA= ------END RSA PRIVATE KEY----- diff --git a/tests/manual/docker-dns/certs-common-name-multi/server-3.crt b/tests/manual/docker-dns/certs-common-name-multi/server-3.crt deleted file mode 100644 index 294de5332..000000000 --- a/tests/manual/docker-dns/certs-common-name-multi/server-3.crt +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEIDCCAwigAwIBAgIURfpNMXGb1/oZVwEWyc0Ofn7IItQwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xODAxMjAwNjAwMDBaFw0yODAxMTgwNjAw -MDBaMHcxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTETMBEGA1UEAxMKZXRjZC5sb2NhbDCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBALgCDkDM4qayF6CFt1ZScKR8B+/7qrn1iQ/qYnzRHQ1hlkuS -b3TkQtt7amGAuoD42d8jLYYvHn2Pbmdhn0mtgYZpFfLFCg4O67ZbX54lBHi+yDEh -QhneM9Ovsc42A0EVvabINYtKR6B2YRN00QRXS5R1t+QmclpshFgY0+ITsxlJeygs -wojXthPEfjTQK04JUi5LTHP15rLVzDEd7MguCWdEWRnOu/mSfPHlyz2noUcKuy0M -awsnSMwf+KBwQMLbJhTXtA4MG2FYsm/2en3/oAc8/0Z8sMOX05F+b0MgHl+a31aQ -UHM5ykfDNm3hGQfzjQCx4y4hjDoFxbuXvsey6GMCAwEAAaOBqzCBqDAOBgNVHQ8B -Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB -/wQCMAAwHQYDVR0OBBYEFDMydqyg/s43/dJTMt25zJubI/CUMB8GA1UdIwQYMBaA -FEN482NrkIrjNR87nHW/Ma92ZQULMCkGA1UdEQQiMCCCDW0zLmV0Y2QubG9jYWyC -CWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAQEAVs3VQjgx9CycaWKS -P6EvMtlqOkanJEe3zr69sI66cc2ZhfJ5xK38ox4oYpMOA131WRvwq0hjKhhZoVQ8 -aQ4yALi1XBltuIyEyrTX9GWAMeDzY95MdWKhyI8ps6/OOoXN596g9ZdOdIbZAMT4 -XAXm43WccM2W2jiKCEKcE4afIF8RiMIaFwG8YU8oHtnnNvxTVa0wrpcObtEtIzC5 -RJxzX9bkHCTHTgJog4OPChU4zffn18U/AVJ7MZ8gweVwhc4gGe0kwOJE+mLHcC5G -uoFSuVmAhYrH/OPpZhSDOaCED4dsF5jN25CbR3NufEBFRXBH20ZHNkNvbbBnYCBU -4+Rx5w== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns/certs-common-name-multi/server-3.key.insecure b/tests/manual/docker-dns/certs-common-name-multi/server-3.key.insecure deleted file mode 100644 index f931adb38..000000000 --- a/tests/manual/docker-dns/certs-common-name-multi/server-3.key.insecure +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEAuAIOQMziprIXoIW3VlJwpHwH7/uqufWJD+pifNEdDWGWS5Jv -dORC23tqYYC6gPjZ3yMthi8efY9uZ2GfSa2BhmkV8sUKDg7rtltfniUEeL7IMSFC -Gd4z06+xzjYDQRW9psg1i0pHoHZhE3TRBFdLlHW35CZyWmyEWBjT4hOzGUl7KCzC -iNe2E8R+NNArTglSLktMc/XmstXMMR3syC4JZ0RZGc67+ZJ88eXLPaehRwq7LQxr -CydIzB/4oHBAwtsmFNe0DgwbYViyb/Z6ff+gBzz/Rnyww5fTkX5vQyAeX5rfVpBQ -cznKR8M2beEZB/ONALHjLiGMOgXFu5e+x7LoYwIDAQABAoIBAQCY54RmjprNAHKn -vlXCEpFt7W8/GXcePg2ePxuGMtKcevpEZDPgA4oXDnAxA6J3Z9LMHFRJC8Cff9+z -YqjVtatLQOmvKdMYKYfvqfBD3ujfWVHLmaJvEnkor/flrnZ30BQfkoED9T6d9aDn -ZQwHOm8gt82OdfBSeZhkCIWReOM73622qJhmLWUUY3xEucRAFF6XffOLvJAT87Vu -pXKtCnQxhzxkUsCYNIOeH/pTX+XoLkysFBKxnrlbTeM0cEgWpYMICt/vsUrp6DHs -jygxR1EnT2/4ufe81aFSO4SzUZKJrz8zj4yIyDOR0Mp6FW+xMp8S0fDOywHhLlXn -xQOevmGBAoGBAOMQaWWs2FcxWvLfX95RyWPtkQ+XvmWlL5FR427TlLhtU6EPs0xZ -eeanMtQqSRHlDkatwc0XQk+s30/UJ+5i1iz3shLwtnZort/pbnyWrxkE9pcR0fgr -IklujJ8e8kQHpY75gOLmEiADrUITqvfbvSMsaG3h1VydPNU3JYTUuYmjAoGBAM91 -Atnri0PH3UKonAcMPSdwQ5NexqAD1JUk6KUoX2poXBXO3zXBFLgbMeJaWthbe+dG -Raw/zjBET/oRfDOssh+QTD8TutI9LA2+EN7TG7Kr6NFciz4Q2pioaimv9KUhJx+8 -HH2wCANYgkv69IWUFskF0uDCW9FQVvpepcctCJJBAoGAMlWxB5kJXErUnoJl/iKj -QkOnpI0+58l2ggBlKmw8y6VwpIOWe5ZaL4dg/Sdii1T7lS9vhsdhK8hmuIuPToka -cV13XDuANz99hKV6mKPOrP0srNCGez0UnLKk+aEik3IegVNN/v6BhhdKkRtLCybr -BqERhUpKwf0ZPyq6ZnfBqYECgYEAsiD2YcctvPVPtnyv/B02JTbvzwoB4kNntOgM -GkOgKe2Ro+gNIEq5T5uKKaELf9qNePeNu2jN0gPV6BI7YuNVzmRIE6ENOJfty573 -PVxm2/Nf5ORhatlt2MZC4aiDl4Xv4f/TNth/COBmgHbqngeZyOGHQBWiYQdqp2+9 -SFgSlAECgYEA1zLhxj6f+psM5Gpx56JJIEraHfyuyR1Oxii5mo7I3PLsbF/s6YDR -q9E64GoR5PdgCQlMm09f6wfT61NVwsYrbLlLET6tAiG0eNxXe71k1hUb6aa4DpNQ -IcS3E3hb5KREXUH5d+PKeD2qrf52mtakjn9b2aH2rQw2e2YNkIDV+XA= ------END RSA PRIVATE KEY----- diff --git a/tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-1.json b/tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-1.json deleted file mode 100644 index ae9fe36e9..000000000 --- a/tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-1.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "etcd.local", - "hosts": [ - "m1.etcd.local", - "127.0.0.1", - "localhost" - ] -} diff --git a/tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-2.json b/tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-2.json deleted file mode 100644 index 5d938fb8a..000000000 --- a/tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-2.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "etcd.local", - "hosts": [ - "m2.etcd.local", - "127.0.0.1", - "localhost" - ] - } diff --git a/tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-3.json b/tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-3.json deleted file mode 100644 index 7b8ffcfae..000000000 --- a/tests/manual/docker-dns/certs-common-name-multi/server-ca-csr-3.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "etcd.local", - "hosts": [ - "m3.etcd.local", - "127.0.0.1", - "localhost" - ] - } diff --git a/tests/manual/docker-dns/certs-gateway/Procfile b/tests/manual/docker-dns/certs-gateway/Procfile deleted file mode 100644 index 47b2aeba2..000000000 --- a/tests/manual/docker-dns/certs-gateway/Procfile +++ /dev/null @@ -1,8 +0,0 @@ -# Use goreman to run `go get github.com/mattn/goreman` -etcd1: ./etcd --name m1 --data-dir /tmp/m1.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs-gateway/server.crt --peer-key-file=/certs-gateway/server.key.insecure --peer-trusted-ca-file=/certs-gateway/ca.crt --peer-client-cert-auth --cert-file=/certs-gateway/server.crt --key-file=/certs-gateway/server.key.insecure --trusted-ca-file=/certs-gateway/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd2: ./etcd --name m2 --data-dir /tmp/m2.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs-gateway/server.crt --peer-key-file=/certs-gateway/server.key.insecure --peer-trusted-ca-file=/certs-gateway/ca.crt --peer-client-cert-auth --cert-file=/certs-gateway/server.crt --key-file=/certs-gateway/server.key.insecure --trusted-ca-file=/certs-gateway/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd3: ./etcd --name m3 --data-dir /tmp/m3.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs-gateway/server.crt --peer-key-file=/certs-gateway/server.key.insecure --peer-trusted-ca-file=/certs-gateway/ca.crt --peer-client-cert-auth --cert-file=/certs-gateway/server.crt --key-file=/certs-gateway/server.key.insecure --trusted-ca-file=/certs-gateway/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -gateway: ./etcd gateway start --endpoints https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 --trusted-ca-file /certs-gateway/ca.crt --listen-addr 127.0.0.1:23790 diff --git a/tests/manual/docker-dns/certs-gateway/ca-csr.json b/tests/manual/docker-dns/certs-gateway/ca-csr.json deleted file mode 100644 index ecafabaad..000000000 --- a/tests/manual/docker-dns/certs-gateway/ca-csr.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "ca", - "ca": { - "expiry": "87600h" - } -} diff --git a/tests/manual/docker-dns/certs-gateway/ca.crt b/tests/manual/docker-dns/certs-gateway/ca.crt deleted file mode 100644 index 7e3814e92..000000000 --- a/tests/manual/docker-dns/certs-gateway/ca.crt +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDsTCCApmgAwIBAgIUClliB9ECLPuQpOrlqLkeI1ib7zYwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xNzEyMDExOTE3MDBaFw0yNzExMjkxOTE3 -MDBaMG8xDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTELMAkGA1UEAxMCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQCjClF0TCk2qrHUTjFgFv2jmV0yUqnP3SG/7eVCptcFKE7kcGAx+j06GfEP -UXmCV13cgE0dYYLtz7/g29BiZzlBLlLsmpBMM+S4nfVH9BGLbKCSnwp5ba816AuS -rc8+qmJ0fAo56snLQWoAlnZxZ1tVjAtj5ZrQP9QDK2djgyviPS4kqWQ7Ulbeqgs7 -rGz56xAsyMTWYlotgZTnnZ3Pckr1FHXhwkO1rFK5+oMZPh2HhvXL9wv0/TMAypUv -oQqDzUfUvYeaKr6qy1ADc53SQjqeTXg0jOShmnWM2zC7MwX+VPh+6ZApk3NLXwgv -6wT0U1tNfvctp8JvC7FqqCEny9hdAgMBAAGjRTBDMA4GA1UdDwEB/wQEAwIBBjAS -BgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBQWI6eUGqKWkCjOKGAYd+5K6eh5 -GTANBgkqhkiG9w0BAQsFAAOCAQEAS3nIyLoGMsioLb89T1KMq+0NDDCx7R20EguT -qUvFUYKjzdxDA1RlZ2HzPxBJRwBc0Vf98pNtkWCkwUl5hxthndNQo7F9lLs/zNzp -bL4agho6kadIbcb4v/3g9XPSzqJ/ysfrwxZoBd7D+0PVGJjRTIJiN83Kt68IMx2b -8mFEBiMZiSJW+sRuKXMSJsubJE3QRn862y2ktq/lEJyYR6zC0MOeYR6BPIs/B6vU -8/iUbyk5ULc7NzWGytC+QKC3O9RTuA8MGF1aFaNSK7wDyrAlBZdxjWi52Mz3lJCK -ffBaVfvG55WKjwAqgNU17jK/Rxw1ev9mp4aCkXkD0KUTGLcoZw== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns/certs-gateway/gencert.json b/tests/manual/docker-dns/certs-gateway/gencert.json deleted file mode 100644 index 09b67267b..000000000 --- a/tests/manual/docker-dns/certs-gateway/gencert.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "signing": { - "default": { - "usages": [ - "signing", - "key encipherment", - "server auth", - "client auth" - ], - "expiry": "87600h" - } - } -} diff --git a/tests/manual/docker-dns/certs-gateway/gencerts.sh b/tests/manual/docker-dns/certs-gateway/gencerts.sh deleted file mode 100755 index af8663e09..000000000 --- a/tests/manual/docker-dns/certs-gateway/gencerts.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -if ! [[ "$0" =~ "./gencerts.sh" ]]; then - echo "must be run from 'fixtures'" - exit 255 -fi - -if ! which cfssl; then - echo "cfssl is not installed" - exit 255 -fi - -cfssl gencert --initca=true ./ca-csr.json | cfssljson --bare ./ca -mv ca.pem ca.crt -openssl x509 -in ca.crt -noout -text - -# generate wildcard certificates DNS: *.etcd.local -cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr.json | cfssljson --bare ./server -mv server.pem server.crt -mv server-key.pem server.key.insecure - -rm -f *.csr *.pem *.stderr *.txt diff --git a/tests/manual/docker-dns/certs-gateway/run.sh b/tests/manual/docker-dns/certs-gateway/run.sh deleted file mode 100755 index 3110f3b46..000000000 --- a/tests/manual/docker-dns/certs-gateway/run.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -rm -rf /tmp/m1.data /tmp/m2.data /tmp/m3.data - -/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 /certs-gateway/Procfile start & - -# TODO: remove random sleeps -sleep 7s - -./etcdctl \ - --cacert=/certs-gateway/ca.crt \ - --cert=/certs-gateway/server.crt \ - --key=/certs-gateway/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379 \ - endpoint health --cluster - -./etcdctl \ - --cacert=/certs-gateway/ca.crt \ - --cert=/certs-gateway/server.crt \ - --key=/certs-gateway/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - put abc def - -./etcdctl \ - --cacert=/certs-gateway/ca.crt \ - --cert=/certs-gateway/server.crt \ - --key=/certs-gateway/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - get abc - -./etcdctl \ - --cacert=/certs-gateway/ca.crt \ - --cert=/certs-gateway/server.crt \ - --key=/certs-gateway/server.key.insecure \ - --endpoints=127.0.0.1:23790 \ - put ghi jkl - -./etcdctl \ - --cacert=/certs-gateway/ca.crt \ - --cert=/certs-gateway/server.crt \ - --key=/certs-gateway/server.key.insecure \ - --endpoints=127.0.0.1:23790 \ - get ghi diff --git a/tests/manual/docker-dns/certs-gateway/server-ca-csr.json b/tests/manual/docker-dns/certs-gateway/server-ca-csr.json deleted file mode 100644 index 77cdb408c..000000000 --- a/tests/manual/docker-dns/certs-gateway/server-ca-csr.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "hosts": [ - "m1.etcd.local", - "m2.etcd.local", - "m3.etcd.local", - "127.0.0.1", - "localhost" - ] -} diff --git a/tests/manual/docker-dns/certs-gateway/server.crt b/tests/manual/docker-dns/certs-gateway/server.crt deleted file mode 100644 index 688a5afe6..000000000 --- a/tests/manual/docker-dns/certs-gateway/server.crt +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEKTCCAxGgAwIBAgIUDOkW+H3KLeHEwsovqOUMKKfEuqQwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xNzEyMDExOTE3MDBaFw0yNzExMjkxOTE3 -MDBaMGIxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANfu298kCxFY -KXAmdG5BeqnFoezAJQCtgv+ZRS0+OB4hVsahnNSsztEfIJnVSvYJTr1u+TGSbzBZ -q85ua3S92Mzo/71yoDlFjj1JfBmPdL1Ij1256LAwUYoPXgcACyiKpI1DnTlhwTvU -G41teQBo+u4sxr9beuNpLlehVbknH9JkTNaTbF9/B5hy5hQPomGvzPzzBNAfrb2B -EyqabnzoX4qv6cMsQSJrcOYQ8znnTPWa5WFP8rWujsvxOUjxikQn8d7lkzy+PHwq -zx69L9VzdoWyJgQ3m73SIMTgP+HL+OsxDfmbu++Ds+2i2Dgf/vdJku/rP+Wka7vn -yCM807xi96kCAwEAAaOByTCBxjAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI -KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFAH+dsuv -L6qvUmB/w9eKl83+MGTtMB8GA1UdIwQYMBaAFBYjp5QaopaQKM4oYBh37krp6HkZ -MEcGA1UdEQRAMD6CDW0xLmV0Y2QubG9jYWyCDW0yLmV0Y2QubG9jYWyCDW0zLmV0 -Y2QubG9jYWyCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAQEAh049 -srxFkiH9Lp8le3fJkuY25T/MUrmfa10RdNSKgj3qcpCMnf9nQjIWtaQsjoZJ5MQc -VIT3gWDWK8SWlpx+O2cVEQDG0ccv7gc38YGywVhMoQ5HthTAjLCbNk4TdKJOIk7D -hmfs7BHDvjRPi38CFklLzdUQaVCcvB43TNA3Y9M75oP/UGOSe3lJz1KKXOI/t+vA -5U3yxwXlVNJVsZgeWAbXN9F6WbCZDsz+4Obpk/LV1NLqgLd/hHXzoOOWNw977S2b -+dOd95OJ/cq09OzKn/g26NgtHOl0xqol7wIwqJhweEEiVueyFxXD04jcsxdAFZSJ -9H6q3inNQaLyJHSYWQ== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns/certs-gateway/server.key.insecure b/tests/manual/docker-dns/certs-gateway/server.key.insecure deleted file mode 100644 index 6c0c16c0b..000000000 --- a/tests/manual/docker-dns/certs-gateway/server.key.insecure +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA1+7b3yQLEVgpcCZ0bkF6qcWh7MAlAK2C/5lFLT44HiFWxqGc -1KzO0R8gmdVK9glOvW75MZJvMFmrzm5rdL3YzOj/vXKgOUWOPUl8GY90vUiPXbno -sDBRig9eBwALKIqkjUOdOWHBO9QbjW15AGj67izGv1t642kuV6FVuScf0mRM1pNs -X38HmHLmFA+iYa/M/PME0B+tvYETKppufOhfiq/pwyxBImtw5hDzOedM9ZrlYU/y -ta6Oy/E5SPGKRCfx3uWTPL48fCrPHr0v1XN2hbImBDebvdIgxOA/4cv46zEN+Zu7 -74Oz7aLYOB/+90mS7+s/5aRru+fIIzzTvGL3qQIDAQABAoIBABO8azA79R8Ctdbg -TOf+6B04SRKAhWFIep6t/ZqjAzINzgadot31ZXnLpIkq640NULsTt4cGYU9EAuX9 -RakH6RbhfO5t2aMiblu/qa4UZJEgXqosYc4ovGsn+GofYOW1tlCLC4XBH44+Vr5Y -cSTOc5DtWsUGsXazmF6+Cj3AC7KI+VWegHexGezyO0not8Q5L55TuH2lCW4sx9th -W4Q7jg2lrCvz4x8ZRIAXOGmBaDTZmMtVlEjezu+7xr8QDQsvUwj7a87HPjgXFesj -CbbCr8kaqEdZ23AVDZuLAKS4hWQlbacRhRAxMkomZkg5U6J/PC3ikIqfOda1zu1D -MTIOuwECgYEA8hFkISWVEzbaIZgO1BZl36wNaOLYIpX0CzlycptcEssbefLy7Nxo -TZ+m9AjF6TBPl4fO4edo00iiJMy6ZdhItduNWLO+usJEY9UdzHex7fCUeG8usUXQ -g4VGEvPGg88VEM45pkAgbga7kzkG2Ihfu6La5apbXeOpNpuC58DdlzkCgYEA5Fxl -/qGzLlTwioaaE+qpEX46MfbJl38nkeSf9B7J1ISc/fnDPcBPvcHaYELqyHM+7OFa -Gt9oBDrLgyP4ZgOTaHKHdofXjAMC97b9oa/Lrors5dMrf/fxTTe2X+Kab94E1Wbo -39kA3qzV/CT7EZWuqbHO3Bqkv/qe6ks0Tbahc/ECgYBuB2OpAWkyc6NQ08ohsxCZ -S55Ix5uQlPJ5y6Hu4BlI3ZNeqgSrjz/F0MTVdctnxDLZYLyzyDjImOJCseAj/NyH -9QTZhdIzF6x4aF2EG///dHQ4Del+YIp3zbNdV/sq3Izpt6NSoyFagarvL2OiNtK0 -+kBfVkDze1Dl5mfpKaxPWQKBgQC+gXqxJxKE92VIGyxUqzHqHwTLg9b/ZJuNMU5j -aH/1o8AYfJFtZY7gfeUA4zJckRAQq5rwyilLRgVbXNmvuRHzU4BA2OhvrF+Aag9D -IJXqAYnJ3RXwBtcuFOk3KqKt6mjb4qMpgy4flc5aMDunmtiARo6MvklswtZqHN0A -a/ha8QKBgQCqF/xCf5ORzVkikYYGsO910QXlzsyPdRJbhrBCRTsdhz/paT5GQQXr -y3ToUuKEoHfjFudUeGNOstjchWw+WgT9iqMJhtwV1nU1lkPyjmCQ2ONIP+13dZ+i -I/LDyMngtOKzvD5qpswY1Er+84+RVrtseQjXDC2NlrvDr5LnZDtGag== ------END RSA PRIVATE KEY----- diff --git a/tests/manual/docker-dns/certs-san-dns/Procfile b/tests/manual/docker-dns/certs-san-dns/Procfile deleted file mode 100644 index 32298f8cb..000000000 --- a/tests/manual/docker-dns/certs-san-dns/Procfile +++ /dev/null @@ -1,6 +0,0 @@ -# Use goreman to run `go get github.com/mattn/goreman` -etcd1: ./etcd --name m1 --data-dir /tmp/m1.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs-san-dns/server-1.crt --peer-key-file=/certs-san-dns/server-1.key.insecure --peer-trusted-ca-file=/certs-san-dns/ca.crt --peer-client-cert-auth --peer-cert-allowed-cn etcd.local --cert-file=/certs-san-dns/server-1.crt --key-file=/certs-san-dns/server-1.key.insecure --trusted-ca-file=/certs-san-dns/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd2: ./etcd --name m2 --data-dir /tmp/m2.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs-san-dns/server-2.crt --peer-key-file=/certs-san-dns/server-2.key.insecure --peer-trusted-ca-file=/certs-san-dns/ca.crt --peer-client-cert-auth --peer-cert-allowed-cn etcd.local --cert-file=/certs-san-dns/server-2.crt --key-file=/certs-san-dns/server-2.key.insecure --trusted-ca-file=/certs-san-dns/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd3: ./etcd --name m3 --data-dir /tmp/m3.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs-san-dns/server-3.crt --peer-key-file=/certs-san-dns/server-3.key.insecure --peer-trusted-ca-file=/certs-san-dns/ca.crt --peer-client-cert-auth --peer-cert-allowed-cn etcd.local --cert-file=/certs-san-dns/server-3.crt --key-file=/certs-san-dns/server-3.key.insecure --trusted-ca-file=/certs-san-dns/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr \ No newline at end of file diff --git a/tests/manual/docker-dns/certs-san-dns/ca-csr.json b/tests/manual/docker-dns/certs-san-dns/ca-csr.json deleted file mode 100644 index ecafabaad..000000000 --- a/tests/manual/docker-dns/certs-san-dns/ca-csr.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "ca", - "ca": { - "expiry": "87600h" - } -} diff --git a/tests/manual/docker-dns/certs-san-dns/ca.crt b/tests/manual/docker-dns/certs-san-dns/ca.crt deleted file mode 100644 index 2eaf8172c..000000000 --- a/tests/manual/docker-dns/certs-san-dns/ca.crt +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDrjCCApagAwIBAgIUV77P/m6U+QIMz7Ql0Q6xC3GO/fAwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xOTEwMDcyMjIyMDBaFw0yOTEwMDQyMjIy -MDBaMG8xDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTELMAkGA1UEAxMCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQDEN9lZnkS16bi42zl+iGlYSHGJn0uxiqhff1KRJlwbEBXr3ywllJLgnAA3 -XEQsBMYk0yEB82380flVJd6UMt+0n6bo5Mp2Z+X8eXZgVgB4uLz0APRhozO89I2D -wk74aTrV3wseCmN9ZOvG+2b1AzM6rwwnozhnoC2qlZ5yNZRSKMTRX+ZcDQ6FQopk -Kg+ACGyiU94bLJkd4Vj7oSOiParjtj1laGE88QAL8clkcT6enHlwVJDs7BF3SRBI -sBKlUnyC47mjR4v9KKkeZ7LHBcW9D7FZZYNg85mubVHfj8rZb1EAF+Kqskd6YpYz -ZezQVdJOyUrp8/+mSBaS2HpF4HjpAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP -BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTr390x+ChxCV+AkCnxh+5vgtoiyTAN -BgkqhkiG9w0BAQsFAAOCAQEAq+o4uF9xkJ/SzGgBePb3r/F0aNcBIY3XmCsGE4gd -0U/tqkGP10BKlermi87ADLxjBux+2n6eAHycac9mDynOr1d5GUVHK8BrAzKeabuP -Q8J2NQyVXpRF9z2EolLpw7J1n5CYJqsVMBjov33AKk9SmCFg3O4wD6oladWXT/Ie -ld2+EUS6TLzPNsU+AoPx64L0Aru05ynpPnlUB+DSXCBUckffmGgv0HEd5bU3QOl4 -9SUx35lk8nh7x+sHQblijuNNLi7bTIhzQTolJTCo3rd8YgSdnof0z5bROVTwymD5 -tWshIE4BP+ri+1NPKCe2KlcP3MIynKtx+obr5cLZjDHWoA== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns/certs-san-dns/gencert.json b/tests/manual/docker-dns/certs-san-dns/gencert.json deleted file mode 100644 index 09b67267b..000000000 --- a/tests/manual/docker-dns/certs-san-dns/gencert.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "signing": { - "default": { - "usages": [ - "signing", - "key encipherment", - "server auth", - "client auth" - ], - "expiry": "87600h" - } - } -} diff --git a/tests/manual/docker-dns/certs-san-dns/gencerts.sh b/tests/manual/docker-dns/certs-san-dns/gencerts.sh deleted file mode 100755 index b2318fd08..000000000 --- a/tests/manual/docker-dns/certs-san-dns/gencerts.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -if ! [[ "$0" =~ "./gencerts.sh" ]]; then - echo "must be run from 'fixtures'" - exit 255 -fi - -if ! which cfssl; then - echo "cfssl is not installed" - exit 255 -fi - -cfssl gencert --initca=true ./ca-csr.json | cfssljson --bare ./ca -mv ca.pem ca.crt -openssl x509 -in ca.crt -noout -text - -# generate wildcard certificates DNS: m1/m2/m3.etcd.local -cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr-1.json | cfssljson --bare ./server-1 -mv server-1.pem server-1.crt -mv server-1-key.pem server-1.key.insecure - -cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr-2.json | cfssljson --bare ./server-2 -mv server-2.pem server-2.crt -mv server-2-key.pem server-2.key.insecure - -cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr-3.json | cfssljson --bare ./server-3 -mv server-3.pem server-3.crt -mv server-3-key.pem server-3.key.insecure - -rm -f *.csr *.pem *.stderr *.txt diff --git a/tests/manual/docker-dns/certs-san-dns/run.sh b/tests/manual/docker-dns/certs-san-dns/run.sh deleted file mode 100755 index f4227c58e..000000000 --- a/tests/manual/docker-dns/certs-san-dns/run.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -rm -rf /tmp/m1.data /tmp/m2.data /tmp/m3.data - -/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 -echo "127.0.0.1 m1.etcd.local" >> /etc/hosts -echo "127.0.0.1 m2.etcd.local" >> /etc/hosts -echo "127.0.0.1 m3.etcd.local" >> /etc/hosts - -goreman -f /certs-san-dns/Procfile start & -# TODO: remove random sleeps -sleep 7s - -./etcdctl \ - --cacert=/certs-san-dns/ca.crt \ - --cert=/certs-san-dns/server-1.crt \ - --key=/certs-san-dns/server-1.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - endpoint health --cluster - -printf "\nPut abc \n" -./etcdctl \ - --cacert=/certs-san-dns/ca.crt \ - --cert=/certs-san-dns/server-2.crt \ - --key=/certs-san-dns/server-2.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - put abc def - -printf "\nGet abc \n" -./etcdctl \ - --cacert=/certs-san-dns/ca.crt \ - --cert=/certs-san-dns/server-3.crt \ - --key=/certs-san-dns/server-3.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - get abc - -printf "\nKill etcd server 1...\n" -kill $(lsof -t -i:2379) -sleep 7s - -printf "\nGet abc after killing server 1\n" -./etcdctl \ - --cacert=/certs-san-dns/ca.crt \ - --cert=/certs-san-dns/server-2.crt \ - --key=/certs-san-dns/server-2.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - get abc -printf "\n\nDone!!!\n\n" - diff --git a/tests/manual/docker-dns/certs-san-dns/server-1.crt b/tests/manual/docker-dns/certs-san-dns/server-1.crt deleted file mode 100644 index c99fef834..000000000 --- a/tests/manual/docker-dns/certs-san-dns/server-1.crt +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEDzCCAvegAwIBAgIUYSODFGYUNAEskvyamAAxpZ8/86swDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xOTEwMDcyMjIyMDBaFw0yOTEwMDQyMjIy -MDBaMHcxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTETMBEGA1UEAxMKZXRjZC5sb2NhbDCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBAMNEq66ZcntXibYne3W9L53JyMmGrJJi2FbVAEv76OraVnO5 -7qJNXjXZ3bOhQ3WDawbWBA5lNi1mwZcKVxM41PQXpez/6/ZkZliwNQFsDZ3WgPIx -mfcWWnoVPEKFrJTnKZm5/o+50w07yMGZLCgIS66oIcOGJ3G35/NKm+T94yKnRV2m -M1YvkmgU69MwQwbvGh1fypKB734wVp9Yz46FTuAoY8I63feYrSHKHXZf70rm3Kqm -iTU3jixWq86aI1dIRbAqObc5pgSoBwAczLjWvhhcO7n9KRkyzxjg+ZFPwRHiBWi1 -ZU70D4XHZMdcAgu+2/IBXfGBZbKOyq9WN65N9tUCAwEAAaOBmjCBlzAOBgNVHQ8B -Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB -/wQCMAAwHQYDVR0OBBYEFJzBC8YE22RmOwKyxnH0SPC08zE4MB8GA1UdIwQYMBaA -FOvf3TH4KHEJX4CQKfGH7m+C2iLJMBgGA1UdEQQRMA+CDW0xLmV0Y2QubG9jYWww -DQYJKoZIhvcNAQELBQADggEBAKvIARZDTNcGAcu5SkrjB/mWlq7GaLqgnGARvMQ0 -O5IC6hPsOcIsTnGKzert2xkc6y7msYMOl4ddP5PgSIfpCtkmL6bACoros4ViWwl5 -Lg0YF3PQvwSL+h2StTE2pGrNp/eQL8HJD2Lhyac2vTAq01Vbh3ySrfQP9zjoH8U7 -+mJJk9VWAagU+ww17kq5VZL9iJnlFSxVLNo6dcNo/dU6eWqKWoZjAHl+/zhoSOuZ -tBRshTcFuLbBe59ULFoZ+Mt5Sa4+OuN5Jir4hQH6DS1ETd7hwsSvHf6KcIw9fIXz -h+PZ0ssNDq4Yr7i3dQS5xAQO1aO35Ru9q2ABt20E1dQGIyY= ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns/certs-san-dns/server-1.key.insecure b/tests/manual/docker-dns/certs-san-dns/server-1.key.insecure deleted file mode 100644 index 575ee5e82..000000000 --- a/tests/manual/docker-dns/certs-san-dns/server-1.key.insecure +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEAw0Srrplye1eJtid7db0vncnIyYaskmLYVtUAS/vo6tpWc7nu -ok1eNdnds6FDdYNrBtYEDmU2LWbBlwpXEzjU9Bel7P/r9mRmWLA1AWwNndaA8jGZ -9xZaehU8QoWslOcpmbn+j7nTDTvIwZksKAhLrqghw4Yncbfn80qb5P3jIqdFXaYz -Vi+SaBTr0zBDBu8aHV/KkoHvfjBWn1jPjoVO4Chjwjrd95itIcoddl/vSubcqqaJ -NTeOLFarzpojV0hFsCo5tzmmBKgHABzMuNa+GFw7uf0pGTLPGOD5kU/BEeIFaLVl -TvQPhcdkx1wCC77b8gFd8YFlso7Kr1Y3rk321QIDAQABAoIBAQCl3c4LqNKDDQ+w -SAdqMsKgwIerD5fFXOsxjwsKgDgQTljDQrv+58NP8PmOnTxFNNWT3/VgGP8VP8TP -vPvMGylhEjligN151TzOtxa/V36VhWDQ2etT5IwEScd/Jjc74MQIjeI7SfiJtC/K -q4bDlpBbEvxjLrCQu0vu8IBN2o+2nWx8l7Jy0VrDuw5LQM90ZA7OcU7H2kE1ehbp -M5waHE0tdgHzlLqrVl0RlXh/FlIG7/cfQRL1rpD5T8llD7XshF2BhtXerk+QtC9b -It8xGnhd6e9Yk96KIN/3U/W5DORYwtq1r54r1OxZkUX3C0RqU2P3EcNvBHbbZydm -6xq6EfDBAoGBAM3LIHo4v96YPNHtj+GI9ZRr+o9UMrl3dcRTMkbEjFIqBdON8GrS -fdLSvZms+wqU8v7gNEZhhk7U9Y71pHUZsN5WAGHMCC6Q6/5lY2ObEEitrV7btrUe -75JNlSq52JT7L9NZRhD5ACqw9qrdUq0mNyPtrSV/J2DfubuBWcSLf58lAoGBAPLo -MGLyzuG5WTwPAkcB/T3Z5kNFlr8po9tuso5WDuXws7nIPR8yb6UIvP7JqWOgaHyh -YBA4aKC1T8gpAwVxZxJ9bbntxt13sxyuMZgA/CGn6FXCPbhAztnQDle81QcsMGXK -y2YbeMUVuMrowcjK6g8J9E9AkB4SDvme+xhEQgHxAoGBAIxtzRa5/Ov3dKFH+8PK -QtJqMIt3yDlZNEqo/wjdfGdg96LaG7G5O1UOq4TfTlt1MrAL7IAOcqj+lyZbp0Kl -KlU92Hrj0L199RwesYi5uo3tvf2Z7n5/wrlSKbUDJrDbC1Kse6x/TcbUBS6pYo53 -Im9o85s/vm5TnJk/9jKxgn/lAoGAVUbutc5IkzZe/ZbHVeZ84Zn+HN/xbGtR+1eB -mDbeRBuc/TwvOSSbzXSj5U8nCLLn+9krwIYNNV5yA/Nh/Ccz6Gnge8XeayH637bH -8nVmDurDxlfLE0StWgqQ/nxszXfWBeaMQeyjGY3mslXEspmKUn1MKAaikewFFd2a -iYptIgECgYEAr81jSoXyHSKpEEHzy5hyH+JOsUeWZVFduqkTTHNZe7MlXSSSZdhW -6TCjnA9HpzBlgTI8PwXXKEa2G7OCr4dHFBJSWCgzQTfd1hf5xiE7ca2bxiEC7SKF -H3TvfLCi9Dky9uFAXsp6SlI/x6Abm6CpqTlR19KyCo64LztaAmRkmNU= ------END RSA PRIVATE KEY----- diff --git a/tests/manual/docker-dns/certs-san-dns/server-2.crt b/tests/manual/docker-dns/certs-san-dns/server-2.crt deleted file mode 100644 index 9c15aa05b..000000000 --- a/tests/manual/docker-dns/certs-san-dns/server-2.crt +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEDzCCAvegAwIBAgIUDrW+8pB5rh4jfT8GQ3R9EqRLuzkwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xOTEwMDcyMjIyMDBaFw0yOTEwMDQyMjIy -MDBaMHcxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTETMBEGA1UEAxMKZXRjZC5sb2NhbDCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBANHtpC3LDlC1MqHx/LT6vWA9DJApziy9Vh0f0SC1hFjRiFGp -yA8d4uWHg7ebEVj/hWyJPrYpNMSDXhmJVa8UtE6G3B2ZS4WZsjfKMYs0ydu8mjjV -FlfC6vuDGX3gUdI7XhW1KCmnFI0XfRaskS/khY31SMyblAZ0hDpRz/nQ3vyMSS7+ -xYgPn7SHNrJFz8+K3NB35lbvkBvYZvVJ0mONeIMB1BffHILzexiaXyHXeKTPw9yI -FSRTDlXQqY9afNpAAv12xW2Xa9chuQ5Q+5P8syRqePgjR+TVJkeUCpLunNHcxZTD -DoXqJjOlqy6OzdFGnGzvtDh/1/QL880/e6jOCcUCAwEAAaOBmjCBlzAOBgNVHQ8B -Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB -/wQCMAAwHQYDVR0OBBYEFNoiUFY7gFUJUtJpBXFVIFipiFo/MB8GA1UdIwQYMBaA -FOvf3TH4KHEJX4CQKfGH7m+C2iLJMBgGA1UdEQQRMA+CDW0yLmV0Y2QubG9jYWww -DQYJKoZIhvcNAQELBQADggEBAGUisaOqg4ps1XTqRnqnk/zajC0MeyayE4X2VLtO -gq04wT7N9nUmFAiL2uUBzK4IKrb68ZIGQbm/3NNJrKxauWvK79J9xbeOAnOQWIAx -VFA7uGw0JpiYFk6W9YzTCpNlIWEOEw5RaNIj8F5dAFqgqNDqd1zw1+04jIGlBTpD -v3LQjr8IvB/cmvnugwAnb8cKDlr1GO322/1otrJi2BpmjAi4FQmuxdyQTmgkQU7T -k2whauuwDrwVmc+LyoObbiiaJPi60lSABIttbUmFqWo9U+mBcbAtFE6EW6Wo1gFR -q7uKqwYjARW/h/amHhyiHkNnu+TjY1SL2+kk+EBAt0SSmq8= ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns/certs-san-dns/server-2.key.insecure b/tests/manual/docker-dns/certs-san-dns/server-2.key.insecure deleted file mode 100644 index 131ea6f4b..000000000 --- a/tests/manual/docker-dns/certs-san-dns/server-2.key.insecure +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA0e2kLcsOULUyofH8tPq9YD0MkCnOLL1WHR/RILWEWNGIUanI -Dx3i5YeDt5sRWP+FbIk+tik0xINeGYlVrxS0TobcHZlLhZmyN8oxizTJ27yaONUW -V8Lq+4MZfeBR0jteFbUoKacUjRd9FqyRL+SFjfVIzJuUBnSEOlHP+dDe/IxJLv7F -iA+ftIc2skXPz4rc0HfmVu+QG9hm9UnSY414gwHUF98cgvN7GJpfIdd4pM/D3IgV -JFMOVdCpj1p82kAC/XbFbZdr1yG5DlD7k/yzJGp4+CNH5NUmR5QKku6c0dzFlMMO -heomM6WrLo7N0UacbO+0OH/X9AvzzT97qM4JxQIDAQABAoIBAQCYEZ9mlLsv97JP -4a1/pErelhqtq7rwac8hldS17weKF266SVTkrm+YeYwOysPMRnzuXJUS+9J/r/HQ -ac2p4EOkxshYoJ02kFmrVEqDXqADDyJgnOtsc4Qo4ZTrvD1JHzxOWUZYtfGLK0Kv -1B3wJYghh1dO8DxQWMMYQ/92JboCEoVmO/vAcUH5V4qhZMEGvFm8AiaXnVi13myt -OAlfyQQ1CsnOoxxQhomzqNVrMjPelv5yLAq1Z5gXSeylc6y8NVWKsLbWJUj5IhqH -bmCw2V/1snJCJews/S/4wgDBibjldlUEPfjNwBoeRTl9DB6uCHzUiF98PB8MoDx5 -VaJiRHZZAoGBAOqVcgB+3gJ9Pf+6bUdL4NhKdr4wje2IAbeidQMXOsbp455b7NLj -/Z92tKOGJ2HBdGBzGkA4JbHcy/HBxDm6DXKWIIqYcOubDDDiBAYtEJhLG3Mqz4p8 -sp1QUICQoskCAP4gHc8/AeXKp1CQoU1dJksC4mZ66KQMdYaJ1f7gNxJ7AoGBAOUX -9mLDFjqpJ7IPt02I4yn/tlFI3GLwuO/yxEuCGt8T2CAXkc/cp+ojEI29ckwYpqv6 -D+FRPYqNN+c6OJWAR4U4OiuRQlShGZmBvn11BIn7ILZ3KnxvFXKkOzzFNU5oYczE -/L/z2SSKQfGlgDWmKWIoWt5D3TjMA7xysTgQIcC/AoGAFgyV+pXyKCm9ehv7yYfI -Sow1PQszS/BMuQX8GZ5FWA0D6A6b4/aqECMIN5aUfQvB9I7dGMwuPtmSEdc0qnhi -azLRPDW3521bZ/zWg/4YYTguDFUpzMqLv12dM3hk1J/rl/dM1f4GH6M8tsXhY3Qt -9T8AKMHEvCavpUWvZ5WLl6ECgYAgxmzZdE+Z1Nl5AAaZcRwOxiavOl1NSmMq8PBk -XRi7EXu6G6Ugt9DODnYv0QqpGF2//OaItba4O7vjuNCfktqolIK9+OokcWfYLley -WytrEiJ7+FB7vOi0ngpbh1s4/HYBda0zSQ+nyp/kkmjlRABnqp5VbiAYIBfovf/c -pXIuwQKBgQCGJBX7vmFcsL1qdG5d8jQr2K/dbTcU8sXQzUIXGQcCxePYOrO8Rcn2 -EMXAGIdOn6i2x0/rNn+EnPHhT6XC0hSOu52srL8BB9tbDYk3i+3ghUG5QI4dp+GQ -D1+HZD3SVrqjWlTU0aBB/NYMldIo9e3LU1ZUXTm2Rmg6Mre9ann6/w== ------END RSA PRIVATE KEY----- diff --git a/tests/manual/docker-dns/certs-san-dns/server-3.crt b/tests/manual/docker-dns/certs-san-dns/server-3.crt deleted file mode 100644 index 3fb516db9..000000000 --- a/tests/manual/docker-dns/certs-san-dns/server-3.crt +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEDzCCAvegAwIBAgIUNPjXxMAkrxdr1sZA7Gw+gYbVeLAwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xOTEwMDcyMjIyMDBaFw0yOTEwMDQyMjIy -MDBaMHcxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTETMBEGA1UEAxMKZXRjZC5sb2NhbDCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBALwQOtWoCcO13D/7i96Bkb376WvoqYJw+yN9kYwVkpM1+EQd -3hzSNT0byRGeNtlXAd8tY/SpjTM7mnq5yIhNjhJ2eo5GO1YuJyDJe9WnfQ30rVfv -WzCV/BiwloaqX/tlgCJ3PVNAZdyCZ+ouRIggBUHCQo88LuKwpM9QrUmBCGFLD/M2 -PYKewGv+h9JwMRLxp5mARBS+bkUsQy9F7U/GZs/9xULXIo9l3Bj8Zqz6UMmtW+Y2 -lkK5wawG04bZwkr8lUzMC2AVKFidTuZsda9GP4OxKclW0ro0HtlYaiI7+a0xONZ6 -yuj4cYrs1KZ9z3uYji1Li8XFUb4g/v9dar0oK70CAwEAAaOBmjCBlzAOBgNVHQ8B -Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB -/wQCMAAwHQYDVR0OBBYEFATpeRk6Bxgf8LHU/wlw0iLQltEoMB8GA1UdIwQYMBaA -FOvf3TH4KHEJX4CQKfGH7m+C2iLJMBgGA1UdEQQRMA+CDW0zLmV0Y2QubG9jYWww -DQYJKoZIhvcNAQELBQADggEBADjH3ytTogX2BqnhYaVia31Zjy240iViU6BNCARq -PdBB5WCtti7yzonfS9Uytc9YLB4ln4Z0wZpRk3O0QGehHX5CDT5EL5zKwDQdoYG3 -oKx9qOu2VyxDA/1hYdPvMW3aq4g/oE8nFjNbrFEVCuGLbJdfDnyJJFsvNRNqs8hS -xpfYLNH9lD4sD13vul7RJQJrvCjbaqQp9oLe9NZ9f+cBPGqATkicMWbABq4xbpCE -IY19SHk0WHRSem5jlbfF3O58Ow+LRR/Bn2/IYKpyidEixxu9VX06BDRH5GmG7wBd -5Y9YhmeyPCXiHHPar7m/Rmel82RLI+/qomKh9pii3u357yY= ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns/certs-san-dns/server-3.key.insecure b/tests/manual/docker-dns/certs-san-dns/server-3.key.insecure deleted file mode 100644 index b64e3bad3..000000000 --- a/tests/manual/docker-dns/certs-san-dns/server-3.key.insecure +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAvBA61agJw7XcP/uL3oGRvfvpa+ipgnD7I32RjBWSkzX4RB3e -HNI1PRvJEZ422VcB3y1j9KmNMzuaernIiE2OEnZ6jkY7Vi4nIMl71ad9DfStV+9b -MJX8GLCWhqpf+2WAInc9U0Bl3IJn6i5EiCAFQcJCjzwu4rCkz1CtSYEIYUsP8zY9 -gp7Aa/6H0nAxEvGnmYBEFL5uRSxDL0XtT8Zmz/3FQtcij2XcGPxmrPpQya1b5jaW -QrnBrAbThtnCSvyVTMwLYBUoWJ1O5mx1r0Y/g7EpyVbSujQe2VhqIjv5rTE41nrK -6PhxiuzUpn3Pe5iOLUuLxcVRviD+/11qvSgrvQIDAQABAoIBAG1ny7JsFXIjpEQc -pJwHKLArkvnR2nsmGxPkgv3JtwGpDgsijQqbR5mLRofXUPVTZqVdFJ9K2/gIHrBy -0DRrWdFn15hZRz+1jdHHJSGAVIH/67AScSxstMHwSUGCcGAiBk8Gq0h5WEjWHHnh -/MBsUGKXDn2hd20tclOhDY6LYEKolRPFjfBmPRdhdR5A6RS+U+jx1yFsWa6cUjv6 -kInlE5yMdhEOuA/QnVvcaAsKb5CKAuCtAkmFH3fjDp3nkhYFXJy4DTsVRMAfsr5s -SpsKt272URd5fLeZ5QlOb82QCvJr9GushkkKk7N5TMh5C/r74zpROdLTRlXD4I2q -yvnSv8kCgYEA+HRjeRRxujVWo7YSnHYJ/xConrCSekfRMvIXvSq43E+I/t5SlPl8 -YoJYhGWzZ7A/szqTvTW/v2blScd+X4KiK0TX8tTQFvWEBBcZhLILUB/ZiIfi/6ZG -fxe+BAmTMSBThknnRsvAA4jkTvErdpBhhRltyjdLunEEjnfSzJJORHMCgYEAwcZU -TpAfo4ni1Am9Nskk/5LjmPX5u+qfPNJfe6dfO+BoMA51XuAagqZhdsSwTGoxs5xQ -cKmNFA6QmAQnPZK7+QYwmDUXb8/Dtz/d5jylsZdYRHYr4hx3DcKFFEyhlPqrj44k -HxparrkDIq7nVz1t3YMVXYJM/5k2cx/VHlTD8w8CgYEA6Ypl0nNwL4thpENKHT4r -SVG8XmY1WbHWKCA+Rjc5SwWMDZ6nW5dj3ykM0W7Tg5y9U9i09L7oPZ8X2hEmbdra -Wve8UWrPKzWe4UVhXEULs0Ys8VRiANKoI2EK4LqrXBs5x9oCBp8RH4F2semqZCl1 -MWpktBbkHR2NHenuARNpdJcCgYBzlY3sXuPAdRssR7Lp3wmGuWOxdefFQ6pAaWwz -Ih8YZD9Bix5PvXWSwRQZ+DEBI8cJ0A/bZAeXEykExFVz0Pb3D84kvGaCd3fS8vG1 -yC89w30POT3r3fbV6lXfSeaIKw3yz2KUeu/kkM9h/NpZm3bRTsOLx5GOVSG5gh9p -vD412QKBgFxq4rsxJC6+QZvRZaJDcmTHSytbAw3B5Lyv6G+xLBUqc27KjQzCved1 -9Ofzy7KEC3AtKiq3Y0q5q01Rzk5ZYCh6lVe2tw36Muw1bvZjqblGm9X2VRO8Ui2Q -4WOdvIP4z5ZTJQXdIahKAYOyxiYFIvCkvS5SYoKkgWNSzFNKvQtH ------END RSA PRIVATE KEY----- diff --git a/tests/manual/docker-dns/certs-san-dns/server-ca-csr-1.json b/tests/manual/docker-dns/certs-san-dns/server-ca-csr-1.json deleted file mode 100644 index 692735493..000000000 --- a/tests/manual/docker-dns/certs-san-dns/server-ca-csr-1.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "etcd.local", - "hosts": [ - "m1.etcd.local" - ] -} diff --git a/tests/manual/docker-dns/certs-san-dns/server-ca-csr-2.json b/tests/manual/docker-dns/certs-san-dns/server-ca-csr-2.json deleted file mode 100644 index 4e6debef1..000000000 --- a/tests/manual/docker-dns/certs-san-dns/server-ca-csr-2.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "etcd.local", - "hosts": [ - "m2.etcd.local" - ] - } diff --git a/tests/manual/docker-dns/certs-san-dns/server-ca-csr-3.json b/tests/manual/docker-dns/certs-san-dns/server-ca-csr-3.json deleted file mode 100644 index af67a615b..000000000 --- a/tests/manual/docker-dns/certs-san-dns/server-ca-csr-3.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "etcd.local", - "hosts": [ - "m3.etcd.local" - ] - } diff --git a/tests/manual/docker-dns/certs-wildcard/Procfile b/tests/manual/docker-dns/certs-wildcard/Procfile deleted file mode 100644 index d53a22a79..000000000 --- a/tests/manual/docker-dns/certs-wildcard/Procfile +++ /dev/null @@ -1,6 +0,0 @@ -# Use goreman to run `go get github.com/mattn/goreman` -etcd1: ./etcd --name m1 --data-dir /tmp/m1.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs-wildcard/server.crt --peer-key-file=/certs-wildcard/server.key.insecure --peer-trusted-ca-file=/certs-wildcard/ca.crt --peer-client-cert-auth --cert-file=/certs-wildcard/server.crt --key-file=/certs-wildcard/server.key.insecure --trusted-ca-file=/certs-wildcard/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd2: ./etcd --name m2 --data-dir /tmp/m2.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs-wildcard/server.crt --peer-key-file=/certs-wildcard/server.key.insecure --peer-trusted-ca-file=/certs-wildcard/ca.crt --peer-client-cert-auth --cert-file=/certs-wildcard/server.crt --key-file=/certs-wildcard/server.key.insecure --trusted-ca-file=/certs-wildcard/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd3: ./etcd --name m3 --data-dir /tmp/m3.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs-wildcard/server.crt --peer-key-file=/certs-wildcard/server.key.insecure --peer-trusted-ca-file=/certs-wildcard/ca.crt --peer-client-cert-auth --cert-file=/certs-wildcard/server.crt --key-file=/certs-wildcard/server.key.insecure --trusted-ca-file=/certs-wildcard/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr \ No newline at end of file diff --git a/tests/manual/docker-dns/certs-wildcard/ca-csr.json b/tests/manual/docker-dns/certs-wildcard/ca-csr.json deleted file mode 100644 index ecafabaad..000000000 --- a/tests/manual/docker-dns/certs-wildcard/ca-csr.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "ca", - "ca": { - "expiry": "87600h" - } -} diff --git a/tests/manual/docker-dns/certs-wildcard/ca.crt b/tests/manual/docker-dns/certs-wildcard/ca.crt deleted file mode 100644 index 23ee34f4a..000000000 --- a/tests/manual/docker-dns/certs-wildcard/ca.crt +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDsTCCApmgAwIBAgIUanA77pXfEz2idrPSlIoPrSo6MmcwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xNzExMTMwNDA5MDBaFw0yNzExMTEwNDA5 -MDBaMG8xDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTELMAkGA1UEAxMCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQDqtw5G6XZ4N2uuc7TAoiXI+IXA/H+IJIbHrVFQ3LIzLDaS6AmVWw4yT4o2 -X/1IbR5TU6dCnGxuHPutnfnG87is5Oxk1HfIy5cfpf75St3uQycJRcr3Bui/fEZ0 -IZaoRyklcYGI8Y+VfaSADl++EP7UU0X7cc263rZulJXkqp4HihDTPixBgVDruNWf -Yfa2K/Zhiq+zj3hE6s/cBn2pIdY6SMlQ1P0uT/Y5oBTTJFBxeqw+Sz/NXgKgErQg -Za/gNHQWzyRoYHiOGQylvsiXr6tgdk29f0Z6gTQy8FQpwOXYERJr45zh8KvE+FJK -MaWUhGW7hkv85JDZSsmDZ6lVYIfhAgMBAAGjRTBDMA4GA1UdDwEB/wQEAwIBBjAS -BgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBS+p7B3RLjI8HOOPvVhqtBQNRmH -ZTANBgkqhkiG9w0BAQsFAAOCAQEAFWHLvzzTRQJYjVDxBuXrNZkhFsGAoCYoXhAK -1nXmqLb9/dPMxjkB4ptkQNuP8cMCMPMlapoLkHxEihN1sWZwJRfWShRTK2cQ2kd6 -IKH/M3/ido1PqN/CxhfqvMj3ap3ZkV81nvwn3XhciCGca1CyLzij9RroO0Ee+R3h -mK5A38I1YeRMNOnNAJAW+5scaVtPe6famG2p/OcswobF+ojeZIQJcuk7/FP5iXGA -UfG5WaW3bVfSr5aUGtf/RYZvYu3kWZlAzGaey5iLutRc7f63Ma4jjEEauiGLqQ+6 -F17Feafs2ibRr1wes11O0B/9Ivx9qM/CFgEYhJfp/nBgY/UZXw== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns/certs-wildcard/gencert.json b/tests/manual/docker-dns/certs-wildcard/gencert.json deleted file mode 100644 index 09b67267b..000000000 --- a/tests/manual/docker-dns/certs-wildcard/gencert.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "signing": { - "default": { - "usages": [ - "signing", - "key encipherment", - "server auth", - "client auth" - ], - "expiry": "87600h" - } - } -} diff --git a/tests/manual/docker-dns/certs-wildcard/gencerts.sh b/tests/manual/docker-dns/certs-wildcard/gencerts.sh deleted file mode 100755 index af8663e09..000000000 --- a/tests/manual/docker-dns/certs-wildcard/gencerts.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -if ! [[ "$0" =~ "./gencerts.sh" ]]; then - echo "must be run from 'fixtures'" - exit 255 -fi - -if ! which cfssl; then - echo "cfssl is not installed" - exit 255 -fi - -cfssl gencert --initca=true ./ca-csr.json | cfssljson --bare ./ca -mv ca.pem ca.crt -openssl x509 -in ca.crt -noout -text - -# generate wildcard certificates DNS: *.etcd.local -cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr.json | cfssljson --bare ./server -mv server.pem server.crt -mv server-key.pem server.key.insecure - -rm -f *.csr *.pem *.stderr *.txt diff --git a/tests/manual/docker-dns/certs-wildcard/run.sh b/tests/manual/docker-dns/certs-wildcard/run.sh deleted file mode 100755 index f0374d909..000000000 --- a/tests/manual/docker-dns/certs-wildcard/run.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -rm -rf /tmp/m1.data /tmp/m2.data /tmp/m3.data - -/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 /certs-wildcard/Procfile start & - -# TODO: remove random sleeps -sleep 7s - -./etcdctl \ - --cacert=/certs-wildcard/ca.crt \ - --cert=/certs-wildcard/server.crt \ - --key=/certs-wildcard/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379 \ - endpoint health --cluster - -./etcdctl \ - --cacert=/certs-wildcard/ca.crt \ - --cert=/certs-wildcard/server.crt \ - --key=/certs-wildcard/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - put abc def - -./etcdctl \ - --cacert=/certs-wildcard/ca.crt \ - --cert=/certs-wildcard/server.crt \ - --key=/certs-wildcard/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - get abc diff --git a/tests/manual/docker-dns/certs-wildcard/server-ca-csr.json b/tests/manual/docker-dns/certs-wildcard/server-ca-csr.json deleted file mode 100644 index 616bf11f8..000000000 --- a/tests/manual/docker-dns/certs-wildcard/server-ca-csr.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "hosts": [ - "*.etcd.local", - "127.0.0.1", - "localhost" - ] -} diff --git a/tests/manual/docker-dns/certs-wildcard/server.crt b/tests/manual/docker-dns/certs-wildcard/server.crt deleted file mode 100644 index a51cd0b94..000000000 --- a/tests/manual/docker-dns/certs-wildcard/server.crt +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIECjCCAvKgAwIBAgIUQ0AgAKntDzHW4JxYheDkVMow5ykwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xNzExMTMwNDA5MDBaFw0yNzExMTEwNDA5 -MDBaMGIxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANMqNEozhdLm -K5ATSkgIOyQmBmoUCgiWB+P52YWzfmwaWwQP2FFs3qih2c3DHHH7s2zdceXKT2ZN -lvSO8yj08slLPYSC4LQ3su8njGJlasJ28JMjRqshnH3umxFXf9+aPcZ5yYkoXE9V -fzsnBMJz8hI6K2j4Q6sJe+v/0pdz8MpbdIPnmL9qfVpuD6JqmDCZiQOJ8lpMuqqD -60uLjtLv/JKjgdqe5C4psERVm09fg3vOZckv9CC6a4MupeXo2il6femZnPrxC8LX -u2KT3njEjoyzEu2NSdy+BUJDVLgKSh8s2TC8ViNfiFONQo6L1y78ZAyCDrRbTgN9 -Nu1Ou/yzqHkCAwEAAaOBqjCBpzAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI -KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFC83cRfE -/EKcz7GJKmgDLUBi3kRSMB8GA1UdIwQYMBaAFL6nsHdEuMjwc44+9WGq0FA1GYdl -MCgGA1UdEQQhMB+CDCouZXRjZC5sb2NhbIIJbG9jYWxob3N0hwR/AAABMA0GCSqG -SIb3DQEBCwUAA4IBAQCI7estG86E9IEGREfYul1ej8hltpiAxucmsI0i0lyRHOGa -dss3CKs6TWe5LWXThCIJ2WldI/VgPe63Ezz7WuP3EJxt9QclYArIklS/WN+Bjbn7 -6b8KAtGQkFh7hhjoyilBixpGjECcc7lbriXoEpmUZj9DYQymXWtjKeUJCfQjseNS -V/fmsPph8QveN+pGCypdQ9EA4LGXErg4DQMIo40maYf9/uGBMIrddi930llB0wAh -lsGNUDkrKKJVs2PiVsy8p8sF1h7zAQ+gSqk3ZuWjrTqIIMHtRfIaNICimc7wEy1t -u5fbySMusy1PRAwHVdl5yPxx++KlHyBNowh/9OJh ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns/certs-wildcard/server.key.insecure b/tests/manual/docker-dns/certs-wildcard/server.key.insecure deleted file mode 100644 index ac56ed4ea..000000000 --- a/tests/manual/docker-dns/certs-wildcard/server.key.insecure +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEA0yo0SjOF0uYrkBNKSAg7JCYGahQKCJYH4/nZhbN+bBpbBA/Y -UWzeqKHZzcMccfuzbN1x5cpPZk2W9I7zKPTyyUs9hILgtDey7yeMYmVqwnbwkyNG -qyGcfe6bEVd/35o9xnnJiShcT1V/OycEwnPyEjoraPhDqwl76//Sl3Pwylt0g+eY -v2p9Wm4PomqYMJmJA4nyWky6qoPrS4uO0u/8kqOB2p7kLimwRFWbT1+De85lyS/0 -ILprgy6l5ejaKXp96Zmc+vELwte7YpPeeMSOjLMS7Y1J3L4FQkNUuApKHyzZMLxW -I1+IU41CjovXLvxkDIIOtFtOA3027U67/LOoeQIDAQABAoIBAH/sM104NTv8QCu5 -4+gbRGizuHMOzL1C1mjfdU0v3chzduvRBYTeZUzXL/Ec3+CVUK8Ev/krREp/epGQ -//Gx4lrbf9sExkem7nk/Biadtb00/KzGVAtcA0evArXQwiCdegsAwHycvL861ibp -jlKWlvE/2AhxTd0Rk8b2ZYdmr1qGTesIy7S4ilj1B8aYWnZglhSyyU7TqLhYmsWo -3B1ufNpkPCzo97bJmc1/bqXCIQXi/HkkDxJRFa/vESebiy2wdgkWflybW37vLaN0 -mox44uXpVYtZuuGyxdKjX6T2EOglZztXlC8gdxrnFS5leyBEu+7ABS5OvHgnlOX5 -80MyUpkCgYEA/4xpEBltbeJPH52Lla8VrcW3nGWPnfY8xUSnjKBspswTQPu389EO -ayM3DewcpIfxFu/BlMzKz0lm77QQZIu3gIJoEu8IXzUa3fJ2IavRKPSvbNFj5Icl -kVX+mE4BtF+tnAjDWiX9qaNXZcU7b0/q0yXzL35WB4H7Op4axqBir/sCgYEA04m3 -4LtRKWgObQXqNaw+8yEvznWdqVlJngyKoJkSVnqwWRuin9eZDfc84genxxT0rGI9 -/3Fw8enfBVIYGLR5V5aYmGfYyRCkN4aeRc0zDlInm0x2UcZShT8D0LktufwRYZh8 -Ui6+iiIBELwxyyWfuybH5hhstbdFazfu1yNA+xsCgYB47tORYNceVyimh4HU9iRG -NfjsNEvArxSXLiQ0Mn74eD7sU7L72QT/wox9NC1h10tKVW/AoSGg8tWZvha73jqa -wBvMSf4mQBVUzzcEPDEhNpoF3xlsvmAS5SU0okXAPD8GRkdcU/o02y2y5aF4zdMM -1Tq+UQUZTHO9i7CUKrZJHQKBgQC+FueRn0ITv1oXRlVs3dfDi3L2SGLhJ0csK4D3 -SBZed+m4aUj98jOrhRzE0LRIBeDId4/W2A3ylYK/uUHGEYdo2f9OFSONqtKmwuW/ -O+JBYDoPJ+q7GUhWTIYVLhKVKppD5U7yWucGIgBrFXJ5Ztnex76iWhh2Qray3pRV -52whOQKBgHVBI4F7pkn6id9W4sx2LqrVjpjw6vTDepIRK0SXBIQp34WnCL5CERDJ -pks203i42Ww7IadufepkGQOfwuik9wVRNWrNp4oKle6oNK9oK3ihuyb+5DtyKwDm -5sQUYUXc5E3qDQhHCGDzbT7wP+bCDnWKgvV6smshuQSW8M+tFIOQ ------END RSA PRIVATE KEY----- diff --git a/tests/manual/docker-dns/certs/Procfile b/tests/manual/docker-dns/certs/Procfile deleted file mode 100644 index a7f68a6c9..000000000 --- a/tests/manual/docker-dns/certs/Procfile +++ /dev/null @@ -1,6 +0,0 @@ -# Use goreman to run `go get github.com/mattn/goreman` -etcd1: ./etcd --name m1 --data-dir /tmp/m1.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs/server.crt --peer-key-file=/certs/server.key.insecure --peer-trusted-ca-file=/certs/ca.crt --peer-client-cert-auth --cert-file=/certs/server.crt --key-file=/certs/server.key.insecure --trusted-ca-file=/certs/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd2: ./etcd --name m2 --data-dir /tmp/m2.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs/server.crt --peer-key-file=/certs/server.key.insecure --peer-trusted-ca-file=/certs/ca.crt --peer-client-cert-auth --cert-file=/certs/server.crt --key-file=/certs/server.key.insecure --trusted-ca-file=/certs/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr - -etcd3: ./etcd --name m3 --data-dir /tmp/m3.data --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 --initial-cluster=m1=https://m1.etcd.local:2380,m2=https://m2.etcd.local:22380,m3=https://m3.etcd.local:32380 --initial-cluster-state new --peer-cert-file=/certs/server.crt --peer-key-file=/certs/server.key.insecure --peer-trusted-ca-file=/certs/ca.crt --peer-client-cert-auth --cert-file=/certs/server.crt --key-file=/certs/server.key.insecure --trusted-ca-file=/certs/ca.crt --client-cert-auth --logger=zap --log-outputs=stderr \ No newline at end of file diff --git a/tests/manual/docker-dns/certs/ca-csr.json b/tests/manual/docker-dns/certs/ca-csr.json deleted file mode 100644 index ecafabaad..000000000 --- a/tests/manual/docker-dns/certs/ca-csr.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "ca", - "ca": { - "expiry": "87600h" - } -} diff --git a/tests/manual/docker-dns/certs/ca.crt b/tests/manual/docker-dns/certs/ca.crt deleted file mode 100644 index 4a17292de..000000000 --- a/tests/manual/docker-dns/certs/ca.crt +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDsTCCApmgAwIBAgIUCeu/ww6+XbCM3m8m6fp17t8bjOcwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xNzExMTMwNDA2MDBaFw0yNzExMTEwNDA2 -MDBaMG8xDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTELMAkGA1UEAxMCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQCgH8KMvldAoQjWA5YQoEOQgRyjZ3hkKdTQcFBj3OR8OyhiNJ+4oEJ/AqyJ -b41G9NGd+88hRSrcCeUBrUY3nWVhqzclCe7mQ1IyordmuKxekmPD/uvzcbySzpJT -qGEwNEiiBcr4mSQiGA5yMgBLKLpKw27t0ncVn/Qt0rKtqwLUYYWGEfADLw7+6iDK -xzCxLeXV/cB1VtFZa62j3KRJR4XQ/QosqwZw2dRGF/jUZgmsRYYK8noOvqY/uRPV -sqwGAKq0B0zOMp185dFrzJVD+LHZgSS9GLGmvRgttwayDuYSOny7WXugQ28fCaRX -p+53s1eBb5cHCGSko48f2329cnlFAgMBAAGjRTBDMA4GA1UdDwEB/wQEAwIBBjAS -BgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBSgglhjDWaAJm9ju5x1YMArtH7c -yjANBgkqhkiG9w0BAQsFAAOCAQEAK6IGimbnP9oFSvwNGmXjEtn/vE82dDhQJv8k -oiAsx0JurXBYybvu/MLaBJVQ6bF77hW/fzvhMOzLNEMGY1ql80TmfaTqyPpTN85I -6YhXOViZEQJvH17lVA8d57aSve0WPZqBqS3xI0dGpn/Ji6JPrjKCrgjeukXXHR+L -MScK1lpxaCjD45SMJCzANsMnIKTiKN8RnIcSmnrr/gGl7bC6Y7P84xUGgYu2hvNG -1DZBcelmzbZYk2DtbrR0Ed6IFD1Tz4RAEuKJfInjgAP2da41j4smoecXOsJMGVl5 -5RX7ba3Hohys6la8jSS3opCPKkwEN9mQaB++iN1qoZFY4qB9gg== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns/certs/gencert.json b/tests/manual/docker-dns/certs/gencert.json deleted file mode 100644 index 09b67267b..000000000 --- a/tests/manual/docker-dns/certs/gencert.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "signing": { - "default": { - "usages": [ - "signing", - "key encipherment", - "server auth", - "client auth" - ], - "expiry": "87600h" - } - } -} diff --git a/tests/manual/docker-dns/certs/gencerts.sh b/tests/manual/docker-dns/certs/gencerts.sh deleted file mode 100755 index af8663e09..000000000 --- a/tests/manual/docker-dns/certs/gencerts.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -if ! [[ "$0" =~ "./gencerts.sh" ]]; then - echo "must be run from 'fixtures'" - exit 255 -fi - -if ! which cfssl; then - echo "cfssl is not installed" - exit 255 -fi - -cfssl gencert --initca=true ./ca-csr.json | cfssljson --bare ./ca -mv ca.pem ca.crt -openssl x509 -in ca.crt -noout -text - -# generate wildcard certificates DNS: *.etcd.local -cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr.json | cfssljson --bare ./server -mv server.pem server.crt -mv server-key.pem server.key.insecure - -rm -f *.csr *.pem *.stderr *.txt diff --git a/tests/manual/docker-dns/certs/run.sh b/tests/manual/docker-dns/certs/run.sh deleted file mode 100755 index 05be3e642..000000000 --- a/tests/manual/docker-dns/certs/run.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh -rm -rf /tmp/m1.data /tmp/m2.data /tmp/m3.data - -/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 /certs/Procfile start & - -# TODO: remove random sleeps -sleep 7s - -./etcdctl \ - --cacert=/certs/ca.crt \ - --cert=/certs/server.crt \ - --key=/certs/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379 \ - endpoint health --cluster - -./etcdctl \ - --cacert=/certs/ca.crt \ - --cert=/certs/server.crt \ - --key=/certs/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - put abc def - -./etcdctl \ - --cacert=/certs/ca.crt \ - --cert=/certs/server.crt \ - --key=/certs/server.key.insecure \ - --endpoints=https://m1.etcd.local:2379,https://m2.etcd.local:22379,https://m3.etcd.local:32379 \ - get abc - -printf "\nWriting v2 key...\n" -curl -L https://127.0.0.1:2379/v2/keys/queue \ - --cacert /certs/ca.crt \ - --cert /certs/server.crt \ - --key /certs/server.key.insecure \ - -X POST \ - -d value=data - -printf "\nWriting v2 key...\n" -curl -L https://m1.etcd.local:2379/v2/keys/queue \ - --cacert /certs/ca.crt \ - --cert /certs/server.crt \ - --key /certs/server.key.insecure \ - -X POST \ - -d value=data - -printf "\nWriting v3 key...\n" -curl -L https://127.0.0.1:2379/v3/kv/put \ - --cacert /certs/ca.crt \ - --cert /certs/server.crt \ - --key /certs/server.key.insecure \ - -X POST \ - -d '{"key": "Zm9v", "value": "YmFy"}' - -printf "\n\nWriting v3 key...\n" -curl -L https://m1.etcd.local:2379/v3/kv/put \ - --cacert /certs/ca.crt \ - --cert /certs/server.crt \ - --key /certs/server.key.insecure \ - -X POST \ - -d '{"key": "Zm9v", "value": "YmFy"}' - -printf "\n\nReading v3 key...\n" -curl -L https://m1.etcd.local:2379/v3/kv/range \ - --cacert /certs/ca.crt \ - --cert /certs/server.crt \ - --key /certs/server.key.insecure \ - -X POST \ - -d '{"key": "Zm9v"}' - -printf "\n\nFetching 'curl https://m1.etcd.local:2379/metrics'...\n" -curl \ - --cacert /certs/ca.crt \ - --cert /certs/server.crt \ - --key /certs/server.key.insecure \ - -L https://m1.etcd.local:2379/metrics | grep Put | tail -3 - -printf "\n\nDone!!!\n\n" diff --git a/tests/manual/docker-dns/certs/server-ca-csr.json b/tests/manual/docker-dns/certs/server-ca-csr.json deleted file mode 100644 index 77cdb408c..000000000 --- a/tests/manual/docker-dns/certs/server-ca-csr.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "hosts": [ - "m1.etcd.local", - "m2.etcd.local", - "m3.etcd.local", - "127.0.0.1", - "localhost" - ] -} diff --git a/tests/manual/docker-dns/certs/server.crt b/tests/manual/docker-dns/certs/server.crt deleted file mode 100644 index 928e3cf5d..000000000 --- a/tests/manual/docker-dns/certs/server.crt +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEKTCCAxGgAwIBAgIUUwtQlOqMccWY8MOaSaWutEjlMrgwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xNzExMTMwNDA2MDBaFw0yNzExMTEwNDA2 -MDBaMGIxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyYH7bL79If -75AezzSpkuTOPAGBzPlGFLM5QS4jrt6fJBpElAUV2VmZm+isVsTs2X63md1t4s3Y -44soYK02HONUxUXxbeW7S8yJYSplG5hCJpFiSVP0GyVojQ04OLO1yI5m82fWJNi6 -9PgTmb3+/YD08TKbjjJ4FB0kqoFJE4qoUNNpbkpQxHW4cx9iyWbE9gwyGoC76ftr -DC4J5HavmZ/y51rq1VWrO/d9rmCEUN++M8FcGt6D4WVQ54sWafl4Q1HafBq3FAT5 -swpqi6aDDFKYYTdvjFEmJ2uWacak8NO+vjTt8fTfSFBUYcxweVWIDm6xU8kR8Lwy -aNxD26jQ9GMCAwEAAaOByTCBxjAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI -KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFELi+Ig+ -uxXrOvjoacXjcCjtfHcsMB8GA1UdIwQYMBaAFKCCWGMNZoAmb2O7nHVgwCu0ftzK -MEcGA1UdEQRAMD6CDW0xLmV0Y2QubG9jYWyCDW0yLmV0Y2QubG9jYWyCDW0zLmV0 -Y2QubG9jYWyCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAQEAn6e8 -LPd53xQGiicDHN8+WkUS7crr+A+bIfY0nbWUf1H7zwNxpHHnKgVRHc4MKpRY4f+E -M2bEYdNJZDrjFYIWWlFDteVKZevH2dB3weiCAYWPYuiR9dGH6NvVbPcEMwarPBW4 -mLsm9Nl/r7YBxXx73rhfxyBbhTuDwKtY/BAMi+ZO4msnuWiiSiQEUrEmzm9PWhAD -CgNjxCL3xoGyIJGj1xev0PYo+iFrAd9Pkfg2+FaSYXtNPbZX229yHmxU7GbOJumx -5vGQMRtzByq7wqw1dZpITlgbDPJc5jdIRKGnusQ96GXLORSQcP+tfG4NhreYYpI1 -69Y78gNCTl0uGmI21g== ------END CERTIFICATE----- diff --git a/tests/manual/docker-dns/certs/server.key.insecure b/tests/manual/docker-dns/certs/server.key.insecure deleted file mode 100644 index 08784a7c6..000000000 --- a/tests/manual/docker-dns/certs/server.key.insecure +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAvJgftsvv0h/vkB7PNKmS5M48AYHM+UYUszlBLiOu3p8kGkSU -BRXZWZmb6KxWxOzZfreZ3W3izdjjiyhgrTYc41TFRfFt5btLzIlhKmUbmEImkWJJ -U/QbJWiNDTg4s7XIjmbzZ9Yk2Lr0+BOZvf79gPTxMpuOMngUHSSqgUkTiqhQ02lu -SlDEdbhzH2LJZsT2DDIagLvp+2sMLgnkdq+Zn/LnWurVVas7932uYIRQ374zwVwa -3oPhZVDnixZp+XhDUdp8GrcUBPmzCmqLpoMMUphhN2+MUSYna5ZpxqTw076+NO3x -9N9IUFRhzHB5VYgObrFTyRHwvDJo3EPbqND0YwIDAQABAoIBAQC0YCbM9YZ9CRBe -Xik9rAYTknBv3I6Hx5BaziLaF0TUJY8pFHgh2QDVooYsZlBi7kki2kVuNAAdcxhG -ayrz33KHtvcq6zt54sYfbTGik6tt1679k+ygQDOKdtGZWDFbKD0Wfb7FjFoXc9CC -SHTd9DjPkvXxujepa5GJQh1Vo+ftz2I+8e6LeoiBZJM1IosfrpxKg02UnWrLia7o -i8eoXIyMAJHuNUGpGl33WnckyMGDsVKMc2DVG2exfVBZ37lAemYOLRKmd4AwUk2l -ztd71sXQodLk++1BqaS9cc9yvsNiBjGL3Ehm7uUcLH1k3VHd4ArcGhiqffKzQuSE -Dhm8GXNZAoGBAMrXOAdnfLlxYKCqOaj0JwN0RusWBP3cC7jluS5UmeTROPnBa0Fb -219YtiXkDrWtoiwLvvPXobem0/juPkiGnprGcOsPUGa6pV3TPJ40BiIfh9/vt7fr -Bko2SqEA9U0FxredcOFoCPxX9k9EDWxhF/nD20amvRHKK/wv995iXKxHAoGBAO4F -GILNxBHlH5F++dbSSSTcZUTXvuBr7JQkbMK+luSikEtaSW9IO2bf65LtqjaWp4Ds -rENCQAB3PmI111Rjwrk7925W0JCHw/+UArlVoM3K2q1zhYUWAn9L3v+qUTN2TLu1 -Tso3OkCrQ5aa812tffW3hZHOWJ+aZp2nnBnruDEFAoGAGJDCD1uAJnFNs4eKHiUb -iHaPlC8BgcEhhk4EBFFopeaU0OKU28CFK+HxhVs+UNBrgIwXny5xPm2s5EvuLRho -ovP/fuhG43odRuSrRbmlOIK7EOrWRCbphxlWJnOYQbC+ZURjBFl2JSF+ChGC0qpb -nfsTVlYhNcNXWl5w1XTyJkcCgYEAp07XquJeh0GqTgiWL8XC+nEdkiWhG3lhY8Sy -2rVDtdT7XqxJYDrC3o5Ztf7vnc2KUpqKgACqomkvZbN49+3j63bWdy35Dw8P27A7 -tfEVxnJoAnJokWMmQDqhts8OowDt8SgCCSyG+vwn10518QxJtRXaguIr84yBwyIV -HTdPUs0CgYBIAxoPD9/6R2swClvln15sjaIXDp5rYLbm6mWU8fBURU2fdUw3VBlJ -7YVgQ4GnKiCI7NueBBNRhjXA3KDkFyZw0/oKe2uc/4Gdyx1/L40WbYOaxJD2vIAf -FZ4pK9Yq5Rp3XiCNm0eURBlNM+fwXOQin2XdzDRoEq1B5JalQO87lA== ------END RSA PRIVATE KEY----- diff --git a/tests/manual/docker-dns/etcd.zone b/tests/manual/docker-dns/etcd.zone deleted file mode 100644 index 03c15fe8e..000000000 --- a/tests/manual/docker-dns/etcd.zone +++ /dev/null @@ -1,14 +0,0 @@ -$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 diff --git a/tests/manual/docker-dns/insecure/Procfile b/tests/manual/docker-dns/insecure/Procfile deleted file mode 100644 index 46d15367b..000000000 --- a/tests/manual/docker-dns/insecure/Procfile +++ /dev/null @@ -1,6 +0,0 @@ -# Use goreman to run `go get github.com/mattn/goreman` -etcd1: ./etcd --name m1 --data-dir /tmp/m1.data --listen-client-urls http://127.0.0.1:2379 --advertise-client-urls http://m1.etcd.local:2379 --listen-peer-urls http://127.0.0.1:2380 --initial-advertise-peer-urls=http://m1.etcd.local:2380 --initial-cluster-token tkn --initial-cluster=m1=http://m1.etcd.local:2380,m2=http://m2.etcd.local:22380,m3=http://m3.etcd.local:32380 --host-whitelist "localhost,127.0.0.1,m1.etcd.local" --logger=zap --log-outputs=stderr - -etcd2: ./etcd --name m2 --data-dir /tmp/m2.data --listen-client-urls http://127.0.0.1:22379 --advertise-client-urls http://m2.etcd.local:22379 --listen-peer-urls http://127.0.0.1:22380 --initial-advertise-peer-urls=http://m2.etcd.local:22380 --initial-cluster-token tkn --initial-cluster=m1=http://m1.etcd.local:2380,m2=http://m2.etcd.local:22380,m3=http://m3.etcd.local:32380 --host-whitelist "localhost,127.0.0.1,m1.etcd.local" --logger=zap --log-outputs=stderr - -etcd3: ./etcd --name m3 --data-dir /tmp/m3.data --listen-client-urls http://127.0.0.1:32379 --advertise-client-urls http://m3.etcd.local:32379 --listen-peer-urls http://127.0.0.1:32380 --initial-advertise-peer-urls=http://m3.etcd.local:32380 --initial-cluster-token tkn --initial-cluster=m1=http://m1.etcd.local:2380,m2=http://m2.etcd.local:22380,m3=http://m3.etcd.local:32380 --host-whitelist "localhost,127.0.0.1,m1.etcd.local" --logger=zap --log-outputs=stderr \ No newline at end of file diff --git a/tests/manual/docker-dns/insecure/run.sh b/tests/manual/docker-dns/insecure/run.sh deleted file mode 100755 index 32c963487..000000000 --- a/tests/manual/docker-dns/insecure/run.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -rm -rf /tmp/m1.data /tmp/m2.data /tmp/m3.data - -/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 /insecure/Procfile start & - -# TODO: remove random sleeps -sleep 7s - -./etcdctl \ - --endpoints=http://m1.etcd.local:2379 \ - endpoint health --cluster - -./etcdctl \ - --endpoints=http://m1.etcd.local:2379,http://m2.etcd.local:22379,http://m3.etcd.local:32379 \ - put abc def - -./etcdctl \ - --endpoints=http://m1.etcd.local:2379,http://m2.etcd.local:22379,http://m3.etcd.local:32379 \ - get abc - -printf "\nWriting v2 key...\n" -curl \ - -L http://127.0.0.1:2379/v2/keys/queue \ - -X POST \ - -d value=data - -printf "\nWriting v2 key...\n" -curl \ - -L http://m1.etcd.local:2379/v2/keys/queue \ - -X POST \ - -d value=data - -printf "\nWriting v3 key...\n" -curl \ - -L http://127.0.0.1:2379/v3/kv/put \ - -X POST \ - -d '{"key": "Zm9v", "value": "YmFy"}' - -printf "\n\nWriting v3 key...\n" -curl \ - -L http://m1.etcd.local:2379/v3/kv/put \ - -X POST \ - -d '{"key": "Zm9v", "value": "YmFy"}' - -printf "\n\nReading v3 key...\n" -curl \ - -L http://m1.etcd.local:2379/v3/kv/range \ - -X POST \ - -d '{"key": "Zm9v"}' - -printf "\n\nFetching 'curl http://m1.etcd.local:2379/metrics'...\n" -curl \ - -L http://m1.etcd.local:2379/metrics | grep Put | tail -3 - -name1=$(base64 <<< "/election-prefix") -val1=$(base64 <<< "v1") -data1="{\"name\":\"${name1}\", \"value\":\"${val1}\"}" - -printf "\n\nCampaign: ${data1}\n" -result1=$(curl -L http://m1.etcd.local:2379/v3/election/campaign -X POST -d "${data1}") -echo ${result1} - -# should not panic servers -val2=$(base64 <<< "v2") -data2="{\"value\": \"${val2}\"}" -printf "\n\nProclaim (wrong-format): ${data2}\n" -curl \ - -L http://m1.etcd.local:2379/v3/election/proclaim \ - -X POST \ - -d "${data2}" - -printf "\n\nProclaim (wrong-format)...\n" -curl \ - -L http://m1.etcd.local:2379/v3/election/proclaim \ - -X POST \ - -d '}' - -printf "\n\nProclaim (wrong-format)...\n" -curl \ - -L http://m1.etcd.local:2379/v3/election/proclaim \ - -X POST \ - -d '{"value": "Zm9v"}' - -printf "\n\nDone!!!\n\n" diff --git a/tests/manual/docker-dns/named.conf b/tests/manual/docker-dns/named.conf deleted file mode 100644 index 76ce0caa1..000000000 --- a/tests/manual/docker-dns/named.conf +++ /dev/null @@ -1,23 +0,0 @@ -options { - directory "/var/bind"; - listen-on { 127.0.0.1; }; - listen-on-v6 { none; }; - allow-transfer { - none; - }; - // If you have problems and are behind a firewall: - query-source address * port 53; - pid-file "/var/run/named/named.pid"; - allow-recursion { none; }; - recursion no; -}; - -zone "etcd.local" IN { - type main; - file "/etc/bind/etcd.zone"; -}; - -zone "0.0.127.in-addr.arpa" { - type main; - file "/etc/bind/rdns.zone"; -}; diff --git a/tests/manual/docker-dns/rdns.zone b/tests/manual/docker-dns/rdns.zone deleted file mode 100644 index fb71b30b1..000000000 --- a/tests/manual/docker-dns/rdns.zone +++ /dev/null @@ -1,13 +0,0 @@ -$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 - -1 IN PTR m1.etcd.local. -1 IN PTR m2.etcd.local. -1 IN PTR m3.etcd.local. diff --git a/tests/manual/docker-dns/resolv.conf b/tests/manual/docker-dns/resolv.conf deleted file mode 100644 index bbc8559cd..000000000 --- a/tests/manual/docker-dns/resolv.conf +++ /dev/null @@ -1 +0,0 @@ -nameserver 127.0.0.1 diff --git a/tests/manual/docker-static-ip/Dockerfile b/tests/manual/docker-static-ip/Dockerfile deleted file mode 100644 index d5f7913be..000000000 --- a/tests/manual/docker-static-ip/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM ubuntu:18.04 - -RUN rm /bin/sh && ln -s /bin/bash /bin/sh -RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections - -RUN apt-get -y update \ - && apt-get -y install \ - build-essential \ - gcc \ - apt-utils \ - pkg-config \ - software-properties-common \ - apt-transport-https \ - libssl-dev \ - sudo \ - bash \ - curl \ - tar \ - git \ - netcat \ - bind9 \ - dnsutils \ - && apt-get -y update \ - && apt-get -y upgrade \ - && apt-get -y autoremove \ - && apt-get -y autoclean - -ENV GOROOT /usr/local/go -ENV GOPATH /go -ENV PATH ${GOPATH}/bin:${GOROOT}/bin:${PATH} -ENV GO_VERSION REPLACE_ME_GO_VERSION -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 get -v -u github.com/mattn/goreman diff --git a/tests/manual/docker-static-ip/certs-metrics-proxy/Procfile b/tests/manual/docker-static-ip/certs-metrics-proxy/Procfile deleted file mode 100644 index 4cf163c17..000000000 --- a/tests/manual/docker-static-ip/certs-metrics-proxy/Procfile +++ /dev/null @@ -1,8 +0,0 @@ -# Use goreman to run `go get github.com/mattn/goreman` -etcd1: ./etcd --name m1 --data-dir /tmp/m1.data --listen-client-urls https://127.0.0.1:2379 --advertise-client-urls https://localhost:2379 --listen-peer-urls https://127.0.0.1:2380 --initial-advertise-peer-urls=https://localhost:2380 --initial-cluster-token tkn --initial-cluster=m1=https://localhost:2380,m2=https://localhost:22380,m3=https://localhost:32380 --initial-cluster-state new --peer-cert-file=/certs-metrics-proxy/server.crt --peer-key-file=/certs-metrics-proxy/server.key.insecure --peer-trusted-ca-file=/certs-metrics-proxy/ca.crt --peer-client-cert-auth --cert-file=/certs-metrics-proxy/server.crt --key-file=/certs-metrics-proxy/server.key.insecure --trusted-ca-file=/certs-metrics-proxy/ca.crt --client-cert-auth --listen-metrics-urls=https://localhost:2378,http://localhost:9379 --logger=zap --log-outputs=stderr - -etcd2: ./etcd --name m2 --data-dir /tmp/m2.data --listen-client-urls https://127.0.0.1:22379 --advertise-client-urls https://localhost:22379 --listen-peer-urls https://127.0.0.1:22380 --initial-advertise-peer-urls=https://localhost:22380 --initial-cluster-token tkn --initial-cluster=m1=https://localhost:2380,m2=https://localhost:22380,m3=https://localhost:32380 --initial-cluster-state new --peer-cert-file=/certs-metrics-proxy/server.crt --peer-key-file=/certs-metrics-proxy/server.key.insecure --peer-trusted-ca-file=/certs-metrics-proxy/ca.crt --peer-client-cert-auth --cert-file=/certs-metrics-proxy/server.crt --key-file=/certs-metrics-proxy/server.key.insecure --trusted-ca-file=/certs-metrics-proxy/ca.crt --client-cert-auth --listen-metrics-urls=https://localhost:22378,http://localhost:29379 --logger=zap --log-outputs=stderr - -etcd3: ./etcd --name m3 --data-dir /tmp/m3.data --listen-client-urls https://127.0.0.1:32379 --advertise-client-urls https://localhost:32379 --listen-peer-urls https://127.0.0.1:32380 --initial-advertise-peer-urls=https://localhost:32380 --initial-cluster-token tkn --initial-cluster=m1=https://localhost:2380,m2=https://localhost:22380,m3=https://localhost:32380 --initial-cluster-state new --peer-cert-file=/certs-metrics-proxy/server.crt --peer-key-file=/certs-metrics-proxy/server.key.insecure --peer-trusted-ca-file=/certs-metrics-proxy/ca.crt --peer-client-cert-auth --cert-file=/certs-metrics-proxy/server.crt --key-file=/certs-metrics-proxy/server.key.insecure --trusted-ca-file=/certs-metrics-proxy/ca.crt --client-cert-auth --listen-metrics-urls=https://localhost:32378,http://localhost:39379 --logger=zap --log-outputs=stderr - -proxy: ./etcd grpc-proxy start --advertise-client-url=localhost:23790 --listen-addr=localhost:23790 --endpoints=https://localhost:2379,https://localhost:22379,https://localhost:32379 --data-dir=/tmp/proxy.data --cacert=/certs-metrics-proxy/ca.crt --cert=/certs-metrics-proxy/server.crt --key=/certs-metrics-proxy/server.key.insecure --trusted-ca-file=/certs-metrics-proxy/ca.crt --cert-file=/certs-metrics-proxy/server.crt --key-file=/certs-metrics-proxy/server.key.insecure --metrics-addr=http://localhost:9378 diff --git a/tests/manual/docker-static-ip/certs-metrics-proxy/ca-csr.json b/tests/manual/docker-static-ip/certs-metrics-proxy/ca-csr.json deleted file mode 100644 index ecafabaad..000000000 --- a/tests/manual/docker-static-ip/certs-metrics-proxy/ca-csr.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "key": { - "algo": "rsa", - "size": 2048 - }, - "names": [ - { - "O": "etcd", - "OU": "etcd Security", - "L": "San Francisco", - "ST": "California", - "C": "USA" - } - ], - "CN": "ca", - "ca": { - "expiry": "87600h" - } -} diff --git a/tests/manual/docker-static-ip/certs-metrics-proxy/ca.crt b/tests/manual/docker-static-ip/certs-metrics-proxy/ca.crt deleted file mode 100644 index 0d8dc386b..000000000 --- a/tests/manual/docker-static-ip/certs-metrics-proxy/ca.crt +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDsTCCApmgAwIBAgIUYWIIesEznr7VfYawvmttxxmOfeUwDQYJKoZIhvcNAQEL -BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xNzEyMDYyMTUzMDBaFw0yNzEyMDQyMTUz -MDBaMG8xDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTELMAkGA1UEAxMCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQDDN/cW7rl/qz59gF3csnDhp5BAxVY7n0+inzZO+MZIdkCFuus6Klc6mWMY -/ZGvpWxVDgQvYBs310eq4BrM2BjwWNfgqIn6bHVwwGfngojcDEHlZHw1e9sdBlO5 -e/rNONpNtMUjUeukhzFwPOdsUfweAGsqj4VYJV+kkS3uGmCGIj+3wIF411FliiQP -WiyLG16BwR1Vem2qOotCRgCawKSb4/wKfF8dvv00IjP5Jcy+aXLQ4ULW1fvj3cRR -JLdZmZ/PF0Cqm75qw2IqzIhRB5b1e8HyRPeNtEZ7frNLZyFhLgHJbRFF5WooFX79 -q9py8dERBXOxCKrSdqEOre0OU/4pAgMBAAGjRTBDMA4GA1UdDwEB/wQEAwIBBjAS -BgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBS+CaA8UIkIJT9xhXff4p143UuW -7TANBgkqhkiG9w0BAQsFAAOCAQEAK7lScAUi+R68oxxmgZ/pdEr9wsMj4xtss+GO -UDgzxudpT1nYQ2iBudC3LIuTiaUHUSseVleXEKeNbKhKhVhlIwhmPxiOgbbFu9hr -e2Z87SjtdlbE/KcYFw0W/ukWYxYrq08BB19w2Mqd8J5CnLcj4/0iiH1uARo1swFy -GUYAJ2I147sHIDbbmLKuxbdf4dcrkf3D4inBOLcRhS/MzaXfdMFntzJDQAo5YwFI -zZ4TRGOhj8IcU1Cn5SVufryWy3qJ+sKHDYsGQQ/ArBXwQnO3NAFCpEN9rDDuQVmH -+ATHDFBQZcGfN4GDh74FGnliRjip2sO4oWTfImmgJGGAn+P2CA== ------END CERTIFICATE----- diff --git a/tests/manual/docker-static-ip/certs-metrics-proxy/gencert.json b/tests/manual/docker-static-ip/certs-metrics-proxy/gencert.json deleted file mode 100644 index 09b67267b..000000000 --- a/tests/manual/docker-static-ip/certs-metrics-proxy/gencert.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "signing": { - "default": { - "usages": [ - "signing", - "key encipherment", - "server auth", - "client auth" - ], - "expiry": "87600h" - } - } -} diff --git a/tests/manual/docker-static-ip/certs-metrics-proxy/gencerts.sh b/tests/manual/docker-static-ip/certs-metrics-proxy/gencerts.sh deleted file mode 100755 index af8663e09..000000000 --- a/tests/manual/docker-static-ip/certs-metrics-proxy/gencerts.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -if ! [[ "$0" =~ "./gencerts.sh" ]]; then - echo "must be run from 'fixtures'" - exit 255 -fi - -if ! which cfssl; then - echo "cfssl is not installed" - exit 255 -fi - -cfssl gencert --initca=true ./ca-csr.json | cfssljson --bare ./ca -mv ca.pem ca.crt -openssl x509 -in ca.crt -noout -text - -# generate wildcard certificates DNS: *.etcd.local -cfssl gencert \ - --ca ./ca.crt \ - --ca-key ./ca-key.pem \ - --config ./gencert.json \ - ./server-ca-csr.json | cfssljson --bare ./server -mv server.pem server.crt -mv server-key.pem server.key.insecure - -rm -f *.csr *.pem *.stderr *.txt diff --git a/tests/manual/docker-static-ip/certs-metrics-proxy/run.sh b/tests/manual/docker-static-ip/certs-metrics-proxy/run.sh deleted file mode 100755 index 9b171f190..000000000 --- a/tests/manual/docker-static-ip/certs-metrics-proxy/run.sh +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/sh -rm -rf /tmp/m1.data /tmp/m2.data /tmp/m3.data /tmp/proxy.data - -goreman -f /certs-metrics-proxy/Procfile start & - -# TODO: remove random sleeps -sleep 7s - -./etcdctl \ - --cacert=/certs-metrics-proxy/ca.crt \ - --cert=/certs-metrics-proxy/server.crt \ - --key=/certs-metrics-proxy/server.key.insecure \ - --endpoints=https://localhost:2379 \ - endpoint health --cluster - -./etcdctl \ - --cacert=/certs-metrics-proxy/ca.crt \ - --cert=/certs-metrics-proxy/server.crt \ - --key=/certs-metrics-proxy/server.key.insecure \ - --endpoints=https://localhost:2379,https://localhost:22379,https://localhost:32379 \ - put abc def - -./etcdctl \ - --cacert=/certs-metrics-proxy/ca.crt \ - --cert=/certs-metrics-proxy/server.crt \ - --key=/certs-metrics-proxy/server.key.insecure \ - --endpoints=https://localhost:2379,https://localhost:22379,https://localhost:32379 \ - get abc - -################# -sleep 3s && printf "\n\n" && echo "curl https://localhost:2378/metrics" -curl \ - --cacert /certs-metrics-proxy/ca.crt \ - --cert /certs-metrics-proxy/server.crt \ - --key /certs-metrics-proxy/server.key.insecure \ - -L https://localhost:2378/metrics | grep Put | tail -3 - -sleep 3s && printf "\n" && echo "curl https://localhost:2379/metrics" -curl \ - --cacert /certs-metrics-proxy/ca.crt \ - --cert /certs-metrics-proxy/server.crt \ - --key /certs-metrics-proxy/server.key.insecure \ - -L https://localhost:2379/metrics | grep Put | tail -3 - -sleep 3s && printf "\n" && echo "curl http://localhost:9379/metrics" -curl -L http://localhost:9379/metrics | grep Put | tail -3 -################# - -################# -sleep 3s && printf "\n\n" && echo "curl https://localhost:22378/metrics" -curl \ - --cacert /certs-metrics-proxy/ca.crt \ - --cert /certs-metrics-proxy/server.crt \ - --key /certs-metrics-proxy/server.key.insecure \ - -L https://localhost:22378/metrics | grep Put | tail -3 - -sleep 3s && printf "\n" && echo "curl https://localhost:22379/metrics" -curl \ - --cacert /certs-metrics-proxy/ca.crt \ - --cert /certs-metrics-proxy/server.crt \ - --key /certs-metrics-proxy/server.key.insecure \ - -L https://localhost:22379/metrics | grep Put | tail -3 - -sleep 3s && printf "\n" && echo "curl http://localhost:29379/metrics" -curl -L http://localhost:29379/metrics | grep Put | tail -3 -################# - -################# -sleep 3s && printf "\n\n" && echo "curl https://localhost:32378/metrics" -curl \ - --cacert /certs-metrics-proxy/ca.crt \ - --cert /certs-metrics-proxy/server.crt \ - --key /certs-metrics-proxy/server.key.insecure \ - -L https://localhost:32378/metrics | grep Put | tail -3 - -sleep 3s && printf "\n" && echo "curl https://localhost:32379/metrics" -curl \ - --cacert /certs-metrics-proxy/ca.crt \ - --cert /certs-metrics-proxy/server.crt \ - --key /certs-metrics-proxy/server.key.insecure \ - -L https://localhost:32379/metrics | grep Put | tail -3 - -sleep 3s && printf "\n" && echo "curl http://localhost:39379/metrics" -curl -L http://localhost:39379/metrics | grep Put | tail -3 -################# - -################# -sleep 3s && printf "\n\n" && echo "Requests to gRPC proxy localhost:23790" -./etcdctl \ - --cacert /certs-metrics-proxy/ca.crt \ - --cert /certs-metrics-proxy/server.crt \ - --key /certs-metrics-proxy/server.key.insecure \ - --endpoints=localhost:23790 \ - put ghi jkl - -./etcdctl \ - --cacert /certs-metrics-proxy/ca.crt \ - --cert /certs-metrics-proxy/server.crt \ - --key /certs-metrics-proxy/server.key.insecure \ - --endpoints=localhost:23790 \ - get ghi - -sleep 3s && printf "\n" && echo "Requests to gRPC proxy https://localhost:23790/metrics" -curl \ - --cacert /certs-metrics-proxy/ca.crt \ - --cert /certs-metrics-proxy/server.crt \ - --key /certs-metrics-proxy/server.key.insecure \ - -L https://localhost:23790/metrics | grep Put | tail -3 - -sleep 3s && printf "\n" && echo "Requests to gRPC proxy http://localhost:9378/metrics" -curl -L http://localhost:9378/metrics | grep Put | tail -3 -< Date: Sun, 9 Apr 2023 12:40:05 +0800 Subject: [PATCH 2/5] chore: use strict mode for tests/*/*.sh REF: #15514 Signed-off-by: Wei Fu --- tests/fixtures/gencerts.sh | 12 +++++++++--- tests/integration/fixtures-expired/gencerts.sh | 11 ++++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/tests/fixtures/gencerts.sh b/tests/fixtures/gencerts.sh index e4226fca0..b2364cb79 100755 --- a/tests/fixtures/gencerts.sh +++ b/tests/fixtures/gencerts.sh @@ -1,15 +1,21 @@ #!/bin/bash -set -e +set -euo pipefail if ! [[ "$0" =~ "./gencerts.sh" ]]; then echo "must be run from 'fixtures'" exit 255 fi -if ! which cfssl; then +if ! command -v cfssl; then echo "cfssl is not installed" - echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssl github.com/cloudflare/cfssl/cmd/cfssljson" + echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssl" + exit 255 +fi + +if ! command -v cfssljson; then + echo "cfssljson is not installed" + echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssljson" exit 255 fi diff --git a/tests/integration/fixtures-expired/gencerts.sh b/tests/integration/fixtures-expired/gencerts.sh index aecdd423b..b15ae25c6 100755 --- a/tests/integration/fixtures-expired/gencerts.sh +++ b/tests/integration/fixtures-expired/gencerts.sh @@ -1,12 +1,21 @@ #!/bin/bash +set -euo pipefail + if ! [[ "$0" =~ "./gencerts.sh" ]]; then echo "must be run from 'fixtures'" exit 255 fi -if ! which cfssl; then +if ! command -v cfssl; then echo "cfssl is not installed" + echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssl" + exit 255 +fi + +if ! command -v cfssljson; then + echo "cfssljson is not installed" + echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssljson" exit 255 fi From dc2cf295985df489493695e6943e93603c784baa Mon Sep 17 00:00:00 2001 From: Wei Fu Date: Sun, 9 Apr 2023 12:48:25 +0800 Subject: [PATCH 3/5] chore: add strict mode to scripts/test_lib.sh REF: #15514 Signed-off-by: Wei Fu --- scripts/test_lib.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/test_lib.sh b/scripts/test_lib.sh index a15f46c17..106a271cd 100644 --- a/scripts/test_lib.sh +++ b/scripts/test_lib.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -euo pipefail + ROOT_MODULE="go.etcd.io/etcd" if [[ "$(go list)" != "${ROOT_MODULE}/v3" ]]; then From 9dc54ca32ca964f43ad66af0fc11ae7d6488549f Mon Sep 17 00:00:00 2001 From: Wei Fu Date: Sun, 9 Apr 2023 12:51:27 +0800 Subject: [PATCH 4/5] chore: add strict mode for pkg/proxy/fixtures/gencerts.sh REF: #15514 Signed-off-by: Wei Fu --- pkg/proxy/fixtures/gencerts.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkg/proxy/fixtures/gencerts.sh b/pkg/proxy/fixtures/gencerts.sh index 50147b621..be58d78ca 100755 --- a/pkg/proxy/fixtures/gencerts.sh +++ b/pkg/proxy/fixtures/gencerts.sh @@ -1,12 +1,21 @@ #!/bin/bash +set -euo pipefail + if ! [[ "$0" =~ "./gencerts.sh" ]]; then echo "must be run from 'fixtures'" exit 255 fi -if ! which cfssl; then +if ! command -v cfssl; then echo "cfssl is not installed" + echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssl" + exit 255 +fi + +if ! command -v cfssljson; then + echo "cfssljson is not installed" + echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssljson" exit 255 fi From 9f034fbaa8311e78e7e34fb80a2e0131886238b8 Mon Sep 17 00:00:00 2001 From: Wei Fu Date: Thu, 13 Apr 2023 10:35:23 +0800 Subject: [PATCH 5/5] chore: use tools/mod to lock the cfssl cmd version Signed-off-by: Wei Fu --- pkg/proxy/fixtures/gencerts.sh | 4 +- tests/fixtures/gencerts.sh | 4 +- .../integration/fixtures-expired/gencerts.sh | 4 +- tools/mod/go.mod | 21 +++- tools/mod/go.sum | 97 ++++++++++++++++++- tools/mod/tools.go | 2 + 6 files changed, 119 insertions(+), 13 deletions(-) diff --git a/pkg/proxy/fixtures/gencerts.sh b/pkg/proxy/fixtures/gencerts.sh index be58d78ca..d61160d2a 100755 --- a/pkg/proxy/fixtures/gencerts.sh +++ b/pkg/proxy/fixtures/gencerts.sh @@ -9,13 +9,13 @@ fi if ! command -v cfssl; then echo "cfssl is not installed" - echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssl" + echo 'use: bash -c "cd ../../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssl"' exit 255 fi if ! command -v cfssljson; then echo "cfssljson is not installed" - echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssljson" + echo 'use: bash -c "cd ../../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssljson"' exit 255 fi diff --git a/tests/fixtures/gencerts.sh b/tests/fixtures/gencerts.sh index b2364cb79..79c0680e6 100755 --- a/tests/fixtures/gencerts.sh +++ b/tests/fixtures/gencerts.sh @@ -9,13 +9,13 @@ fi if ! command -v cfssl; then echo "cfssl is not installed" - echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssl" + echo 'use: bash -c "cd ../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssl"' exit 255 fi if ! command -v cfssljson; then echo "cfssljson is not installed" - echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssljson" + echo 'use: bash -c "cd ../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssljson"' exit 255 fi diff --git a/tests/integration/fixtures-expired/gencerts.sh b/tests/integration/fixtures-expired/gencerts.sh index b15ae25c6..8eea747ff 100755 --- a/tests/integration/fixtures-expired/gencerts.sh +++ b/tests/integration/fixtures-expired/gencerts.sh @@ -9,13 +9,13 @@ fi if ! command -v cfssl; then echo "cfssl is not installed" - echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssl" + echo 'use: bash -c "cd ../../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssl"' exit 255 fi if ! command -v cfssljson; then echo "cfssljson is not installed" - echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssljson" + echo 'use: bash -c "cd ../../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssljson"' exit 255 fi diff --git a/tools/mod/go.mod b/tools/mod/go.mod index 320339ee4..a4ade9a4e 100644 --- a/tools/mod/go.mod +++ b/tools/mod/go.mod @@ -5,6 +5,7 @@ go 1.19 require ( github.com/alexkohler/nakedret v1.0.1 github.com/chzchzchz/goword v0.0.0-20170907005317-a9744cb52b03 + github.com/cloudflare/cfssl v1.6.4 github.com/coreos/license-bill-of-materials v0.0.0-20190913234955-13baff47494e github.com/gogo/protobuf v1.3.2 github.com/google/addlicense v1.1.1 @@ -41,6 +42,7 @@ require ( github.com/fatih/structtag v1.2.0 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/ghodss/yaml v1.0.0 // indirect + github.com/go-logr/logr v1.2.0 // indirect github.com/go-openapi/analysis v0.21.2 // indirect github.com/go-openapi/errors v0.19.9 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect @@ -49,20 +51,27 @@ require ( github.com/go-openapi/spec v0.20.4 // indirect github.com/go-openapi/strfmt v0.21.0 // indirect github.com/go-openapi/swag v0.19.15 // indirect + github.com/go-sql-driver/mysql v1.6.0 // indirect github.com/go-stack/stack v1.8.0 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/goccy/go-yaml v1.10.0 // indirect github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/certificate-transparency-go v1.1.4 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jinzhu/copier v0.3.5 // indirect + github.com/jmhodges/clock v1.2.0 // indirect + github.com/jmoiron/sqlx v1.3.3 // indirect github.com/josharian/intern v1.0.0 // indirect + github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46 // indirect + github.com/lib/pq v1.10.1 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.6 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.17 // indirect - github.com/mattn/go-runewidth v0.0.9 // indirect + github.com/mattn/go-runewidth v0.0.13 // indirect + github.com/mattn/go-sqlite3 v1.14.15 // indirect github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect @@ -70,10 +79,15 @@ require ( github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/pelletier/go-toml/v2 v2.0.6 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/spf13/cobra v1.7.0 // indirect + github.com/rivo/uniseg v0.2.0 // indirect + github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/trustmaster/go-aspell v0.0.0-20200701131845-c2b1f55bec8f // indirect + github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b // indirect + github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc // indirect + github.com/zmap/zlint/v3 v3.1.0 // indirect go.mongodb.org/mongo-driver v1.7.3 // indirect + golang.org/x/crypto v0.3.0 // indirect golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect golang.org/x/mod v0.9.0 // indirect golang.org/x/net v0.9.0 // indirect @@ -83,9 +97,10 @@ require ( golang.org/x/text v0.9.0 // indirect golang.org/x/tools v0.7.0 // indirect golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect - google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884 // indirect + google.golang.org/genproto v0.0.0-20220706185917-7780775163c4 // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/klog/v2 v2.80.1 // indirect ) diff --git a/tools/mod/go.sum b/tools/mod/go.sum index 4533c27dd..5dc82062f 100644 --- a/tools/mod/go.sum +++ b/tools/mod/go.sum @@ -24,12 +24,20 @@ github.com/bmatcuk/doublestar/v4 v4.0.2 h1:X0krlUVAVmtr2cRoTqR8aDMrDqnB36ht8wpWT github.com/bmatcuk/doublestar/v4 v4.0.2/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5PW5zdZ39xEwfS9an067BirqA+P4QaLI= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8 h1:W9o46d2kbNL06lq7UNDPV0zYLzkrde/bjIqO02eoll0= github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8/go.mod h1:gakxgyXaaPkxvLw1XQxNGK4I37ys9iBRzNUx/B7pUCo= github.com/chzchzchz/goword v0.0.0-20170907005317-a9744cb52b03 h1:0wUHjDfbCAROEAZ96zAJGwcNMkPIheFaIjtQyv3QqfM= github.com/chzchzchz/goword v0.0.0-20170907005317-a9744cb52b03/go.mod h1:uFE9hX+zXEwvyUThZ4gDb9vkAwc5DoHUnRSEpH0VrOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudflare/cfssl v1.6.4 h1:NMOvfrEjFfC63K3SGXgAnFdsgkmiq4kATme5BfcqrO8= +github.com/cloudflare/cfssl v1.6.4/go.mod h1:8b3CQMxfWPAeom3zBnGJ6sd+G1NkL5TXqmDXacb+1J0= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5 h1:xD/lrqdvwsc+O2bjSSi3YqY73Ke3LAiSCx49aCesA0E= github.com/cockroachdb/errors v1.2.4 h1:Lap807SXTH5tri2TivECb/4abUkMZC9zRoLarvcKDqs= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= @@ -49,6 +57,8 @@ github.com/elliotchance/orderedmap v1.5.0/go.mod h1:wsDwEaX5jEoyhbs7x93zk2H/qv0z github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= @@ -61,6 +71,8 @@ github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmV github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-openapi/analysis v0.21.2 h1:hXFrOYFHUAMQdu6zwAiKKJHJQ8kqZs1ux/ru1P1wLJU= github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY= github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= @@ -84,6 +96,9 @@ github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvSc github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= +github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= @@ -122,16 +137,31 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/addlicense v1.1.1 h1:jpVf9qPbU8rz5MxKo7d+RMcNHkqxi4YJi/laauX4aAE= github.com/google/addlicense v1.1.1/go.mod h1:Sm/DHu7Jk+T5miFHHehdIjbi4M5+dJDRS3Cq0rncIxA= +github.com/google/certificate-transparency-go v1.1.4 h1:hCyXHDbtqlr/lMXU0D4WgbalXL0Zk4dSWWMbPV8VrqY= +github.com/google/certificate-transparency-go v1.1.4/go.mod h1:D6lvbfwckhNrbM9WVl1EVeMOyzC19mpIjMOI4nxBHtQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -150,10 +180,15 @@ github.com/hexfusion/schwag v0.0.0-20211117114134-3ceb0191ccbf h1:beD8tmKm5FqWVt github.com/hexfusion/schwag v0.0.0-20211117114134-3ceb0191ccbf/go.mod h1:wSgrm+n3LvHOVxUJo2ha5ffLqRmt6+oGoD6J/suB66c= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg= github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= +github.com/jmhodges/clock v1.2.0 h1:eq4kys+NI0PLngzaHEe7AmPT90XMGIEySD1JfV1PDIs= +github.com/jmhodges/clock v1.2.0/go.mod h1:qKjhA7x7u/lQpPB1XAqX1b1lCI/w3/fNuYpI/ZjLynI= +github.com/jmoiron/sqlx v1.3.3 h1:j82X0bf7oQ27XeqxicSZsTU5suPwKElg3oyxNn43iTk= +github.com/jmoiron/sqlx v1.3.3/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= @@ -161,6 +196,8 @@ github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaR github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46 h1:veS9QfglfvqAw2e+eeNT/SbGySq8ajECXJ9e4fPoLhY= +github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -170,6 +207,9 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.10.1 h1:6VXZrLU0jHBYyAqrSPa+MgPfnSvTPuMgK+k0o5kVFWo= +github.com/lib/pq v1.10.1/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -188,8 +228,12 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= +github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI= +github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mdempsky/unconvert v0.0.0-20200228143138-95ecdbfc0b5f h1:Kc3s6QFyh9DLgInXpWKuG+8I7R7lXbnP7mcoOVIt6KY= github.com/mdempsky/unconvert v0.0.0-20200228143138-95ecdbfc0b5f/go.mod h1:AmCV4WB3cDMZqgPk+OUQKumliiQS4ZYsBt3AXekyuAU= github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 h1:zpIH83+oKzcpryru8ceC6BxnoG8TBrhgAvRg8obzup0= @@ -204,12 +248,14 @@ github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= +github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1:OQA4XLvDbMgS8P0CevmM4m9Q3Jq4phKUzcocxuGJ5m8= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= @@ -221,18 +267,22 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= +github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= @@ -243,6 +293,7 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -254,6 +305,9 @@ github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/trustmaster/go-aspell v0.0.0-20200701131845-c2b1f55bec8f h1:92ZQJRegaqnKjz9HY9an696Sw5EmAqRv0eie/U2IE6k= github.com/trustmaster/go-aspell v0.0.0-20200701131845-c2b1f55bec8f/go.mod h1:wxUiQ1klFJmwnM41kQI7IT2g8jjOKbtuL54LdjkxAI0= +github.com/weppos/publicsuffix-go v0.13.1-0.20210123135404-5fd73613514e/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= +github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b h1:FsyNrX12e5BkplJq7wKOLk0+C6LZ+KGXvuEcKUYm5ss= +github.com/weppos/publicsuffix-go v0.15.1-0.20210511084619-b1f36a2d6c0b/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= @@ -262,6 +316,13 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE= +github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod h1:5iU54tB79AMBcySS0R2XIyZBAVmeHranShAFELYx7is= +github.com/zmap/zcrypto v0.0.0-20210123152837-9cf5beac6d91/go.mod h1:R/deQh6+tSWlgI9tb4jNmXxn8nSCabl5ZQsBX9//I/E= +github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc h1:zkGwegkOW709y0oiAraH/3D8njopUR/pARHv4tZZ6pw= +github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc/go.mod h1:FM4U1E3NzlNMRnSUTU3P1UdukWhYGifqEsjk9fn7BCk= +github.com/zmap/zlint/v3 v3.1.0 h1:WjVytZo79m/L1+/Mlphl09WBob6YTGljN5IGWZFpAv0= +github.com/zmap/zlint/v3 v3.1.0/go.mod h1:L7t8s3sEKkb0A2BxGy1IWrxt1ZATa1R4QfJZaQOD3zU= go.etcd.io/gofail v0.1.0 h1:XItAMIhOojXFQMgrxjnd2EIIHun/d5qL0Pf7FzVTkFg= go.etcd.io/gofail v0.1.0/go.mod h1:VZBCXYGZhHAinaBiiqYvuDynvahNsAyLFwB3kEHKz1M= go.etcd.io/protodoc v0.0.0-20180829002748-484ab544e116 h1:QQiUXlqz+d96jyNG71NE+IGTgOK6Xlhdx+PzvfbLHlQ= @@ -270,13 +331,17 @@ go.etcd.io/raft/v3 v3.0.0-20221201111702-eaa6808e1f7a h1:Znv2XJyAf/fsJsFNt9toO8u go.etcd.io/raft/v3 v3.0.0-20221201111702-eaa6808e1f7a/go.mod h1:eMshmuwXLWZrjHXN8ZgYrOMQRSbHqi5M84DEZWhG+o4= go.mongodb.org/mongo-driver v1.7.3 h1:G4l/eYY9VrQAK/AUgkV0koQKzQnyddnWxrd/Etf0jIs= go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= +golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a h1:Jw5wfR+h9mnIYH+OtGT2im5wV1YGGDora5vTv/aa5bE= golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= @@ -297,9 +362,11 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= @@ -328,11 +395,13 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -348,6 +417,7 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= @@ -355,6 +425,7 @@ golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -388,15 +459,30 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884 h1:fiNLklpBwWK1mth30Hlwk+fcdBmIALlgF5iy77O37Ig= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20220706185917-7780775163c4 h1:7YDGQC/0sigNGzsEWyb9s72jTxlFdwVEYNJHbfQ+Dtg= +google.golang.org/genproto v0.0.0-20220706185917-7780775163c4/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -410,6 +496,7 @@ gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod h1:N1eN2tsCx gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -427,5 +514,7 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.4.3 h1:o/n5/K5gXqk8Gozvs2cnL0F2S1/g1vcGCAx2vETjITw= honnef.co/go/tools v0.4.3/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= +k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= +k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= mvdan.cc/unparam v0.0.0-20220316160445-06cc5682983b h1:C8Pi6noat8BcrL9WnSRYeQ63fpkJk3hKVHtF5731kIw= mvdan.cc/unparam v0.0.0-20220316160445-06cc5682983b/go.mod h1:WqFWCt8MGPoFSYGsQSiIORRlYVhkJsIk+n2MY6rhNbA= diff --git a/tools/mod/tools.go b/tools/mod/tools.go index 5a7e375d1..2b809612b 100644 --- a/tools/mod/tools.go +++ b/tools/mod/tools.go @@ -23,6 +23,8 @@ package tools import ( _ "github.com/alexkohler/nakedret" _ "github.com/chzchzchz/goword" + _ "github.com/cloudflare/cfssl/cmd/cfssl" + _ "github.com/cloudflare/cfssl/cmd/cfssljson" _ "github.com/coreos/license-bill-of-materials" _ "github.com/google/addlicense" _ "github.com/gordonklaus/ineffassign"