github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #48494 from mkumatag/webserver

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 48494, 48733)

Move test-webserver from contrib/for-demos to kubernetes/test/images

**What this PR does / why we need it**:
This PR is for
- Moving the https://github.com/kubernetes/contrib/tree/master/for-demos/test-webserver to kubernetes/test/images - Refer https://github.com/kubernetes/contrib/pull/2544 for more information
- Multi architecture support for test-webserver image

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
```
This commit is contained in:
Kubernetes Submit Queue
2017-07-17 08:43:37 -07:00
committed by GitHub
parent 5c32b7d1eb 5447ec97f0
commit 8b39fa9cd1
7 changed files with 132 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.linted_packages
View File

@@ -482,6 +482,7 @@ test/images/port-forward-tester
test/images/porter
test/images/resource-consumer/consume-cpu
test/images/serve-hostname
test/images/test-webserver
test/integration/apiserver
test/integration/client
test/integration/configmap