Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
7d823e5d
Commit
7d823e5d
authored
Feb 07, 2019
by
Hemant Kumar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
also remove slow tag from resizing tests
parent
e3faa003
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
11 deletions
+12
-11
config-test.sh
cluster/gce/config-test.sh
+1
-1
mounted_volume_resize.go
test/e2e/storage/mounted_volume_resize.go
+1
-1
volume_expand.go
test/e2e/storage/volume_expand.go
+5
-8
volume_provisioning.go
test/e2e/storage/volume_provisioning.go
+5
-1
No files found.
cluster/gce/config-test.sh
View file @
7d823e5d
...
@@ -368,7 +368,7 @@ if [[ -n "${GCE_GLBC_IMAGE:-}" ]]; then
...
@@ -368,7 +368,7 @@ if [[ -n "${GCE_GLBC_IMAGE:-}" ]]; then
fi
fi
if
[[
-z
"
${
KUBE_ADMISSION_CONTROL
:-}
"
]]
;
then
if
[[
-z
"
${
KUBE_ADMISSION_CONTROL
:-}
"
]]
;
then
ADMISSION_CONTROL
=
"NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,PodPreset,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority,StorageObjectInUseProtection"
ADMISSION_CONTROL
=
"NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,PodPreset,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority,StorageObjectInUseProtection
,PersistentVolumeClaimResize
"
if
[[
"
${
ENABLE_POD_SECURITY_POLICY
:-}
"
==
"true"
]]
;
then
if
[[
"
${
ENABLE_POD_SECURITY_POLICY
:-}
"
==
"true"
]]
;
then
ADMISSION_CONTROL
=
"
${
ADMISSION_CONTROL
}
,PodSecurityPolicy"
ADMISSION_CONTROL
=
"
${
ADMISSION_CONTROL
}
,PodSecurityPolicy"
fi
fi
...
...
test/e2e/storage/mounted_volume_resize.go
View file @
7d823e5d
...
@@ -35,7 +35,7 @@ import (
...
@@ -35,7 +35,7 @@ import (
"k8s.io/kubernetes/test/e2e/storage/utils"
"k8s.io/kubernetes/test/e2e/storage/utils"
)
)
var
_
=
utils
.
SIGDescribe
(
"Mounted volume expand
[Slow]
"
,
func
()
{
var
_
=
utils
.
SIGDescribe
(
"Mounted volume expand"
,
func
()
{
var
(
var
(
c
clientset
.
Interface
c
clientset
.
Interface
ns
string
ns
string
...
...
test/e2e/storage/volume_expand.go
View file @
7d823e5d
...
@@ -40,7 +40,7 @@ const (
...
@@ -40,7 +40,7 @@ const (
totalResizeWaitPeriod
=
20
*
time
.
Minute
totalResizeWaitPeriod
=
20
*
time
.
Minute
)
)
var
_
=
utils
.
SIGDescribe
(
"Volume expand
[Slow]
"
,
func
()
{
var
_
=
utils
.
SIGDescribe
(
"Volume expand"
,
func
()
{
var
(
var
(
c
clientset
.
Interface
c
clientset
.
Interface
ns
string
ns
string
...
@@ -78,9 +78,8 @@ var _ = utils.SIGDescribe("Volume expand [Slow]", func() {
...
@@ -78,9 +78,8 @@ var _ = utils.SIGDescribe("Volume expand [Slow]", func() {
It
(
"should not allow expansion of pvcs without AllowVolumeExpansion property"
,
func
()
{
It
(
"should not allow expansion of pvcs without AllowVolumeExpansion property"
,
func
()
{
test
:=
testsuites
.
StorageClassTest
{
test
:=
testsuites
.
StorageClassTest
{
Name
:
"no-expansion"
,
Name
:
"no-expansion"
,
ClaimSize
:
"2Gi"
,
ClaimSize
:
"2Gi"
,
AllowVolumeExpansion
:
false
,
}
}
regularSC
,
err
:=
createStorageClass
(
test
,
ns
,
"noexpand"
,
c
)
regularSC
,
err
:=
createStorageClass
(
test
,
ns
,
"noexpand"
,
c
)
Expect
(
err
)
.
NotTo
(
HaveOccurred
(),
"Error creating non-expandable storage class"
)
Expect
(
err
)
.
NotTo
(
HaveOccurred
(),
"Error creating non-expandable storage class"
)
...
@@ -88,9 +87,7 @@ var _ = utils.SIGDescribe("Volume expand [Slow]", func() {
...
@@ -88,9 +87,7 @@ var _ = utils.SIGDescribe("Volume expand [Slow]", func() {
defer
func
()
{
defer
func
()
{
framework
.
ExpectNoError
(
c
.
StorageV1
()
.
StorageClasses
()
.
Delete
(
regularSC
.
Name
,
nil
))
framework
.
ExpectNoError
(
c
.
StorageV1
()
.
StorageClasses
()
.
Delete
(
regularSC
.
Name
,
nil
))
}()
}()
Expect
(
regularSC
.
AllowVolumeExpansion
)
.
To
(
BeNil
())
Expect
(
regularSC
.
AllowVolumeExpansion
)
.
NotTo
(
BeNil
())
Expect
(
*
resizableSc
.
AllowVolumeExpansion
)
.
To
(
BeFalse
())
noExpandPVC
:=
newClaim
(
test
,
ns
,
"noexpand"
)
noExpandPVC
:=
newClaim
(
test
,
ns
,
"noexpand"
)
noExpandPVC
.
Spec
.
StorageClassName
=
&
regularSC
.
Name
noExpandPVC
.
Spec
.
StorageClassName
=
&
regularSC
.
Name
...
@@ -108,7 +105,7 @@ var _ = utils.SIGDescribe("Volume expand [Slow]", func() {
...
@@ -108,7 +105,7 @@ var _ = utils.SIGDescribe("Volume expand [Slow]", func() {
By
(
"Expanding non-expandable pvc"
)
By
(
"Expanding non-expandable pvc"
)
newSize
:=
resource
.
MustParse
(
"6Gi"
)
newSize
:=
resource
.
MustParse
(
"6Gi"
)
pvc
,
err
=
expandPVCSize
(
noExpandPVC
,
newSize
,
c
)
noExpandPVC
,
err
=
expandPVCSize
(
noExpandPVC
,
newSize
,
c
)
Expect
(
err
)
.
To
(
HaveOccurred
(),
"While updating non-expandable PVC"
)
Expect
(
err
)
.
To
(
HaveOccurred
(),
"While updating non-expandable PVC"
)
})
})
...
...
test/e2e/storage/volume_provisioning.go
View file @
7d823e5d
...
@@ -1063,7 +1063,11 @@ func newStorageClass(t testsuites.StorageClassTest, ns string, suffix string) *s
...
@@ -1063,7 +1063,11 @@ func newStorageClass(t testsuites.StorageClassTest, ns string, suffix string) *s
if
t
.
DelayBinding
{
if
t
.
DelayBinding
{
bindingMode
=
storage
.
VolumeBindingWaitForFirstConsumer
bindingMode
=
storage
.
VolumeBindingWaitForFirstConsumer
}
}
return
getStorageClass
(
pluginName
,
t
.
Parameters
,
&
bindingMode
,
ns
,
suffix
)
sc
:=
getStorageClass
(
pluginName
,
t
.
Parameters
,
&
bindingMode
,
ns
,
suffix
)
if
t
.
AllowVolumeExpansion
{
sc
.
AllowVolumeExpansion
=
&
t
.
AllowVolumeExpansion
}
return
sc
}
}
func
getStorageClass
(
func
getStorageClass
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment