Skip to content

Commit

Permalink
Merge pull request #54174 from thockin/gcr-vanity
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 54379, 56593, 56685, 54174, 57309). 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>.

Use k8s.gcr.io vanity domain for container images

Related issue: kubernetes/release#281

```release-note
Use "k8s.gcr.io" for container images rather than "gcr.io/google_containers".  This is just a redirect, for now, so should not impact anyone materially.

Documentation and tools should all convert to the new name. Users should take note of this in case they see this new name in the system.
```

Kubernetes-commit: e5abffca6f91d42fb5ae97b28fa6683e4244c12b
  • Loading branch information
k8s-publishing-bot committed Dec 18, 2017
2 parents 3b9b65a + daa7dc2 commit 1afd21c
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
42 changes: 21 additions & 21 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/v1/generated.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -3906,7 +3906,7 @@ type PodSignature struct {
// Describe a container image
type ContainerImage struct {
// Names by which this image is known.
// e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]
// e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]
Names []string `json:"names" protobuf:"bytes,1,rep,name=names"`
// The size of the image in bytes.
// +optional
Expand Down
2 changes: 1 addition & 1 deletion core/v1/types_swagger_doc_generated.go
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ func (Container) SwaggerDoc() map[string]string {

var map_ContainerImage = map[string]string{
"": "Describe a container image",
"names": "Names by which this image is known. e.g. [\"gcr.io/google_containers/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]",
"names": "Names by which this image is known. e.g. [\"k8s.gcr.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]",
"sizeBytes": "The size of the image in bytes.",
}

Expand Down

0 comments on commit 1afd21c

Please sign in to comment.