Merge pull request #44 from pwittrock/toml

Make release Gopkg.toml version match the tag of the release

Author: Phillip Wittrock

Gopkg.toml

@@ -12,9 +12,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-# Uncomment to update deps with dep tool
- ignored = ["github.com/kubernetes-sigs/kubebuilder","github.com/kubernetes-sigs/kubebuilder/cmd"]
-
 # Packages required by users
 required = ["github.com/kubernetes-sig-testing/frameworks/integration",
             "k8s.io/client-go/plugin/pkg/client/auth",
@@ -23,10 +20,9 @@ required = ["github.com/kubernetes-sig-testing/frameworks/integration",
 [prune]
   go-tests = true
 
-# Comment to update deps with dep tool
-#[[constraint]]
-#  version = "v1.9-alpha.25"
-#  name = "github.com/kubernetes-sigs/kubebuilder"
+[[constraint]]
+  version = "KUBEBUILDER_VERSION"
+  name = "github.com/kubernetes-sigs/kubebuilder"
 
 [[constraint]]
   name = "github.com/golang/glog"

build/build_vendor.sh

@@ -23,4 +23,5 @@ cp /workspace/LICENSE /workspace/vendor/github.com/kubernetes-sigs/kubebuilder/L
 
 export DEST=/workspace/_output/kubebuilder/bin/
 mkdir -p $DEST || echo ""
+sed -i "s/KUBEBUILDER_VERSION/"${VERSION-master}"/" Gopkg.toml
 tar -czvf $DEST/vendor.tar.gz vendor/ Gopkg.lock  Gopkg.toml

cmd/Gopkg.toml

@@ -1,14 +1,9 @@
 # Uncomment to update deps with dep tool
-# ignored = ["github.com/kubernetes-sigs/kubebuilder","github.com/kubernetes-sigs/kubebuilder/cmd"]
 
 [prune]
   non-go = true
   go-tests = true
 
-[[constraint]]
-  branch = "release-v1.9-alpha.15"
-  name = "github.com/kubernetes-sigs/kubebuilder"
-
 [[constraint]]
   name = "github.com/emicklei/go-restful"
   revision = "ff4f55a206334ef123e4f79bbf348980da81ca46"