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

Merge pull request #9887 from brendandburns/gcr2

Browse Source 
switch some more images to gcr for reliability
This commit is contained in:
Saad Ali
2015-06-16 18:57:16 -07:00
parent 30180dbcc2 c3f4b3ff97
commit 10631592dc
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/for-tests/mount-tester/Makefile
View File

@@ -1,15 +1,15 @@
all: push all: push
TAG = 0.1 TAG = 0.2
mt: mt.go mt: mt.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./mt.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./mt.go
image: mt image: mt
sudo docker build -t kubernetes/mounttest:$(TAG) . sudo docker build -t gcr.io/google_containers/mounttest:$(TAG) .
push: image push: image
sudo docker push kubernetes/mounttest:$(TAG) gcloud preview docker push gcr.io/google_containers/mounttest:$(TAG)
clean: clean:
rm -f mt rm -f mt

2
test/e2e/empty_dir.go
View File

@@ -86,7 +86,7 @@ func testPodWithVolume(path string, source *api.EmptyDirVolumeSource) *api.Pod {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: containerName, Name: containerName,
Image: "kubernetes/mounttest:0.1", Image: "gcr.io/google_containers/mounttest:0.2",
VolumeMounts: []api.VolumeMount{ VolumeMounts: []api.VolumeMount{
{ {
Name: volumeName, Name: volumeName,

2
test/e2e/etcd_failure.go
View File

@@ -41,7 +41,7 @@ var _ = Describe("Etcd failure", func() {
Client: framework.Client, Client: framework.Client,
Name: "baz", Name: "baz",
Namespace: framework.Namespace.Name, Namespace: framework.Namespace.Name,
Image: "nginx", Image: "gcr.io/google_containers/nginx",
Replicas: 1, Replicas: 1,
})).NotTo(HaveOccurred()) })).NotTo(HaveOccurred())
}) })

2
test/e2e/host_path.go
View File

@@ -126,7 +126,7 @@ func testPodWithHostVol(path string, source *api.HostPathVolumeSource) *api.Pod
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: containerName, Name: containerName,
Image: "kubernetes/mounttest:0.1", Image: "gcr.io/google_containers/mounttest:0.2",
VolumeMounts: []api.VolumeMount{ VolumeMounts: []api.VolumeMount{
{ {
Name: volumeName, Name: volumeName,

4
test/e2e/pods.go
View File

@@ -570,7 +570,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "gcr.io/google_containers/nginx:1.7.9",
}, },
}, },
}, },
@@ -642,7 +642,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "nginx", Name: "nginx",
Image: "nginx", Image: "gcr.io/google_containers/nginx:1.7.9",
Ports: []api.Port{{ContainerPort: 80}}, Ports: []api.Port{{ContainerPort: 80}},
}, },
}, },

2
test/e2e/secrets.go
View File

@@ -75,7 +75,7 @@ var _ = Describe("Secrets", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "secret-test", Name: "secret-test",
Image: "kubernetes/mounttest:0.1", Image: "gcr.io/google_containers/mounttest:0.2",
Args: []string{ Args: []string{
"--file_content=/etc/secret-volume/data-1", "--file_content=/etc/secret-volume/data-1",
"--file_mode=/etc/secret-volume/data-1"}, "--file_mode=/etc/secret-volume/data-1"},

2
test/e2e/service_accounts.go
View File

@@ -65,7 +65,7 @@ var _ = Describe("ServiceAccounts", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "service-account-test", Name: "service-account-test",
Image: "kubernetes/mounttest:0.1", Image: "gcr.io/google_containers/mounttest:0.2",
Args: []string{ Args: []string{
fmt.Sprintf("--file_content=%s/%s", serviceaccount.DefaultAPITokenMountPath, api.ServiceAccountTokenKey), fmt.Sprintf("--file_content=%s/%s", serviceaccount.DefaultAPITokenMountPath, api.ServiceAccountTokenKey),
}, },