Merge branch 'master' into master

kubernetes-sigs · Apr 17, 2018 · 56ec248 · 56ec248
2 parents 297df04 + 3799ce2
commit 56ec248
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/cloud/google/cmd/gce-machine-controller/Dockerfile b/cloud/google/cmd/gce-machine-controller/Dockerfile
@@ -14,13 +14,13 @@
 
 # Reproducible builder image
 FROM golang:1.10.0 as builder
-WORKDIR /go/src/k8s.io/kube-deploy/cluster-api
+WORKDIR /go/src/sigs.k8s.io/cluster-api
 # This expects that the context passed to the docker build command is
 # the cluster-api directory.
 # e.g. docker build -t <tag> -f <this_Dockerfile> <path_to_cluster-api>
 COPY . . 
 
-RUN CGO_ENABLED=0 GOOS=linux go install -a -ldflags '-extldflags "-static"' k8s.io/kube-deploy/cluster-api/cloud/google/cmd/gce-machine-controller
+RUN CGO_ENABLED=0 GOOS=linux go install -a -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api/cloud/google/cmd/gce-machine-controller
 
 # Final container
 FROM alpine:3.7

diff --git a/cmd/apiserver/Dockerfile b/cmd/apiserver/Dockerfile
@@ -14,13 +14,13 @@
 
 # Reproducible builder image
 FROM golang:1.10.0 as builder
-WORKDIR /go/src/k8s.io/kube-deploy/cluster-api
+WORKDIR /go/src/sigs.k8s.io/cluster-api
 # This expects that the context passed to the docker build command is
 # the cluster-api directory.
 # e.g. docker build -t <tag> -f <this_Dockerfile> <path_to_cluster-api>
 COPY . . 
 
-RUN CGO_ENABLED=0 GOOS=linux go install -a -ldflags '-extldflags "-static"' k8s.io/kube-deploy/cluster-api/cmd/apiserver
+RUN CGO_ENABLED=0 GOOS=linux go install -a -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api/cmd/apiserver
 
 # Final container
 FROM alpine:3.7

diff --git a/cmd/controller-manager/Dockerfile b/cmd/controller-manager/Dockerfile
@@ -14,13 +14,13 @@
 
 # Reproducible builder image
 FROM golang:1.10.0 as builder
-WORKDIR /go/src/k8s.io/kube-deploy/cluster-api
+WORKDIR /go/src/sigs.k8s.io/cluster-api
 # This expects that the context passed to the docker build command is
 # the cluster-api directory.
 # e.g. docker build -t <tag> -f <this_Dockerfile> <path_to_cluster-api>
 COPY . . 
 
-RUN CGO_ENABLED=0 GOOS=linux go install -a -ldflags '-extldflags "-static"' k8s.io/kube-deploy/cluster-api/cmd/controller-manager
+RUN CGO_ENABLED=0 GOOS=linux go install -a -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api/cmd/controller-manager
 
 # Final container
 FROM alpine:3.7

diff --git a/gcp-deployer/.gitignore b/gcp-deployer/.gitignore
@@ -0,0 +1,2 @@
+gcp-deployer
+machines.yaml