diff --git a/images/kube-deploy/imagebuilder/Dockerfile b/images/kube-deploy/imagebuilder/Dockerfile index fa54fc9346..ed74d1ec97 100644 --- a/images/kube-deploy/imagebuilder/Dockerfile +++ b/images/kube-deploy/imagebuilder/Dockerfile @@ -1,13 +1,13 @@ FROM golang:1.11 AS build -WORKDIR /go/src/k8s.io/kube-deploy/imagebuilder +WORKDIR /go/src/sigs.k8s.io/image-builder/images/kube-deploy/imagebuilder COPY . . RUN CGO_ENABLED=0 GOOS=linux go build FROM alpine:3.8 WORKDIR /imagebuilder RUN apk add --no-cache ca-certificates -COPY --from=build /go/src/k8s.io/kube-deploy/imagebuilder/imagebuilder imagebuilder +COPY --from=build /go/src/sigs.k8s.io/image-builder/images/kube-deploy/imagebuilder/imagebuilder imagebuilder ADD templates/ /imagebuilder/config/templates/ ADD aws*.yaml gce*.yaml /imagebuilder/config/ ENTRYPOINT ["/imagebuilder/imagebuilder"] diff --git a/images/kube-deploy/imagebuilder/Makefile b/images/kube-deploy/imagebuilder/Makefile index bd972fc7ef..d24d902233 100644 --- a/images/kube-deploy/imagebuilder/Makefile +++ b/images/kube-deploy/imagebuilder/Makefile @@ -1,7 +1,7 @@ all: gocode gocode: - go install k8s.io/kube-deploy/imagebuilder + GO111MODULE=on go install sigs.k8s.io/image-builder/images/kube-deploy/imagebuilder gofmt: gofmt -w -s main.go diff --git a/images/kube-deploy/imagebuilder/README.md b/images/kube-deploy/imagebuilder/README.md index d1490490f5..2819a6a4a0 100644 --- a/images/kube-deploy/imagebuilder/README.md +++ b/images/kube-deploy/imagebuilder/README.md @@ -62,14 +62,14 @@ aws ec2 authorize-security-group-ingress --group-id ${SG_ID} --protocol tcp --p Then: ``` -go get k8s.io/kube-deploy/imagebuilder +go get sigs.k8s.io/image-builder/images/kube-deploy/imagebuilder ``` Build code: `make` Run the image builder: ``` -cd ${GOPATH}/src/k8s.io/kube-deploy/imagebuilder` +cd ${GOPATH}/src/sigs.k8s.io/image-builder/images/kube-deploy/imagebuilder` make ${GOPATH}/bin/imagebuilder --config aws.yaml --v=8 ``` @@ -88,12 +88,12 @@ retrieve the image. Then: ``` -go get k8s.io/kube-deploy/imagebuilder +go get sigs.k8s.io/image-builder/images/kube-deploy/imagebuilder ``` Run the image builder: ``` -cd ${GOPATH}/src/k8s.io/kube-deploy/imagebuilder` +cd ${GOPATH}/src/sigs.k8s.io/image-builder/images/kube-deploy/imagebuilder` make ${GOPATH}/bin/imagebuilder --config gce.yaml --v=8 --publish=false ``` diff --git a/images/kube-deploy/imagebuilder/glide.yaml b/images/kube-deploy/imagebuilder/glide.yaml index 80c4974dc5..35188989ce 100644 --- a/images/kube-deploy/imagebuilder/glide.yaml +++ b/images/kube-deploy/imagebuilder/glide.yaml @@ -1,4 +1,4 @@ -package: k8s.io/kube-deploy/imagebuilder +package: sigs.k8s.io/image-builder/images/kube-deploy/imagebuilder import: - package: github.com/aws/aws-sdk-go subpackages: diff --git a/images/kube-deploy/imagebuilder/go.mod b/images/kube-deploy/imagebuilder/go.mod index ee824e1b14..97a513b3d9 100644 --- a/images/kube-deploy/imagebuilder/go.mod +++ b/images/kube-deploy/imagebuilder/go.mod @@ -1,4 +1,4 @@ -module k8s.io/kube-deploy/imagebuilder +module sigs.k8s.io/image-builder/images/kube-deploy/imagebuilder go 1.12 diff --git a/images/kube-deploy/imagebuilder/go.sum b/images/kube-deploy/imagebuilder/go.sum index 7e3b0faffe..8357e46f5c 100644 --- a/images/kube-deploy/imagebuilder/go.sum +++ b/images/kube-deploy/imagebuilder/go.sum @@ -11,7 +11,6 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU github.com/golang/protobuf v0.0.0-20160629211053-3852dcfda249/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 h1:12VvqtR6Aowv3l/EQUlocDHW2Cp4G9WJVH7uyH8QFJE= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -golang.org/x/crypto v0.0.0-20160704103416-0c565bf13221/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f h1:qWFY9ZxP3tfI37wYIs/MnIAqK0vlXp1xnYEa5HxFSSY= golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/net v0.0.0-20160630220910-b400c2eff1ba h1:uDRLy7XWpErbelDDzBrVF4l3MkgIwXtu5nl44tiWpE0= diff --git a/images/kube-deploy/imagebuilder/main.go b/images/kube-deploy/imagebuilder/main.go index 8cb781c3b4..4ab01f26a5 100644 --- a/images/kube-deploy/imagebuilder/main.go +++ b/images/kube-deploy/imagebuilder/main.go @@ -36,10 +36,10 @@ import ( "golang.org/x/crypto/ssh" "golang.org/x/net/context" "golang.org/x/oauth2/google" - "google.golang.org/api/compute/v1" - "google.golang.org/api/storage/v1" - "k8s.io/kube-deploy/imagebuilder/pkg/imagebuilder" - "k8s.io/kube-deploy/imagebuilder/pkg/imagebuilder/executor" + compute "google.golang.org/api/compute/v1" + storage "google.golang.org/api/storage/v1" + "sigs.k8s.io/image-builder/images/kube-deploy/imagebuilder/pkg/imagebuilder" + "sigs.k8s.io/image-builder/images/kube-deploy/imagebuilder/pkg/imagebuilder/executor" ) var flagConfig = flag.String("config", "", "Config file to load") diff --git a/images/kube-deploy/imagebuilder/pkg/imagebuilder/aws.go b/images/kube-deploy/imagebuilder/pkg/imagebuilder/aws.go index b4d7d29e59..68686550af 100644 --- a/images/kube-deploy/imagebuilder/pkg/imagebuilder/aws.go +++ b/images/kube-deploy/imagebuilder/pkg/imagebuilder/aws.go @@ -33,7 +33,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/golang/glog" "golang.org/x/crypto/ssh" - "k8s.io/kube-deploy/imagebuilder/pkg/imagebuilder/executor" + "sigs.k8s.io/image-builder/images/kube-deploy/imagebuilder/pkg/imagebuilder/executor" ) const tagRoleKey = "k8s.io/role/imagebuilder" diff --git a/images/kube-deploy/imagebuilder/pkg/imagebuilder/builder.go b/images/kube-deploy/imagebuilder/pkg/imagebuilder/builder.go index 4edeacc7ad..08aef90864 100644 --- a/images/kube-deploy/imagebuilder/pkg/imagebuilder/builder.go +++ b/images/kube-deploy/imagebuilder/pkg/imagebuilder/builder.go @@ -7,7 +7,7 @@ import ( "os" "path" - "k8s.io/kube-deploy/imagebuilder/pkg/imagebuilder/executor" + "sigs.k8s.io/image-builder/images/kube-deploy/imagebuilder/pkg/imagebuilder/executor" ) type Builder struct { diff --git a/images/kube-deploy/imagebuilder/pkg/imagebuilder/cloud.go b/images/kube-deploy/imagebuilder/pkg/imagebuilder/cloud.go index a866b2afe7..e80d8da980 100644 --- a/images/kube-deploy/imagebuilder/pkg/imagebuilder/cloud.go +++ b/images/kube-deploy/imagebuilder/pkg/imagebuilder/cloud.go @@ -2,7 +2,7 @@ package imagebuilder import ( "golang.org/x/crypto/ssh" - "k8s.io/kube-deploy/imagebuilder/pkg/imagebuilder/executor" + "sigs.k8s.io/image-builder/images/kube-deploy/imagebuilder/pkg/imagebuilder/executor" ) type Cloud interface { diff --git a/images/kube-deploy/imagebuilder/pkg/imagebuilder/gce.go b/images/kube-deploy/imagebuilder/pkg/imagebuilder/gce.go index d670226fb7..f49d47659b 100644 --- a/images/kube-deploy/imagebuilder/pkg/imagebuilder/gce.go +++ b/images/kube-deploy/imagebuilder/pkg/imagebuilder/gce.go @@ -24,7 +24,7 @@ import ( "golang.org/x/crypto/ssh" "google.golang.org/api/compute/v1" "google.golang.org/api/googleapi" - "k8s.io/kube-deploy/imagebuilder/pkg/imagebuilder/executor" + "sigs.k8s.io/image-builder/images/kube-deploy/imagebuilder/pkg/imagebuilder/executor" ) // TODO: We should replace most of this code with a fast-install manifest