DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add v1.25 test and reduce amount of e2e tests (#9018)

Browse source
This commit is contained in:
Ricardo Katz 2022-09-04 20:22:36 -03:00 • committed by GitHub
parent 92534fa2ae
commit bfd44ab83e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
test/e2e/settings/pod_security_policy.go
View file

@ -19,6 +19,7 @@ package settings
import (
"context"
"net/http"
"strconv"
"strings"
"github.com/onsi/ginkgo/v2"
@ -41,8 +42,22 @@ var _ = framework.IngressNginxDescribe("[Security] Pod Security Policies", func(
f := framework.NewDefaultFramework("pod-security-policies")
ginkgo.It("should be running with a Pod Security Policy", func() {
k8sversion, err := f.KubeClientSet.Discovery().ServerVersion()
if err != nil {
assert.Nil(ginkgo.GinkgoT(), err, "getting version")
}
numversion, err := strconv.Atoi(k8sversion.Minor)
if err != nil {
assert.Nil(ginkgo.GinkgoT(), err, "converting version")
}
if numversion > 24 {
ginkgo.Skip("PSP not supported in this version")
}
psp := createPodSecurityPolicy()
_, err := f.KubeClientSet.PolicyV1beta1().PodSecurityPolicies().Create(context.TODO(), psp, metav1.CreateOptions{})
_, err = f.KubeClientSet.PolicyV1beta1().PodSecurityPolicies().Create(context.TODO(), psp, metav1.CreateOptions{})
if !k8sErrors.IsAlreadyExists(err) {
assert.Nil(ginkgo.GinkgoT(), err, "creating Pod Security Policy")
}

17
test/e2e/settings/pod_security_policy_volumes.go
View file

@ -19,6 +19,7 @@ package settings
import (
"context"
"net/http"
"strconv"
"strings"
"github.com/onsi/ginkgo/v2"
@ -37,8 +38,22 @@ var _ = framework.IngressNginxDescribe("[Security] Pod Security Policies with vo
f := framework.NewDefaultFramework("pod-security-policies-volumes")
ginkgo.It("should be running with a Pod Security Policy", func() {
k8sversion, err := f.KubeClientSet.Discovery().ServerVersion()
if err != nil {
assert.Nil(ginkgo.GinkgoT(), err, "getting version")
}
numversion, err := strconv.Atoi(k8sversion.Minor)
if err != nil {
assert.Nil(ginkgo.GinkgoT(), err, "converting version")
}
if numversion > 24 {
ginkgo.Skip("PSP not supported in this version")
}
psp := createPodSecurityPolicy()
_, err := f.KubeClientSet.PolicyV1beta1().PodSecurityPolicies().Create(context.TODO(), psp, metav1.CreateOptions{})
_, err = f.KubeClientSet.PolicyV1beta1().PodSecurityPolicies().Create(context.TODO(), psp, metav1.CreateOptions{})
if !k8sErrors.IsAlreadyExists(err) {
assert.Nil(ginkgo.GinkgoT(), err, "creating Pod Security Policy")
}