scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43157 from msau42/default-sc-test

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 43162, 43157)

Use beta default class annotation for default storageclass tests.

**What this PR does / why we need it**:
The default storageclasses are still installed with the beta annotation, so the test should explicitly use the beta annotation.

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

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-03-15 18:24:21 -07:00
committed by GitHub
parent 5bd730645c 3fd61fbfe1
commit ae828c9c6c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/volume_provisioning.go
View File

@@ -361,12 +361,12 @@ func updateDefaultStorageClass(c clientset.Interface, defaultStr string) {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
if defaultStr == "" { if defaultStr == "" {
delete(sc.Annotations, storageutil.IsDefaultStorageClassAnnotation) delete(sc.Annotations, storageutil.BetaIsDefaultStorageClassAnnotation)
} else { } else {
if sc.Annotations == nil { if sc.Annotations == nil {
sc.Annotations = make(map[string]string) sc.Annotations = make(map[string]string)
} }
sc.Annotations[storageutil.IsDefaultStorageClassAnnotation] = defaultStr sc.Annotations[storageutil.BetaIsDefaultStorageClassAnnotation] = defaultStr
} }
sc, err = c.StorageV1().StorageClasses().Update(sc) sc, err = c.StorageV1().StorageClasses().Update(sc)