github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-30 05:43:58 +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
cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
View File

@@ -47,7 +47,7 @@ const (
// DefaultCertificatesDir defines default certificate directory
DefaultCertificatesDir = "/etc/kubernetes/pki"
// DefaultImageRepository defines default image registry
DefaultImageRepository = "k8s.gcr.io"
DefaultImageRepository = "gcr.io/google_containers"
// DefaultManifestsDir defines default manifests directory
DefaultManifestsDir = "/etc/kubernetes/manifests"

2
cmd/kubeadm/app/images/images_test.go
View File

@@ -27,7 +27,7 @@ import (
const (
testversion = "v10.1.2-alpha.1.100+0123456789abcdef+SOMETHING"
expected = "v10.1.2-alpha.1.100_0123456789abcdef_SOMETHING"
gcrPrefix = "k8s.gcr.io"
gcrPrefix = "gcr.io/google_containers"
)
func TestGetCoreImage(t *testing.T) {

18
cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go
View File

@@ -66,7 +66,7 @@ spec:
- --proxy-client-key-file=/etc/kubernetes/pki/front-proxy-client.key
- --authorization-mode=Node,RBAC
- --etcd-servers=http://127.0.0.1:2379
image: k8s.gcr.io/kube-apiserver-amd64:v1.7.4
image: gcr.io/google_containers/kube-apiserver-amd64:v1.7.4
livenessProbe:
failureThreshold: 8
httpGet:
@@ -148,7 +148,7 @@ spec:
- --proxy-client-key-file=/etc/kubernetes/pki/front-proxy-client.key
- --authorization-mode=Node,RBAC
- --etcd-servers=http://127.0.0.1:2379
image: k8s.gcr.io/kube-apiserver-amd64:v1.7.4
image: gcr.io/google_containers/kube-apiserver-amd64:v1.7.4
livenessProbe:
failureThreshold: 8
httpGet:
@@ -220,7 +220,7 @@ spec:
- --cluster-signing-key-file=/etc/kubernetes/pki/ca.key
- --address=127.0.0.1
- --use-service-account-credentials=true
image: k8s.gcr.io/kube-controller-manager-amd64:v1.7.4
image: gcr.io/google_containers/kube-controller-manager-amd64:v1.7.4
livenessProbe:
failureThreshold: 8
httpGet:
@@ -295,7 +295,7 @@ spec:
- --cluster-signing-key-file=/etc/kubernetes/pki/ca.key
- --address=127.0.0.1
- --use-service-account-credentials=true
image: k8s.gcr.io/kube-controller-manager-amd64:v1.7.4
image: gcr.io/google_containers/kube-controller-manager-amd64:v1.7.4
livenessProbe:
failureThreshold: 8
httpGet:
@@ -368,7 +368,7 @@ spec:
- --leader-elect=true
- --kubeconfig=/etc/kubernetes/scheduler.conf
- --address=127.0.0.1
image: k8s.gcr.io/kube-scheduler-amd64:v1.7.4
image: gcr.io/google_containers/kube-scheduler-amd64:v1.7.4
livenessProbe:
failureThreshold: 8
httpGet:
@@ -419,7 +419,7 @@ spec:
- --leader-elect=true
- --kubeconfig=/etc/kubernetes/scheduler.conf
- --address=127.0.0.1
image: k8s.gcr.io/kube-scheduler-amd64:v1.7.4
image: gcr.io/google_containers/kube-scheduler-amd64:v1.7.4
livenessProbe:
failureThreshold: 8
httpGet:
@@ -521,7 +521,7 @@ metadata:
name: testpod
spec:
containers:
- image: k8s.gcr.io/busybox
- image: gcr.io/google_containers/busybox
`,
expectError: false,
},
@@ -537,7 +537,7 @@ spec:
"spec": {
"containers": [
{
"image": "k8s.gcr.io/busybox"
"image": "gcr.io/google_containers/busybox"
}
]
}
@@ -552,7 +552,7 @@ kind: Pod
metadata:
name: testpod
spec:
- image: k8s.gcr.io/busybox
- image: gcr.io/google_containers/busybox
`,
expectError: true,
},

2
cmd/kubeadm/app/phases/upgrade/staticpods_test.go
View File

@@ -61,7 +61,7 @@ etcd:
image: ""
keyFile: ""
featureFlags: null
imageRepository: k8s.gcr.io
imageRepository: gcr.io/google_containers
kubernetesVersion: %s
networking:
dnsDomain: cluster.local

8
cmd/kubeadm/app/util/template_test.go
View File

@@ -22,8 +22,8 @@ import (
const (
validTmpl = "image: {{ .ImageRepository }}/pause-{{ .Arch }}:3.0"
validTmplOut = "image: k8s.gcr.io/pause-amd64:3.0"
doNothing = "image: k8s.gcr.io/pause-amd64:3.0"
validTmplOut = "image: gcr.io/google_containers/pause-amd64:3.0"
doNothing = "image: gcr.io/google_containers/pause-amd64:3.0"
invalidTmpl1 = "{{ .baz }/d}"
invalidTmpl2 = "{{ !foobar }}"
)
@@ -39,7 +39,7 @@ func TestParseTemplate(t *testing.T) {
{
template: validTmpl,
data: struct{ ImageRepository, Arch string }{
ImageRepository: "k8s.gcr.io",
ImageRepository: "gcr.io/google_containers",
Arch: "amd64",
},
output: validTmplOut,
@@ -49,7 +49,7 @@ func TestParseTemplate(t *testing.T) {
{
template: doNothing,
data: struct{ ImageRepository, Arch string }{
ImageRepository: "k8s.gcr.io",
ImageRepository: "gcr.io/google_containers",
Arch: "amd64",
},
output: doNothing,

2
cmd/kubelet/app/options/container_runtime.go
View File

@@ -27,7 +27,7 @@ import (
const (
// When these values are updated, also update test/e2e/framework/util.go
defaultPodSandboxImageName = "k8s.gcr.io/pause"
defaultPodSandboxImageName = "gcr.io/google_containers/pause"
defaultPodSandboxImageVersion = "3.0"
// From pkg/kubelet/rkt/rkt.go to avoid circular import
defaultRktAPIServiceEndpoint = "localhost:15441"