github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #60376 from mikedanese/fixup

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 60376, 55584, 60358, 54631, 60291). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

remove gcloud docker -- since it's deprecated

docker handles this now and it raises an error.

try 3

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-02-28 03:37:21 -08:00 committed by GitHub
commit 5be121aca7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/build-image/cross/Makefile
View File

@ -24,4 +24,4 @@ build:
docker build --pull -t staging-k8s.gcr.io/$(IMAGE):$(TAG) . docker build --pull -t staging-k8s.gcr.io/$(IMAGE):$(TAG) .
push: build push: build
gcloud docker -- push staging-k8s.gcr.io/$(IMAGE):$(TAG) docker push staging-k8s.gcr.io/$(IMAGE):$(TAG)

2
build/debian-base/Makefile
View File

@ -71,7 +71,7 @@ endif
rm -rf $(TEMP_DIR) rm -rf $(TEMP_DIR)
push: build push: build
gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) docker push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
clean: clean:
docker rmi -f $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) || true docker rmi -f $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) || true

2
build/debian-hyperkube-base/Makefile
View File

@ -57,4 +57,4 @@ endif
rm -rf $(TEMP_DIR) rm -rf $(TEMP_DIR)
push: build push: build
gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) docker push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)

2
build/debian-iptables/Makefile
View File

@ -55,6 +55,6 @@ endif
docker build --pull -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR) docker build --pull -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR)
push: build push: build
gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) docker push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
all: push all: push

2
build/pause/Makefile
View File

@ -91,7 +91,7 @@ container: .container-$(ARCH)
push: .push-$(ARCH) push: .push-$(ARCH)
.push-$(ARCH): .container-$(ARCH) .push-$(ARCH): .container-$(ARCH)
gcloud docker -- push $(IMAGE_WITH_ARCH):$(TAG) docker push $(IMAGE_WITH_ARCH):$(TAG)
touch $@ touch $@
# Useful for testing, not automatically included in container image # Useful for testing, not automatically included in container image

4
cluster/addons/addon-manager/Makefile
View File

@ -46,12 +46,12 @@ build:
docker build --pull -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR) docker build --pull -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR)
push: build push: build
gcloud docker -- push $(IMAGE)-$(ARCH):$(VERSION) docker push $(IMAGE)-$(ARCH):$(VERSION)
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
# Backward compatibility. TODO: deprecate this image tag # Backward compatibility. TODO: deprecate this image tag
docker rmi $(IMAGE):$(VERSION) 2>/dev/null || true docker rmi $(IMAGE):$(VERSION) 2>/dev/null || true
docker tag $(IMAGE)-$(ARCH):$(VERSION) $(IMAGE):$(VERSION) docker tag $(IMAGE)-$(ARCH):$(VERSION) $(IMAGE):$(VERSION)
gcloud docker -- push $(IMAGE):$(VERSION) docker push $(IMAGE):$(VERSION)
endif endif
clean: clean:

2
cluster/addons/fluentd-elasticsearch/es-image/Makefile
View File

@ -22,7 +22,7 @@ build:
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
push: push:
gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG) docker push $(PREFIX)/$(IMAGE):$(TAG)
binary: binary:
CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-w" elasticsearch_logging_discovery.go CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-w" elasticsearch_logging_discovery.go

2
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View File

@ -22,4 +22,4 @@ build:
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
push: push:
gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG) docker push $(PREFIX)/$(IMAGE):$(TAG)

2
cluster/addons/python-image/Makefile
View File

@ -21,5 +21,5 @@ build:
docker build --pull -t "$(IMAGE):$(VERSION)" . docker build --pull -t "$(IMAGE):$(VERSION)" .
push: push:
gcloud docker -- push "$(IMAGE):$(VERSION)" docker push "$(IMAGE):$(VERSION)"

2
cluster/gce/gci/mounter/Makefile
View File

