From 2cf46731aaa650180c37c52ebc4e4c4da8a893f5 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Tue, 5 Jul 2016 11:51:15 -0400 Subject: [PATCH] Makefile improvements Fix some paths; don't try to push to production buckets. Reorganize protokube into the main Makefile --- Makefile | 33 +++++++++++-- .../protokube-builder}/Dockerfile | 2 +- .../protokube-builder}/onbuild.sh | 8 ++-- .../images => images}/protokube/Dockerfile | 4 +- protokube/Makefile | 22 --------- protokube/glide.lock | 46 ------------------- protokube/glide.yaml | 15 ------ 7 files changed, 36 insertions(+), 94 deletions(-) rename {protokube/images/builder => images/protokube-builder}/Dockerfile (90%) rename {protokube/images/builder => images/protokube-builder}/onbuild.sh (58%) rename {protokube/images => images}/protokube/Dockerfile (79%) delete mode 100644 protokube/Makefile delete mode 100644 protokube/glide.lock delete mode 100644 protokube/glide.yaml diff --git a/Makefile b/Makefile index f0b6202b42..3f7ade3421 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,9 @@ -gocode: godeps +all: gocode + +DOCKER_REGISTRY=gcr.io/must-override/ +S3_BUCKET=s3://must-override/ + +gocode: GO15VENDOREXPERIMENT=1 go install k8s.io/kops/cmd/... ln -sfn ${GOPATH}/src/k8s.io/kops/upup/models/ ${GOPATH}/bin/models @@ -26,7 +31,7 @@ kops-tar: gocode rm -rf .build/kops/tar mkdir -p .build/kops/tar/kops/ cp ${GOPATH}/bin/kops .build/kops/tar/kops/kops - cp -r models/ .build/kops/tar/kops/models/ + cp -r upup/models/ .build/kops/tar/kops/models/ tar czvf .build/kops.tar.gz -C .build/kops/tar/ . tar tvf .build/kops.tar.gz (sha1sum .build/kops.tar.gz | cut -d' ' -f1) > .build/kops.tar.gz.sha1 @@ -35,7 +40,7 @@ nodeup-tar: gocode rm -rf .build/nodeup/tar mkdir -p .build/nodeup/tar/nodeup/root cp ${GOPATH}/bin/nodeup .build/nodeup/tar/nodeup/root - cp -r models/nodeup/ .build/nodeup/tar/nodeup/root/model/ + cp -r upup/models/nodeup/ .build/nodeup/tar/nodeup/root/model/ tar czvf .build/nodeup.tar.gz -C .build/nodeup/tar/ . tar tvf .build/nodeup.tar.gz (sha1sum .build/nodeup.tar.gz | cut -d' ' -f1) > .build/nodeup.tar.gz.sha1 @@ -48,7 +53,7 @@ upload: nodeup-tar kops-tar mkdir -p .build/s3/kops cp .build/kops.tar.gz .build/s3/kops/kops-1.3.tar.gz cp .build/kops.tar.gz.sha1 .build/s3/kops/kops-1.3.tar.gz.sha1 - aws s3 sync --acl public-read .build/s3/ s3://kubeupv2/ + aws s3 sync --acl public-read .build/s3/ ${S3_BUCKET} push: nodeup-tar scp .build/nodeup.tar.gz ${TARGET}:/tmp/ @@ -65,3 +70,23 @@ push-gce-run: push push-aws-run: push ssh ${TARGET} sudo SKIP_PACKAGE_UPDATE=1 /var/cache/kubernetes-install/nodeup/root/nodeup --conf=/var/cache/kubernetes-install/kube_env.yaml --v=8 --model=/var/cache/kubernetes-install/nodeup/root/model + + + +protokube-gocode: + go install k8s.io/kops/protokube/cmd/protokube + +protokube-builder-image: + docker build -f images/protokube-builder/Dockerfile -t protokube-builder . + +protokube-build-in-docker: protokube-builder-image + docker run -it -v `pwd`:/src protokube-builder /onbuild.sh + +protokube-image: protokube-build-in-docker + docker build -t ${DOCKER_REGISTRY}/protokube:1.3 -f images/protokube/Dockerfile . + +protokube-push: protokube-image + docker push ${DOCKER_REGISTRY}/protokube:1.3 + + + diff --git a/protokube/images/builder/Dockerfile b/images/protokube-builder/Dockerfile similarity index 90% rename from protokube/images/builder/Dockerfile rename to images/protokube-builder/Dockerfile index e8471317a4..0b74026d09 100644 --- a/protokube/images/builder/Dockerfile +++ b/images/protokube-builder/Dockerfile @@ -11,4 +11,4 @@ ENV PATH $PATH:/usr/local/go/bin # Install glide RUN curl -L https://github.com/Masterminds/glide/releases/download/0.10.2/glide-0.10.2-linux-amd64.tar.gz | tar zx --strip-components 1 -C /usr/bin -COPY images/builder/onbuild.sh /onbuild.sh +COPY images/protokube-builder/onbuild.sh /onbuild.sh diff --git a/protokube/images/builder/onbuild.sh b/images/protokube-builder/onbuild.sh similarity index 58% rename from protokube/images/builder/onbuild.sh rename to images/protokube-builder/onbuild.sh index a0bde72f37..d4515f5020 100755 --- a/protokube/images/builder/onbuild.sh +++ b/images/protokube-builder/onbuild.sh @@ -3,13 +3,13 @@ mkdir -p /go export GOPATH=/go -mkdir -p /go/src/k8s.io/kops -ln -s /src/ /go/src/k8s.io/kops/protokube +mkdir -p /go/src/k8s.io +ln -s /src/ /go/src/k8s.io/kops ls -lR /go/src/k8s.io/kops/protokube/cmd/ -cd /go/src/k8s.io/kops/protokube/ -make gocode +cd /go/src/k8s.io/kops/ +make protokube-gocode mkdir -p /src/.build/artifacts/ cp /go/bin/protokube /src/.build/artifacts/ diff --git a/protokube/images/protokube/Dockerfile b/images/protokube/Dockerfile similarity index 79% rename from protokube/images/protokube/Dockerfile rename to images/protokube/Dockerfile index e9474b3e84..25269c937f 100644 --- a/protokube/images/protokube/Dockerfile +++ b/images/protokube/Dockerfile @@ -4,8 +4,8 @@ FROM debian:jessie # e2fsprogs: Needed to mount / format ext4 filesytems RUN apt-get update && apt-get install --yes ca-certificates e2fsprogs -COPY model/ /model/ -COPY templates/ /templates/ +COPY protokube/model/ /model/ +COPY protokube/templates/ /templates/ COPY /.build/artifacts/protokube /usr/bin/protokube CMD /usr/bin/protokube diff --git a/protokube/Makefile b/protokube/Makefile deleted file mode 100644 index 8cfc3d8c56..0000000000 --- a/protokube/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -gocode: godeps - go install k8s.io/kops/protokube/cmd/protokube - -godeps: - # I think strip-vendor is the workaround for 25572 - glide install --strip-vendor --strip-vcs - -gofmt: - gofmt -w -s cmd/ - gofmt -w -s pkg/ - -builder-image: - docker build -f images/builder/Dockerfile -t builder . - -build-in-docker: builder-image - docker run -it -v `pwd`:/src builder /onbuild.sh - -image: build-in-docker - docker build -t kope/protokube:1.3 -f images/protokube/Dockerfile . - -push: image - docker push kope/protokube:1.3 diff --git a/protokube/glide.lock b/protokube/glide.lock deleted file mode 100644 index e6ba164bbe..0000000000 --- a/protokube/glide.lock +++ /dev/null @@ -1,46 +0,0 @@ -hash: 212c116624840fbcaaf42e4f11b9f159e3426b8dffbb8b7747a1615ea68e7fb5 -updated: 2016-06-05T15:03:24.971484029-04:00 -imports: -- name: github.com/aws/aws-sdk-go - version: c924893c38ecc04b18d7aab8a7aa561cb8b4c4cc - subpackages: - - aws - - aws/ec2metadata - - aws/request - - aws/session - - service/ec2 - - service/route53 - - aws/awserr - - aws/credentials - - aws/client - - aws/client/metadata - - aws/awsutil - - aws/corehandlers - - aws/defaults - - private/endpoints - - private/protocol - - private/protocol/ec2query - - private/signer/v4 - - private/waiter - - private/protocol/restxml - - aws/credentials/ec2rolecreds - - private/protocol/query/queryutil - - private/protocol/xml/xmlutil - - private/protocol/rest - - private/protocol/query -- name: github.com/cloudfoundry-incubator/candiedyaml - version: 99c3df83b51532e3615f851d8c2dbb638f5313bf -- name: github.com/ghodss/yaml - version: aa0c862057666179de291b67d9f093d12b5a8473 -- name: github.com/go-ini/ini - version: 2e44421e256d82ebbf3d4d4fcabe8930b905eff3 -- name: github.com/golang/glog - version: 23def4e6c14b4da8ac2ed8007337bc5eb5007998 -- name: github.com/jmespath/go-jmespath - version: 3433f3ea46d9f8019119e7dd41274e112a2359a9 -- name: k8s.io/kubernetes - version: 56af9acd6f0a36f974fe8a9d0bd06049b14d5d19 - subpackages: - - pkg/util/exec - - pkg/util/mount -devImports: [] diff --git a/protokube/glide.yaml b/protokube/glide.yaml deleted file mode 100644 index c80119c2b1..0000000000 --- a/protokube/glide.yaml +++ /dev/null @@ -1,15 +0,0 @@ -package: k8s.io/kops/protokube -import: -- package: github.com/aws/aws-sdk-go - subpackages: - - aws - - aws/ec2metadata - - aws/request - - aws/session - - service/ec2 -- package: github.com/golang/glog -- package: k8s.io/kubernetes - subpackages: - - pkg/util/exec - - pkg/util/mount -- package: github.com/ghodss/yaml