Merge pull request #465 from aaronlevy/glide-vendor

Switch to glide for vendoring & bump k8s v1.62 & client-go v3.0.0-beta.0

Author: aaronlevy

Makefile

@@ -53,34 +53,9 @@ conformance-%: clean all
 	@sleep 30 # Give addons a little time to start
 	@cd hack/$*-node && ./conformance-test.sh
 
-#TODO(aaron): the k8s.io/client-go upstream package is a symlink with relative path. Making note because we change symlink path.
-# This will naively try and create a vendor dir from a k8s release
-# USE: make vendor VENDOR_VERSION=vX.Y.Z
-
-#TODO(aaron): Remove etcd-operator-vendor.patch once etcd-operator bumps client-go version
-
-VENDOR_VERSION = v1.6.1+coreos.0
-ETCD_OPERATOR_VERSION = v0.2.4
 vendor:
-	@echo "Creating k8s vendor for: $(VENDOR_VERSION)"
-	@rm -rf vendor
-	@mkdir -p $@/k8s.io/kubernetes
-	@git clone https://github.com/coreos/kubernetes $@/k8s.io/kubernetes > /dev/null 2>&1
-	@cd $@/k8s.io/kubernetes && git checkout $(VENDOR_VERSION) > /dev/null 2>&1
-	@cd $@/k8s.io/kubernetes && rm -rf docs examples hack cluster Godeps
-	@cd $@/k8s.io/kubernetes/vendor && mv k8s.io/* $(abspath $@/k8s.io) && rmdir k8s.io
-	@mv $@/k8s.io/kubernetes/vendor/* $(abspath $@)
-	@cd $@/k8s.io/ && ln -sf kubernetes/staging/src/k8s.io/client-go client-go
-	@cd $@/k8s.io/ && ln -sf kubernetes/staging/src/k8s.io/apimachinery apimachinery
-	@cd $@/k8s.io/ && ln -sf kubernetes/staging/src/k8s.io/apiserver apiserver
-	@rm -rf $@/k8s.io/kubernetes/vendor $@/k8s.io/kubernetes/.git
-	@echo "vendoring etcd-operator spec: $(ETCD_OPERATOR_VERSION)"
-	@git clone https://github.com/coreos/etcd-operator /tmp/etcd-operator > /dev/null 2>&1
-	@cd /tmp/etcd-operator && git checkout $(ETCD_OPERATOR_VERSION) > /dev/null 2>&1
-	@mkdir -p $@/github.com/coreos/etcd-operator/pkg/
-	@cp -r /tmp/etcd-operator/pkg/spec $@/github.com/coreos/etcd-operator/pkg/
-	@rm -rf /tmp/etcd-operator
-	@git apply etcd-operator-vendor.patch
+	@glide update --strip-vendor
+	@glide-vc
 
 clean:
 	rm -rf _output

RELEASING.md

@@ -1,26 +1,29 @@
 # Preparing a bootkube release
 
-### Update kubernetes vendor code
+## Updating Kubernetes Version
 
-- Bump `VENDOR_VERSION` in `Makefile`
-- Run `make vendor`
+### Updating Kubernetes vendor code
 
-### Update hyperkube image
+Vendoring currently relies on the [glide](https://github.com/Masterminds/glide) and [glide-vc](https://github.com/sgotti/glide-vc) tools.
 
-- Update hyperkube image version in templates: `pkg/asset/internal/templates.go`
-- Update on-host kubelet versions (`KUBELET_IMAGE_TAG`)
-    - hack/multi-node/user-data.sample
-    - hack/single-node/user-data.sample
-    - hack/quickstart/kubelet.master
-    - hack/quickstart/kubelet.worker
+- Update pinned versions in `glide.yaml`
+- Run `make vendor`
 
-### Update conformance test k8s version
+### Updating hyperkube image / Kubernetes version
 
-- hack/tests/conformance-test.sh (`CONFORMANCE_VERSION`)
+- Update hyperkube image for manifests in templates:
+    - `pkg/asset/internal/templates.go`
+- Update conformance test version: (`CONFORMANCE_VERSION`)
+    -  `hack/tests/conformance-test.sh`
+- Update on-host kubelet versions (`KUBELET_IMAGE_TAG`)
+    - `hack/multi-node/user-data.sample`
+    - `hack/single-node/user-data.sample`
+    - `hack/quickstart/kubelet.master`
+    - `hack/quickstart/kubelet.worker`
 
-### Run conformance test
+## Run conformance test
 
-Easiest is to use internal jenkins jobs [bootkube-development](https://jenkins.coreos.systems/job/bootkube-development/)
+Easiest is to use internal jenkins job: [bootkube-development](https://jenkins.coreos.systems/job/bootkube-development/)
 
 Or, manually:
 
@@ -48,25 +51,30 @@ git push origin vX.Y.Z
 
 ### Cut a release image
 
-Easiest is to use internal jenkins jobs (`bootkube-release`using release tag). This job will push the image to the quay.io/coreos/bootkube repo, and archive a tarball of binary releases (manually upload to github release)
+Easiest is to use internal jenkins job: [bootkube-release](https://jenkins.coreos.systems/view/Kubernetes/job/bootkube-release/).
+This job will push the image to the quay.io/coreos/bootkube repo, and archive a tarball of binary releases (manually upload to github release)
 
 Or, manually:
 
 ```
 git checkout vX.Y.Z
+make release
 PUSH_IMAGE=true ./build/build-image.sh
 ```
+
 # Updating checkpointer
 
 This only needs to happen when changes have been made to the checkpointer code / container.
 
 ### Build a new checkpointer image
 
-Easiest is to use internal jenkin jobs
+Easiest is to use internal jenkin job: [checkpointer-release](https://jenkins.coreos.systems/view/Kubernetes/job/checkpointer-release/)
 
 Or, manually:
 
 ```
+git checkout master # Checkpointer releases should only be built from commits reachable by master
+make release
 BUILD_IMAGE=checkpoint PUSH_IMAGE=true ./build/build-image.sh
 ```