@ -22,7 +22,7 @@ container:
docker build --pull -t ${REGISTRY}/${IMAGE}:${TAG} . docker build --pull -t ${REGISTRY}/${IMAGE}:${TAG} .
push: push:
gcloud docker -- push ${REGISTRY}/${IMAGE}:${TAG} docker push ${REGISTRY}/${IMAGE}:${TAG}
upload: upload:
./stage-upload.sh ${TAG} ${REGISTRY}/${IMAGE}:${TAG} ./stage-upload.sh ${TAG} ${REGISTRY}/${IMAGE}:${TAG}

2
cluster/images/etcd-empty-dir-cleanup/Makefile
View File

@ -29,4 +29,4 @@ build: clean
rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz
push: build push: build
gcloud docker -- push $(IMAGE):$(TAG) docker push $(IMAGE):$(TAG)

2
cluster/images/etcd-version-monitor/Makefile
View File

@ -40,7 +40,7 @@ build:
docker build -t $(IMAGE) $(TEMP_DIR) docker build -t $(IMAGE) $(TEMP_DIR)
push: build push: build
gcloud docker -- push $(IMAGE) docker push $(IMAGE)
all: build all: build

4
cluster/images/etcd/Makefile
View File

@ -108,12 +108,12 @@ endif
docker build --pull -t $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(TEMP_DIR) docker build --pull -t $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(TEMP_DIR)
push: build push: build
gcloud docker -- push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) docker push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG)
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
# Backward compatibility. TODO: deprecate this image tag # Backward compatibility. TODO: deprecate this image tag
docker tag $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(REGISTRY)/etcd:$(REGISTRY_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 endif
ETCD2_ROLLBACK_NEW_TAG=3.0.17 ETCD2_ROLLBACK_NEW_TAG=3.0.17

4
cluster/images/hyperkube/Makefile
View File

@ -45,11 +45,11 @@ endif
rm -rf "${TEMP_DIR}" rm -rf "${TEMP_DIR}"
push: build push: build
gcloud docker -- push ${REGISTRY}/hyperkube-${ARCH}:${VERSION} docker push ${REGISTRY}/hyperkube-${ARCH}:${VERSION}
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
docker rmi ${REGISTRY}/hyperkube:${VERSION} 2>/dev/null || true docker rmi ${REGISTRY}/hyperkube:${VERSION} 2>/dev/null || true
docker tag ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${REGISTRY}/hyperkube:${VERSION} docker tag ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${REGISTRY}/hyperkube:${VERSION}
gcloud docker -- push ${REGISTRY}/hyperkube:${VERSION} docker push ${REGISTRY}/hyperkube:${VERSION}
endif endif
.PHONY: build push all .PHONY: build push all

2
cluster/images/kubemark/Makefile
View File

@ -28,7 +28,7 @@ build:
docker build --pull -t $(REGISTRY)/kubemark:$(IMAGE_TAG) . docker build --pull -t $(REGISTRY)/kubemark:$(IMAGE_TAG) .
gcloudpush: build gcloudpush: build
gcloud docker -- push $(REGISTRY)/kubemark:$(IMAGE_TAG) docker push $(REGISTRY)/kubemark:$(IMAGE_TAG)
push: build push: build
docker -- push $(REGISTRY)/kubemark:$(IMAGE_TAG) docker -- push $(REGISTRY)/kubemark:$(IMAGE_TAG)

4
test/e2e_node/conformance/build/Makefile
View File

@ -76,10 +76,10 @@ endif
docker build --pull -t ${IMAGE_NAME}-${ARCH}:${VERSION} ${TEMP_DIR} docker build --pull -t ${IMAGE_NAME}-${ARCH}:${VERSION} ${TEMP_DIR}
push: build push: build
gcloud docker -- push ${IMAGE_NAME}-${ARCH}:${VERSION} docker push ${IMAGE_NAME}-${ARCH}:${VERSION}
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
docker tag ${IMAGE_NAME}-${ARCH}:${VERSION} ${IMAGE_NAME}:${VERSION} docker tag ${IMAGE_NAME}-${ARCH}:${VERSION} ${IMAGE_NAME}:${VERSION}
gcloud docker -- push ${IMAGE_NAME}:${VERSION} docker push ${IMAGE_NAME}:${VERSION}
endif endif
.PHONY: all .PHONY: all

2
test/images/image-util.sh
View File

@ -97,7 +97,7 @@ push() {
fi fi
for arch in ${archs}; do for arch in ${archs}; do
TAG=$(<${IMAGE}/VERSION) TAG=$(<${IMAGE}/VERSION)
gcloud docker -- push ${REGISTRY}/${IMAGE}-${arch}:${TAG} docker push ${REGISTRY}/${IMAGE}-${arch}:${TAG}
done done
} }

