From c0b73645637c248091358a37c7e99bfcfc983f71 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Fri, 23 Feb 2018 21:54:24 -0800 Subject: [PATCH] remove gcloud docker -- since it's deprecated --- build/build-image/cross/Makefile | 2 +- build/debian-base/Makefile | 2 +- build/debian-hyperkube-base/Makefile | 2 +- build/debian-iptables/Makefile | 2 +- build/pause/Makefile | 2 +- cluster/addons/addon-manager/Makefile | 4 ++-- cluster/addons/fluentd-elasticsearch/es-image/Makefile | 2 +- .../fluentd-elasticsearch/fluentd-es-image/Makefile | 2 +- cluster/addons/python-image/Makefile | 2 +- cluster/gce/gci/mounter/Makefile | 2 +- cluster/images/etcd-empty-dir-cleanup/Makefile | 2 +- cluster/images/etcd-version-monitor/Makefile | 2 +- cluster/images/etcd/Makefile | 4 ++-- cluster/images/hyperkube/Makefile | 4 ++-- cluster/images/kubemark/Makefile | 2 +- test/e2e_node/conformance/build/Makefile | 4 ++-- test/images/image-util.sh | 2 +- test/images/volumes-tester/ceph/Makefile | 4 ++-- test/images/volumes-tester/gluster/Makefile | 4 ++-- test/images/volumes-tester/iscsi/Makefile | 4 ++-- test/images/volumes-tester/nfs/Makefile | 4 ++-- test/images/volumes-tester/rbd/Makefile | 4 ++-- test/images/webhook/Makefile | 2 +- test/kubemark/start-kubemark.sh | 8 ++++++++ 24 files changed, 40 insertions(+), 32 deletions(-) diff --git a/build/build-image/cross/Makefile b/build/build-image/cross/Makefile index fb49f3f2d0..2c3e51cb0a 100644 --- a/build/build-image/cross/Makefile +++ b/build/build-image/cross/Makefile @@ -24,4 +24,4 @@ build: docker build --pull -t staging-k8s.gcr.io/$(IMAGE):$(TAG) . push: build - gcloud docker -- push staging-k8s.gcr.io/$(IMAGE):$(TAG) + docker push staging-k8s.gcr.io/$(IMAGE):$(TAG) diff --git a/build/debian-base/Makefile b/build/debian-base/Makefile index 51513ca50e..a2b2241e94 100755 --- a/build/debian-base/Makefile +++ b/build/debian-base/Makefile @@ -71,7 +71,7 @@ endif rm -rf $(TEMP_DIR) push: build - gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) + docker push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) clean: docker rmi -f $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) || true diff --git a/build/debian-hyperkube-base/Makefile b/build/debian-hyperkube-base/Makefile index 3309a50d11..3b6f63e0a1 100644 --- a/build/debian-hyperkube-base/Makefile +++ b/build/debian-hyperkube-base/Makefile @@ -57,4 +57,4 @@ endif rm -rf $(TEMP_DIR) push: build - gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) + docker push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) diff --git a/build/debian-iptables/Makefile b/build/debian-iptables/Makefile index 62f42b1ed5..0c9988a59d 100644 --- a/build/debian-iptables/Makefile +++ b/build/debian-iptables/Makefile @@ -55,6 +55,6 @@ endif docker build --pull -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR) push: build - gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) + docker push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) all: push diff --git a/build/pause/Makefile b/build/pause/Makefile index 807973fcff..92b0f40b16 100644 --- a/build/pause/Makefile +++ b/build/pause/Makefile @@ -91,7 +91,7 @@ container: .container-$(ARCH) push: .push-$(ARCH) .push-$(ARCH): .container-$(ARCH) - gcloud docker -- push $(IMAGE_WITH_ARCH):$(TAG) + docker push $(IMAGE_WITH_ARCH):$(TAG) touch $@ # Useful for testing, not automatically included in container image diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile index a58d02084b..69648cf14b 100644 --- a/cluster/addons/addon-manager/Makefile +++ b/cluster/addons/addon-manager/Makefile @@ -46,12 +46,12 @@ build: docker build --pull -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR) push: build - gcloud docker -- push $(IMAGE)-$(ARCH):$(VERSION) + docker push $(IMAGE)-$(ARCH):$(VERSION) ifeq ($(ARCH),amd64) # Backward compatibility. TODO: deprecate this image tag docker rmi $(IMAGE):$(VERSION) 2>/dev/null || true docker tag $(IMAGE)-$(ARCH):$(VERSION) $(IMAGE):$(VERSION) - gcloud docker -- push $(IMAGE):$(VERSION) + docker push $(IMAGE):$(VERSION) endif clean: diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Makefile b/cluster/addons/fluentd-elasticsearch/es-image/Makefile index 28f55a4a4a..be7ba47df1 100755 --- a/cluster/addons/fluentd-elasticsearch/es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/es-image/Makefile @@ -22,7 +22,7 @@ build: docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) . push: - gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG) + docker push $(PREFIX)/$(IMAGE):$(TAG) binary: CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-w" elasticsearch_logging_discovery.go diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile index 3e07bdeb35..59b9f155c2 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile @@ -22,4 +22,4 @@ build: docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) . push: - gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG) + docker push $(PREFIX)/$(IMAGE):$(TAG) diff --git a/cluster/addons/python-image/Makefile b/cluster/addons/python-image/Makefile index f23f924706..a073ac49db 100644 --- a/cluster/addons/python-image/Makefile +++ b/cluster/addons/python-image/Makefile @@ -21,5 +21,5 @@ build: docker build --pull -t "$(IMAGE):$(VERSION)" . push: - gcloud docker -- push "$(IMAGE):$(VERSION)" + docker push "$(IMAGE):$(VERSION)" diff --git a/cluster/gce/gci/mounter/Makefile b/cluster/gce/gci/mounter/Makefile index 85ee3343d8..98ebf9ae16 100644 --- a/cluster/gce/gci/mounter/Makefile +++ b/cluster/gce/gci/mounter/Makefile @@ -22,7 +22,7 @@ container: docker build --pull -t ${REGISTRY}/${IMAGE}:${TAG} . push: - gcloud docker -- push ${REGISTRY}/${IMAGE}:${TAG} + docker push ${REGISTRY}/${IMAGE}:${TAG} upload: ./stage-upload.sh ${TAG} ${REGISTRY}/${IMAGE}:${TAG} diff --git a/cluster/images/etcd-empty-dir-cleanup/Makefile b/cluster/images/etcd-empty-dir-cleanup/Makefile index 3c6c1c89ba..cdf53e2563 100644 --- a/cluster/images/etcd-empty-dir-cleanup/Makefile +++ b/cluster/images/etcd-empty-dir-cleanup/Makefile @@ -29,4 +29,4 @@ build: clean rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz push: build - gcloud docker -- push $(IMAGE):$(TAG) + docker push $(IMAGE):$(TAG) diff --git a/cluster/images/etcd-version-monitor/Makefile b/cluster/images/etcd-version-monitor/Makefile index 837cba43e3..0c019322b2 100644 --- a/cluster/images/etcd-version-monitor/Makefile +++ b/cluster/images/etcd-version-monitor/Makefile @@ -40,7 +40,7 @@ build: docker build -t $(IMAGE) $(TEMP_DIR) push: build - gcloud docker -- push $(IMAGE) + docker push $(IMAGE) all: build diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index f0477d4555..e5795b7977 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -108,12 +108,12 @@ endif docker build --pull -t $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(TEMP_DIR) push: build - gcloud docker -- push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) + docker push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) ifeq ($(ARCH),amd64) # Backward compatibility. TODO: deprecate this image tag docker tag $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(REGISTRY)/etcd:$(REGISTRY_TAG) - gcloud docker -- push $(REGISTRY)/etcd:$(REGISTRY_TAG) + docker push $(REGISTRY)/etcd:$(REGISTRY_TAG) endif ETCD2_ROLLBACK_NEW_TAG=3.0.17 diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index bd2c4005e6..32c3735116 100644 --- a/cluster/images/hyperkube/Makefile +++ b/cluster/images/hyperkube/Makefile @@ -45,11 +45,11 @@ endif rm -rf "${TEMP_DIR}" push: build - gcloud docker -- push ${REGISTRY}/hyperkube-${ARCH}:${VERSION} + docker push ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ifeq ($(ARCH),amd64) docker rmi ${REGISTRY}/hyperkube:${VERSION} 2>/dev/null || true docker tag ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${REGISTRY}/hyperkube:${VERSION} - gcloud docker -- push ${REGISTRY}/hyperkube:${VERSION} + docker push ${REGISTRY}/hyperkube:${VERSION} endif .PHONY: build push all diff --git a/cluster/images/kubemark/Makefile b/cluster/images/kubemark/Makefile index e005a90d80..7cba455a47 100644 --- a/cluster/images/kubemark/Makefile +++ b/cluster/images/kubemark/Makefile @@ -28,7 +28,7 @@ build: docker build --pull -t $(REGISTRY)/kubemark:$(IMAGE_TAG) . gcloudpush: build - gcloud docker -- push $(REGISTRY)/kubemark:$(IMAGE_TAG) + docker push $(REGISTRY)/kubemark:$(IMAGE_TAG) push: build docker -- push $(REGISTRY)/kubemark:$(IMAGE_TAG) diff --git a/test/e2e_node/conformance/build/Makefile b/test/e2e_node/conformance/build/Makefile index 20d74356af..4275301676 100644 --- a/test/e2e_node/conformance/build/Makefile +++ b/test/e2e_node/conformance/build/Makefile @@ -76,10 +76,10 @@ endif docker build --pull -t ${IMAGE_NAME}-${ARCH}:${VERSION} ${TEMP_DIR} push: build - gcloud docker -- push ${IMAGE_NAME}-${ARCH}:${VERSION} + docker push ${IMAGE_NAME}-${ARCH}:${VERSION} ifeq ($(ARCH),amd64) docker tag ${IMAGE_NAME}-${ARCH}:${VERSION} ${IMAGE_NAME}:${VERSION} - gcloud docker -- push ${IMAGE_NAME}:${VERSION} + docker push ${IMAGE_NAME}:${VERSION} endif .PHONY: all diff --git a/test/images/image-util.sh b/test/images/image-util.sh index d9ff9e31e0..5d9b777b8f 100755 --- a/test/images/image-util.sh +++ b/test/images/image-util.sh @@ -97,7 +97,7 @@ push() { fi for arch in ${archs}; do TAG=$(<${IMAGE}/VERSION) - gcloud docker -- push ${REGISTRY}/${IMAGE}-${arch}:${TAG} + docker push ${REGISTRY}/${IMAGE}-${arch}:${TAG} done } diff --git a/test/images/volumes-tester/ceph/Makefile b/test/images/volumes-tester/ceph/Makefile index 96c9bdbd40..4f282da8e6 100644 --- a/test/images/volumes-tester/ceph/Makefile +++ b/test/images/volumes-tester/ceph/Makefile @@ -24,7 +24,7 @@ image: docker tag $(PREFIX)/volume-ceph $(PREFIX)/volume-ceph:$(TAG) # Add the version tag to the latest image push: image - gcloud docker -- push $(PREFIX)/volume-ceph # Push image tagged as latest to repository - gcloud docker -- push $(PREFIX)/volume-ceph:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag) + docker push $(PREFIX)/volume-ceph # Push image tagged as latest to repository + docker push $(PREFIX)/volume-ceph:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag) clean: diff --git a/test/images/volumes-tester/gluster/Makefile b/test/images/volumes-tester/gluster/Makefile index c4b1654e4f..477078af47 100644 --- a/test/images/volumes-tester/gluster/Makefile +++ b/test/images/volumes-tester/gluster/Makefile @@ -24,7 +24,7 @@ image: docker tag $(PREFIX)/volume-gluster $(PREFIX)/volume-gluster:$(TAG) # Add the version tag to the latest image push: image - gcloud docker -- push $(PREFIX)/volume-gluster # Push image tagged as latest to repository - gcloud docker -- push $(PREFIX)/volume-gluster:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag) + docker push $(PREFIX)/volume-gluster # Push image tagged as latest to repository + docker push $(PREFIX)/volume-gluster:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag) clean: diff --git a/test/images/volumes-tester/iscsi/Makefile b/test/images/volumes-tester/iscsi/Makefile index df13471923..85b6d6b0e9 100644 --- a/test/images/volumes-tester/iscsi/Makefile +++ b/test/images/volumes-tester/iscsi/Makefile @@ -34,8 +34,8 @@ block: push: image # Push image tagged as latest to repository - gcloud docker -- push $(PREFIX)/volume-iscsi + docker push $(PREFIX)/volume-iscsi # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag) - gcloud docker -- push $(PREFIX)/volume-iscsi:$(TAG) + docker push $(PREFIX)/volume-iscsi:$(TAG) clean: diff --git a/test/images/volumes-tester/nfs/Makefile b/test/images/volumes-tester/nfs/Makefile index 1c1fc322e2..363c518aca 100644 --- a/test/images/volumes-tester/nfs/Makefile +++ b/test/images/volumes-tester/nfs/Makefile @@ -24,7 +24,7 @@ image: docker tag $(PREFIX)/volume-nfs $(PREFIX)/volume-nfs:$(TAG) # Add the version tag to the latest image push: image - gcloud docker -- push $(PREFIX)/volume-nfs # Push image tagged as latest to repository - gcloud docker -- push $(PREFIX)/volume-nfs:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag) + docker push $(PREFIX)/volume-nfs # Push image tagged as latest to repository + docker push $(PREFIX)/volume-nfs:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag) clean: diff --git a/test/images/volumes-tester/rbd/Makefile b/test/images/volumes-tester/rbd/Makefile index 27c67f47e2..fc35634606 100644 --- a/test/images/volumes-tester/rbd/Makefile +++ b/test/images/volumes-tester/rbd/Makefile @@ -34,8 +34,8 @@ block: push: image # Push image tagged as latest to repository - gcloud docker -- push $(PREFIX)/volume-rbd + docker push $(PREFIX)/volume-rbd # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag) - gcloud docker -- push $(PREFIX)/volume-rbd:$(TAG) + docker push $(PREFIX)/volume-rbd:$(TAG) clean: diff --git a/test/images/webhook/Makefile b/test/images/webhook/Makefile index d9ce02940e..b2582f416e 100644 --- a/test/images/webhook/Makefile +++ b/test/images/webhook/Makefile @@ -17,4 +17,4 @@ build: docker build --no-cache -t gcr.io/kubernetes-e2e-test-images/k8s-sample-admission-webhook-amd64:1.9v1 . rm -rf webhook push: - gcloud docker -- push gcr.io/kubernetes-e2e-test-images/k8s-sample-admission-webhook-amd64:1.9v1 + docker push gcr.io/kubernetes-e2e-test-images/k8s-sample-admission-webhook-amd64:1.9v1 diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh index 4ba98995d3..15900e4583 100755 --- a/test/kubemark/start-kubemark.sh +++ b/test/kubemark/start-kubemark.sh @@ -198,6 +198,10 @@ function create-and-upload-hollow-node-image { exit 1 fi + echo "Configuring registry authentication" + mkdir -p "${HOME}/.docker" + gcloud beta auth configure-docker -q + echo "Copying kubemark binary to ${MAKE_DIR}" cp "${KUBEMARK_BIN}" "${MAKE_DIR}" CURR_DIR=`pwd` @@ -223,6 +227,10 @@ function create-and-upload-hollow-node-image { # Use bazel rule to create a docker image for hollow-node and upload # it to the appropriate docker container registry for the cloud provider. function create-and-upload-hollow-node-image-bazel { + echo "Configuring registry authentication" + mkdir -p "${HOME}/.docker" + gcloud beta auth configure-docker -q + RETRIES=3 for attempt in $(seq 1 ${RETRIES}); do if ! bazel run //cluster/images/kubemark:push --define REGISTRY="${FULL_REGISTRY}" --define IMAGE_TAG="${KUBEMARK_IMAGE_TAG}"; then