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

Migrate ingress definitions from extensions to networking.k8s.io

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-12-12 20:12:12 -03:00
parent be1907142b
commit 0dce5be743
49 changed files with 186 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
policyv1beta1 "k8s.io/api/policy/v1beta1"
rbacv1 "k8s.io/api/rbac/v1"
k8sErrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -44,7 +44,7 @@ var _ = framework.IngressNginxDescribe("Pod Security Policies", func() {
BeforeEach(func() {
psp := createPodSecurityPolicy()
_, err := f.KubeClientSet.ExtensionsV1beta1().PodSecurityPolicies().Create(psp)
_, err := f.KubeClientSet.PolicyV1beta1().PodSecurityPolicies().Create(psp)
if !k8sErrors.IsAlreadyExists(err) {
Expect(err).NotTo(HaveOccurred(), "creating Pod Security Policy")
}
@ -92,23 +92,23 @@ var _ = framework.IngressNginxDescribe("Pod Security Policies", func() {
})
})
func createPodSecurityPolicy() *extensions.PodSecurityPolicy {
func createPodSecurityPolicy() *policyv1beta1.PodSecurityPolicy {
trueValue := true
return &extensions.PodSecurityPolicy{
return &policyv1beta1.PodSecurityPolicy{
ObjectMeta: metav1.ObjectMeta{
Name: ingressControllerPSP,
},
Spec: extensions.PodSecurityPolicySpec{
Spec: policyv1beta1.PodSecurityPolicySpec{
AllowPrivilegeEscalation: &trueValue,
RequiredDropCapabilities: []corev1.Capability{"All"},
RunAsUser: extensions.RunAsUserStrategyOptions{
RunAsUser: policyv1beta1.RunAsUserStrategyOptions{
Rule: "RunAsAny",
},
SELinux: extensions.SELinuxStrategyOptions{
SELinux: policyv1beta1.SELinuxStrategyOptions{
Rule: "RunAsAny",
},
FSGroup: extensions.FSGroupStrategyOptions{
Ranges: []extensions.IDRange{
FSGroup: policyv1beta1.FSGroupStrategyOptions{
Ranges: []policyv1beta1.IDRange{
{
Min: 1,
Max: 65535,
@ -116,8 +116,8 @@ func createPodSecurityPolicy() *extensions.PodSecurityPolicy {
},
Rule: "MustRunAs",
},
SupplementalGroups: extensions.SupplementalGroupsStrategyOptions{
Ranges: []extensions.IDRange{
SupplementalGroups: policyv1beta1.SupplementalGroupsStrategyOptions{
Ranges: []policyv1beta1.IDRange{
{
Min: 1,
Max: 65535,