From f5d1add3c3f22b1fb247488145fd3419c685ff28 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Mon, 5 Feb 2018 17:36:33 -0500 Subject: [PATCH 1/8] Add new vendor submodule for k8s.io client-go --- .gitmodules | 3 +++ vendor/k8s.io/client-go | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 vendor/k8s.io/client-go diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..68bc361 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "vendor/k8s.io/client-go"] + path = vendor/k8s.io/client-go + url = https://github.com/kubernetes/client-go diff --git a/vendor/k8s.io/client-go b/vendor/k8s.io/client-go new file mode 160000 index 0000000..4def128 --- /dev/null +++ b/vendor/k8s.io/client-go @@ -0,0 +1 @@ +Subproject commit 4def1285ff0e4d1fee7cc9e2684ef9923dca591f From 1d8807cc627261161a07be6746a002a189295d7e Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Mon, 5 Feb 2018 17:36:44 -0500 Subject: [PATCH 2/8] Change to the 2.0 release --- vendor/k8s.io/client-go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/k8s.io/client-go b/vendor/k8s.io/client-go index 4def128..668d7ca 160000 --- a/vendor/k8s.io/client-go +++ b/vendor/k8s.io/client-go @@ -1 +1 @@ -Subproject commit 4def1285ff0e4d1fee7cc9e2684ef9923dca591f +Subproject commit 668d7ca6dcbe8882483c3377d7e52f2d7dab18a3 From f1ac91159b6895e280620ac45eab6044fa7aa3d9 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Mon, 5 Feb 2018 17:40:13 -0500 Subject: [PATCH 3/8] Add new vendor submodule for k8s.io apimachinery --- .gitmodules | 3 +++ vendor/k8s.io/apimachinery | 1 + 2 files changed, 4 insertions(+) create mode 160000 vendor/k8s.io/apimachinery diff --git a/.gitmodules b/.gitmodules index 68bc361..c4a72a4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "vendor/k8s.io/client-go"] path = vendor/k8s.io/client-go url = https://github.com/kubernetes/client-go +[submodule "vendor/k8s.io/apimachinery"] + path = vendor/k8s.io/apimachinery + url = https://github.com/kubernetes/apimachinery.git diff --git a/vendor/k8s.io/apimachinery b/vendor/k8s.io/apimachinery new file mode 160000 index 0000000..3311890 --- /dev/null +++ b/vendor/k8s.io/apimachinery @@ -0,0 +1 @@ +Subproject commit 33118901ad38c10b42c14ce12597aaa79f1f6912 From 38d943281c882c1bff94078142c29f7cd94ce064 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Mon, 5 Feb 2018 17:40:26 -0500 Subject: [PATCH 4/8] Change to the 1.6 release --- vendor/k8s.io/apimachinery | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/k8s.io/apimachinery b/vendor/k8s.io/apimachinery index 3311890..35be0db 160000 --- a/vendor/k8s.io/apimachinery +++ b/vendor/k8s.io/apimachinery @@ -1 +1 @@ -Subproject commit 33118901ad38c10b42c14ce12597aaa79f1f6912 +Subproject commit 35be0db31bd6e5635ef6366708dc2b137392f6a2 From c69fd60f1c37db9d0d07278ce5ea1134568247f3 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Mon, 5 Feb 2018 17:40:59 -0500 Subject: [PATCH 5/8] Move Dockerfile to top level dir --- cmd/gcp_service_discovery/Dockerfile => Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename cmd/gcp_service_discovery/Dockerfile => Dockerfile (100%) diff --git a/cmd/gcp_service_discovery/Dockerfile b/Dockerfile similarity index 100% rename from cmd/gcp_service_discovery/Dockerfile rename to Dockerfile From 1bdd42bd8d3fdae98371a9f359a792be1d9531fe Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Mon, 5 Feb 2018 17:44:32 -0500 Subject: [PATCH 6/8] Pin to a known good hash --- vendor/k8s.io/apimachinery | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/k8s.io/apimachinery b/vendor/k8s.io/apimachinery index 35be0db..84c15da 160000 --- a/vendor/k8s.io/apimachinery +++ b/vendor/k8s.io/apimachinery @@ -1 +1 @@ -Subproject commit 35be0db31bd6e5635ef6366708dc2b137392f6a2 +Subproject commit 84c15da65eb86243c295d566203d7689cc6ac04b From 31ccfd97295b7033a9bb13c1ed223047ef730373 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Mon, 5 Feb 2018 17:47:28 -0500 Subject: [PATCH 7/8] Pin to a known good hash --- vendor/k8s.io/client-go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/k8s.io/client-go b/vendor/k8s.io/client-go index 668d7ca..22eca11 160000 --- a/vendor/k8s.io/client-go +++ b/vendor/k8s.io/client-go @@ -1 +1 @@ -Subproject commit 668d7ca6dcbe8882483c3377d7e52f2d7dab18a3 +Subproject commit 22eca115bd15e23ca5e645fbf68e30a8738a23de From 11b767dc519527f94706ac13f18f84f5757d952f Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Mon, 5 Feb 2018 17:49:11 -0500 Subject: [PATCH 8/8] Copy to canonical path, and get all dependent packages --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 663d216..457137f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM golang:1.8 -COPY . /go/src/gcp_service_discovery -RUN go get -v gcp_service_discovery +COPY . /go/src/github.com/m-lab/gcp-service-discovery +RUN go get -v github.com/m-lab/gcp-service-discovery/cmd/gcp_service_discovery ENTRYPOINT ["/go/bin/gcp_service_discovery"]