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

Merge pull request #66940 from dims/fix-some-test-image-version-and-arch 

Automatic merge from submit-queue. 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>.

Fix some test images - update version and arch

- gb-frontend and gb-redisslave are now *REALLY* multi-arch manifest
lists.
- Fix bad merge from #66066 for AdmissionWebhook

Change-Id: I0995394d638ab00b0d1d30ad7099351b806dfd9d



**What this PR does / why we need it**:

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

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
pull/8/head
Kubernetes Submit Queue 2018-08-03 15:20:02 -07:00 committed by GitHub
parent babdbff848 21fcd1e615
commit 4cd27c3644
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/utils/image/manifest.go
View File

@ -48,7 +48,7 @@ func (i *ImageConfig) SetVersion(version string) {
} }
var ( var (
AdmissionWebhook = ImageConfig{e2eRegistry, "webhook", "1.12v1", true} AdmissionWebhook = ImageConfig{e2eRegistry, "webhook", "1.12v1", false}
APIServer = ImageConfig{e2eRegistry, "sample-apiserver", "1.0", false} APIServer = ImageConfig{e2eRegistry, "sample-apiserver", "1.0", false}
AppArmorLoader = ImageConfig{gcRegistry, "apparmor-loader", "0.1", false} AppArmorLoader = ImageConfig{gcRegistry, "apparmor-loader", "0.1", false}
BusyBox = ImageConfig{gcRegistry, "busybox", "1.24", false} BusyBox = ImageConfig{gcRegistry, "busybox", "1.24", false}
@ -58,8 +58,8 @@ var (
EchoServer = ImageConfig{gcRegistry, "echoserver", "1.10", false} EchoServer = ImageConfig{gcRegistry, "echoserver", "1.10", false}
EntrypointTester = ImageConfig{e2eRegistry, "entrypoint-tester", "1.0", false} EntrypointTester = ImageConfig{e2eRegistry, "entrypoint-tester", "1.0", false}
Fakegitserver = ImageConfig{e2eRegistry, "fakegitserver", "1.0", false} Fakegitserver = ImageConfig{e2eRegistry, "fakegitserver", "1.0", false}
GBFrontend = ImageConfig{sampleRegistry, "gb-frontend", "v5", false} GBFrontend = ImageConfig{sampleRegistry, "gb-frontend", "v6", false}
GBRedisSlave = ImageConfig{sampleRegistry, "gb-redisslave", "v2", false} GBRedisSlave = ImageConfig{sampleRegistry, "gb-redisslave", "v3", false}
Hostexec = ImageConfig{e2eRegistry, "hostexec", "1.1", false} Hostexec = ImageConfig{e2eRegistry, "hostexec", "1.1", false}
IpcUtils = ImageConfig{e2eRegistry, "ipc-utils", "1.0", false} IpcUtils = ImageConfig{e2eRegistry, "ipc-utils", "1.0", false}
Iperf = ImageConfig{e2eRegistry, "iperf", "1.0", false} Iperf = ImageConfig{e2eRegistry, "iperf", "1.0", false}