github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6066 from mattmoor/master 

Move the 'private' (authenticated) image...
pull/6/head
Zach Loafman 2015-03-27 11:54:23 -07:00
parent 70e0fad28c 9400b5b4f2
commit a2801a5a18
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/for-demos/serve_hostname/Makefile
View File

@ -7,9 +7,11 @@ serve_hostname: serve_hostname.go
container: serve_hostname
sudo docker build -t gcr.io/google-containers/serve_hostname:$(TAG) .
sudo docker tag gcr.io/google-containers/serve_hostname:$(TAG) gcr.io/_b_k8s_authenticated_test/serve_hostname:$(TAG)
push:
gcloud preview docker push gcr.io/google-containers/serve_hostname:$(TAG)
gcloud preview docker push gcr.io/_b_k8s_authenticated_test/serve_hostname:$(TAG)
clean:
rm -f serve_hostname

2
test/e2e/rc.go
View File

@ -46,7 +46,7 @@ var _ = Describe("ReplicationController", func() {
It("should serve a basic image on each replica with a private image", func() {
switch testContext.provider {
case "gce", "gke":
ServeImageOrFail(c, "private", "gcr.io/_b_k8s_test/serve_hostname:1.0")
ServeImageOrFail(c, "private", "gcr.io/_b_k8s_authenticated_test/serve_hostname:1.1")
default:
By(fmt.Sprintf("Skipping private variant, which is only supported for providers gce and gke (not %s)",
testContext.provider))