Merge pull request #105960 from ueokande/max-unavailable-pdb-tests
test: Assert max unavailable for PDB test cases Kubernetes-commit: 451e1addd8b09a746ad12b73807966a823737774
This commit is contained in:
commit
a69ce940b6
8
go.mod
8
go.mod
|
@ -31,11 +31,11 @@ require (
|
||||||
github.com/stretchr/testify v1.7.0
|
github.com/stretchr/testify v1.7.0
|
||||||
golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55
|
golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55
|
||||||
gopkg.in/yaml.v2 v2.4.0
|
gopkg.in/yaml.v2 v2.4.0
|
||||||
k8s.io/api v0.0.0-20211104003544-e423bf5bf942
|
k8s.io/api v0.0.0-20211104203923-7979b39b3911
|
||||||
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c
|
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c
|
||||||
k8s.io/cli-runtime v0.0.0-20211104010100-ccbc2faf32b1
|
k8s.io/cli-runtime v0.0.0-20211104010100-ccbc2faf32b1
|
||||||
k8s.io/client-go v0.0.0-20211104003836-6d49694c4453
|
k8s.io/client-go v0.0.0-20211104003836-6d49694c4453
|
||||||
k8s.io/component-base v0.0.0-20211104004413-91797e1d1ca8
|
k8s.io/component-base v0.0.0-20211104205040-9025b85fb213
|
||||||
k8s.io/component-helpers v0.0.0-20211104004528-10364a9c8a37
|
k8s.io/component-helpers v0.0.0-20211104004528-10364a9c8a37
|
||||||
k8s.io/klog/v2 v2.30.0
|
k8s.io/klog/v2 v2.30.0
|
||||||
k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8
|
k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8
|
||||||
|
@ -47,12 +47,12 @@ require (
|
||||||
)
|
)
|
||||||
|
|
||||||
replace (
|
replace (
|
||||||
k8s.io/api => k8s.io/api v0.0.0-20211104003544-e423bf5bf942
|
k8s.io/api => k8s.io/api v0.0.0-20211104203923-7979b39b3911
|
||||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c
|
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c
|
||||||
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211104010100-ccbc2faf32b1
|
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20211104010100-ccbc2faf32b1
|
||||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20211104003836-6d49694c4453
|
k8s.io/client-go => k8s.io/client-go v0.0.0-20211104003836-6d49694c4453
|
||||||
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211104003136-1003036828ea
|
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211104003136-1003036828ea
|
||||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20211104004413-91797e1d1ca8
|
k8s.io/component-base => k8s.io/component-base v0.0.0-20211104205040-9025b85fb213
|
||||||
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211104004528-10364a9c8a37
|
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20211104004528-10364a9c8a37
|
||||||
k8s.io/metrics => k8s.io/metrics v0.0.0-20211104005934-41e325c1dbcb
|
k8s.io/metrics => k8s.io/metrics v0.0.0-20211104005934-41e325c1dbcb
|
||||||
)
|
)
|
||||||
|
|
8
go.sum
8
go.sum
|
@ -902,8 +902,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
|
||||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||||
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||||
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||||
k8s.io/api v0.0.0-20211104003544-e423bf5bf942 h1:mpDzWVE2CzzB+Gdd47PbeTXsSU6OMA46XtIOkw2I0QE=
|
k8s.io/api v0.0.0-20211104203923-7979b39b3911 h1:KKASx2y52X9MofhS6vOnUdLGgz+CH8/OxZrJsG7lnk4=
|
||||||
k8s.io/api v0.0.0-20211104003544-e423bf5bf942/go.mod h1:Y3aSuR3Z7RwvAGbnpQ1+oBIWgAIxvlHcaUCVUzOgpuo=
|
k8s.io/api v0.0.0-20211104203923-7979b39b3911/go.mod h1:Y3aSuR3Z7RwvAGbnpQ1+oBIWgAIxvlHcaUCVUzOgpuo=
|
||||||
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c h1:18i+Svc8AQt2tsHgUJjMgipgIRROqVsdttom0N2URHQ=
|
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c h1:18i+Svc8AQt2tsHgUJjMgipgIRROqVsdttom0N2URHQ=
|
||||||
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c/go.mod h1:NdmIf2dMPBkkSfPmCDRbThro3RAWWypv6x+CttBbMto=
|
k8s.io/apimachinery v0.0.0-20211104003341-94020522c95c/go.mod h1:NdmIf2dMPBkkSfPmCDRbThro3RAWWypv6x+CttBbMto=
|
||||||
k8s.io/cli-runtime v0.0.0-20211104010100-ccbc2faf32b1 h1:KR+VHGOl0iye0Eu9fyPtJU3UtOLniYbA352RpzZGBvM=
|
k8s.io/cli-runtime v0.0.0-20211104010100-ccbc2faf32b1 h1:KR+VHGOl0iye0Eu9fyPtJU3UtOLniYbA352RpzZGBvM=
|
||||||
|
@ -911,8 +911,8 @@ k8s.io/cli-runtime v0.0.0-20211104010100-ccbc2faf32b1/go.mod h1:wHnWmk7jRQ9sQtUh
|
||||||
k8s.io/client-go v0.0.0-20211104003836-6d49694c4453 h1:5555+BsEXvnsDKnNtMm4pL5Jf9x4HBN96ZZ9cQ5Wt9c=
|
k8s.io/client-go v0.0.0-20211104003836-6d49694c4453 h1:5555+BsEXvnsDKnNtMm4pL5Jf9x4HBN96ZZ9cQ5Wt9c=
|
||||||
k8s.io/client-go v0.0.0-20211104003836-6d49694c4453/go.mod h1:XlENrFN0KamgreLfijzwed9BylToe+dU63vC+0pl4/M=
|
k8s.io/client-go v0.0.0-20211104003836-6d49694c4453/go.mod h1:XlENrFN0KamgreLfijzwed9BylToe+dU63vC+0pl4/M=
|
||||||
k8s.io/code-generator v0.0.0-20211104003136-1003036828ea/go.mod h1:wgD40ts/jbentZZcVvzzscrjJ2IoTSNJXfeVJxytQvU=
|
k8s.io/code-generator v0.0.0-20211104003136-1003036828ea/go.mod h1:wgD40ts/jbentZZcVvzzscrjJ2IoTSNJXfeVJxytQvU=
|
||||||
k8s.io/component-base v0.0.0-20211104004413-91797e1d1ca8 h1:L6x6ib3sOlNdnNBMWOfb+5sIExv6Fxo2gn3NIhoTePE=
|
k8s.io/component-base v0.0.0-20211104205040-9025b85fb213 h1:lyyB2OygJtIIBbgpRR2dKm5aue0Aqax/LJDvXBst1bI=
|
||||||
k8s.io/component-base v0.0.0-20211104004413-91797e1d1ca8/go.mod h1:i3cLNE42Rergf0WtAjvBXeMFMCiM70q8HHLQQjzt13Q=
|
k8s.io/component-base v0.0.0-20211104205040-9025b85fb213/go.mod h1:GiuGF3WbM9lKQ32U85f+z0vIRD1J3vAg3My8kBvmbOA=
|
||||||
k8s.io/component-helpers v0.0.0-20211104004528-10364a9c8a37 h1:HChfMuubDXGdPLqEbz5iFrAa85fvlkTzKQsVVEtr4/I=
|
k8s.io/component-helpers v0.0.0-20211104004528-10364a9c8a37 h1:HChfMuubDXGdPLqEbz5iFrAa85fvlkTzKQsVVEtr4/I=
|
||||||
k8s.io/component-helpers v0.0.0-20211104004528-10364a9c8a37/go.mod h1:qHturFtBnqFM3naRrwJ3vyLHJ4ETBgLkekFc97N2nVc=
|
k8s.io/component-helpers v0.0.0-20211104004528-10364a9c8a37/go.mod h1:qHturFtBnqFM3naRrwJ3vyLHJ4ETBgLkekFc97N2nVc=
|
||||||
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
||||||
|
|
|
@ -132,8 +132,8 @@ func TestCreatePdb(t *testing.T) {
|
||||||
minAvailableNumber := intstr.Parse(podAmountNumber)
|
minAvailableNumber := intstr.Parse(podAmountNumber)
|
||||||
minAvailablePercent := intstr.Parse(podAmountPercent)
|
minAvailablePercent := intstr.Parse(podAmountPercent)
|
||||||
|
|
||||||
minUnavailableNumber := intstr.Parse(podAmountNumber)
|
maxUnavailableNumber := intstr.Parse(podAmountNumber)
|
||||||
minUnavailablePercent := intstr.Parse(podAmountPercent)
|
maxUnavailablePercent := intstr.Parse(podAmountPercent)
|
||||||
|
|
||||||
tests := map[string]struct {
|
tests := map[string]struct {
|
||||||
options *PodDisruptionBudgetOpts
|
options *PodDisruptionBudgetOpts
|
||||||
|
@ -183,7 +183,7 @@ func TestCreatePdb(t *testing.T) {
|
||||||
options: &PodDisruptionBudgetOpts{
|
options: &PodDisruptionBudgetOpts{
|
||||||
Name: "my-pdb",
|
Name: "my-pdb",
|
||||||
Selector: selectorOpts,
|
Selector: selectorOpts,
|
||||||
MinAvailable: podAmountNumber,
|
MaxUnavailable: podAmountNumber,
|
||||||
},
|
},
|
||||||
expected: &policyv1.PodDisruptionBudget{
|
expected: &policyv1.PodDisruptionBudget{
|
||||||
TypeMeta: metav1.TypeMeta{
|
TypeMeta: metav1.TypeMeta{
|
||||||
|
@ -195,7 +195,7 @@ func TestCreatePdb(t *testing.T) {
|
||||||
},
|
},
|
||||||
Spec: policyv1.PodDisruptionBudgetSpec{
|
Spec: policyv1.PodDisruptionBudgetSpec{
|
||||||
Selector: selector,
|
Selector: selector,
|
||||||
MinAvailable: &minUnavailableNumber,
|
MaxUnavailable: &maxUnavailableNumber,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -203,7 +203,7 @@ func TestCreatePdb(t *testing.T) {
|
||||||
options: &PodDisruptionBudgetOpts{
|
options: &PodDisruptionBudgetOpts{
|
||||||
Name: "my-pdb",
|
Name: "my-pdb",
|
||||||
Selector: selectorOpts,
|
Selector: selectorOpts,
|
||||||
MinAvailable: podAmountPercent,
|
MaxUnavailable: podAmountPercent,
|
||||||
},
|
},
|
||||||
expected: &policyv1.PodDisruptionBudget{
|
expected: &policyv1.PodDisruptionBudget{
|
||||||
TypeMeta: metav1.TypeMeta{
|
TypeMeta: metav1.TypeMeta{
|
||||||
|
@ -215,7 +215,7 @@ func TestCreatePdb(t *testing.T) {
|
||||||
},
|
},
|
||||||
Spec: policyv1.PodDisruptionBudgetSpec{
|
Spec: policyv1.PodDisruptionBudgetSpec{
|
||||||
Selector: selector,
|
Selector: selector,
|
||||||
MinAvailable: &minUnavailablePercent,
|
MaxUnavailable: &maxUnavailablePercent,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue