github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 13:12:20 +00:00
Code Issues Projects Releases Wiki Activity

Revert k8s.gcr.io vanity domain

Browse Source 
This reverts commit eba5b6092a.

Fixes https://github.com/kubernetes/kubernetes/issues/57526
This commit is contained in:
Tim Hockin
2017-12-22 14:36:16 -08:00
parent 475d5c32e8
commit e9dd8a68f6
233 changed files with 470 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
IMAGE=k8s.gcr.io/kube-addon-manager
IMAGE=gcr.io/google-containers/kube-addon-manager
ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d)
VERSION=v8.4

12
cluster/addons/addon-manager/README.md
View File

@@ -40,20 +40,20 @@ The `addon-manager` is built for multiple architectures.
```console
# Build for linux/amd64 (default)
$ make push ARCH=amd64
# ---> k8s.gcr.io/kube-addon-manager-amd64:VERSION
# ---> k8s.gcr.io/kube-addon-manager:VERSION (image with backwards-compatible naming)
# ---> gcr.io/google-containers/kube-addon-manager-amd64:VERSION
# ---> gcr.io/google-containers/kube-addon-manager:VERSION (image with backwards-compatible naming)
$ make push ARCH=arm
# ---> k8s.gcr.io/kube-addon-manager-arm:VERSION
# ---> gcr.io/google-containers/kube-addon-manager-arm:VERSION
$ make push ARCH=arm64
# ---> k8s.gcr.io/kube-addon-manager-arm64:VERSION
# ---> gcr.io/google-containers/kube-addon-manager-arm64:VERSION
$ make push ARCH=ppc64le
# ---> k8s.gcr.io/kube-addon-manager-ppc64le:VERSION
# ---> gcr.io/google-containers/kube-addon-manager-ppc64le:VERSION
$ make push ARCH=s390x
# ---> k8s.gcr.io/kube-addon-manager-s390x:VERSION
# ---> gcr.io/google-containers/kube-addon-manager-s390x:VERSION
```
If you don't want to push the images, run `make` or `make build` instead