github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67351 from mkimuram/issue/67269

Browse Source 
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>.

Change rbd base image back to fedora 26

Due to the compatiblility issue for ceph server, it needs to change
back to fedora 26 from fedora 28, as a workaround.

**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 #67269

**Special notes for your reviewer**:
/sig storage
@dims @rootfs

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-08-20 19:13:52 -07:00 committed by GitHub
commit 80382044ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/images/volume/rbd/BASEIMAGE
View File

@ -1,3 +1,3 @@
amd64=fedora:28
arm64=arm64v8/fedora:28
ppc64le=ppc64le/fedora:28
amd64=fedora:26
arm64=arm64v8/fedora:26
ppc64le=ppc64le/fedora:26

2
test/images/volume/rbd/VERSION
View File

@ -1 +1 @@
1.0
1.0.1

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

@ -89,7 +89,7 @@ var (
VolumeNFSServer = ImageConfig{e2eRegistry, "volume/nfs", "1.0"}
VolumeISCSIServer = ImageConfig{e2eRegistry, "volume/iscsi", "1.0"}
VolumeGlusterServer = ImageConfig{e2eRegistry, "volume/gluster", "1.0"}
VolumeRBDServer = ImageConfig{e2eRegistry, "volume/rbd", "1.0"}
VolumeRBDServer = ImageConfig{e2eRegistry, "volume/rbd", "1.0.1"}
)
func GetE2EImage(image ImageConfig) string {