4
test/images/volumes-tester/ceph/Makefile
View File

@ -24,7 +24,7 @@ image:
docker tag $(PREFIX)/volume-ceph $(PREFIX)/volume-ceph:$(TAG) # Add the version tag to the latest image docker tag $(PREFIX)/volume-ceph $(PREFIX)/volume-ceph:$(TAG) # Add the version tag to the latest image
push: image push: image
gcloud docker -- push $(PREFIX)/volume-ceph # Push image tagged as latest to repository 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:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
clean: clean:

4
test/images/volumes-tester/gluster/Makefile
View File

@ -24,7 +24,7 @@ image:
docker tag $(PREFIX)/volume-gluster $(PREFIX)/volume-gluster:$(TAG) # Add the version tag to the latest image docker tag $(PREFIX)/volume-gluster $(PREFIX)/volume-gluster:$(TAG) # Add the version tag to the latest image
push: image push: image
gcloud docker -- push $(PREFIX)/volume-gluster # Push image tagged as latest to repository 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:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
clean: clean:

4
test/images/volumes-tester/iscsi/Makefile
View File

@ -34,8 +34,8 @@ block:
push: image push: image
# Push image tagged as latest to repository # 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) # 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: clean:

4
test/images/volumes-tester/nfs/Makefile
View File

@ -24,7 +24,7 @@ image:
docker tag $(PREFIX)/volume-nfs $(PREFIX)/volume-nfs:$(TAG) # Add the version tag to the latest image docker tag $(PREFIX)/volume-nfs $(PREFIX)/volume-nfs:$(TAG) # Add the version tag to the latest image
push: image push: image
gcloud docker -- push $(PREFIX)/volume-nfs # Push image tagged as latest to repository 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:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
clean: clean:

4
test/images/volumes-tester/rbd/Makefile
View File

@ -34,8 +34,8 @@ block:
push: image push: image
# Push image tagged as latest to repository # 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) # 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: clean:

2
test/images/webhook/Makefile
View File

@ -17,4 +17,4 @@ build:
docker build --no-cache -t gcr.io/kubernetes-e2e-test-images/k8s-sample-admission-webhook-amd64:1.9v1 . docker build --no-cache -t gcr.io/kubernetes-e2e-test-images/k8s-sample-admission-webhook-amd64:1.9v1 .
rm -rf webhook rm -rf webhook
push: 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

8
test/kubemark/start-kubemark.sh
View File

@ -198,6 +198,10 @@ function create-and-upload-hollow-node-image {
exit 1 exit 1
fi fi
echo "Configuring registry authentication"
mkdir -p "${HOME}/.docker"
gcloud beta auth configure-docker -q
echo "Copying kubemark binary to ${MAKE_DIR}" echo "Copying kubemark binary to ${MAKE_DIR}"
cp "${KUBEMARK_BIN}" "${MAKE_DIR}" cp "${KUBEMARK_BIN}" "${MAKE_DIR}"
CURR_DIR=`pwd` 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 # Use bazel rule to create a docker image for hollow-node and upload
# it to the appropriate docker container registry for the cloud provider. # it to the appropriate docker container registry for the cloud provider.
function create-and-upload-hollow-node-image-bazel { function create-and-upload-hollow-node-image-bazel {
echo "Configuring registry authentication"
mkdir -p "${HOME}/.docker"
gcloud beta auth configure-docker -q
RETRIES=3 RETRIES=3
for attempt in $(seq 1 ${RETRIES}); do 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 if ! bazel run //cluster/images/kubemark:push --define REGISTRY="${FULL_REGISTRY}" --define IMAGE_TAG="${KUBEMARK_IMAGE_TAG}"; then