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

Migration e2e installation to helm (#5086)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-02-16 11:58:37 -03:00 • committed by GitHub
parent 4b5c39e97b
commit 37c24b0df5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 321 additions and 725 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/e2e/settings/customize_health_check_path.go
View file

@ -30,10 +30,10 @@ var _ = framework.IngressNginxDescribe("Customize health check path", func() {
f := framework.NewDefaultFramework("custom-health-check-path")
Context("with a plain HTTP ingress", func() {
It("should return HTTP/1.1 200 OK on custom health check path and port", func() {
It("should return HTTP/1.1 200 OK on custom health port", func() {
f.WaitForNginxConfiguration(func(server string) bool {
return strings.Contains(server, "location /not-healthz")
return strings.Contains(server, "location /healthz")
})
err := framework.WaitForPodsReady(f.KubeClientSet, framework.DefaultTimeout, 1, f.Namespace, metav1.ListOptions{

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

@ -17,7 +17,6 @@ limitations under the License.
package settings
import (
"fmt"
"net/http"
"strings"
@ -49,7 +48,7 @@ var _ = framework.IngressNginxDescribe("Pod Security Policies", func() {
Expect(err).NotTo(HaveOccurred(), "creating Pod Security Policy")
}
role, err := f.KubeClientSet.RbacV1().ClusterRoles().Get(fmt.Sprintf("nginx-ingress-clusterrole-%v", f.Namespace), metav1.GetOptions{})
role, err := f.KubeClientSet.RbacV1().Roles(f.Namespace).Get("nginx-ingress-controller", metav1.GetOptions{})
Expect(err).NotTo(HaveOccurred(), "getting ingress controller cluster role")
Expect(role).NotTo(BeNil())
@ -60,7 +59,7 @@ var _ = framework.IngressNginxDescribe("Pod Security Policies", func() {
Verbs: []string{"use"},
})
_, err = f.KubeClientSet.RbacV1().ClusterRoles().Update(role)
_, err = f.KubeClientSet.RbacV1().Roles(f.Namespace).Update(role)
Expect(err).NotTo(HaveOccurred(), "updating ingress controller cluster role to use a pod security policy")
// update the deployment just to trigger a rolling update and the use of the security policy

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

@ -17,7 +17,6 @@ limitations under the License.
package settings
import (
"fmt"
"net/http"
"strings"
@ -45,7 +44,7 @@ var _ = framework.IngressNginxDescribe("Pod Security Policies with volumes", fun
Expect(err).NotTo(HaveOccurred(), "creating Pod Security Policy")
}
role, err := f.KubeClientSet.RbacV1().ClusterRoles().Get(fmt.Sprintf("nginx-ingress-clusterrole-%v", f.Namespace), metav1.GetOptions{})
role, err := f.KubeClientSet.RbacV1().Roles(f.Namespace).Get("nginx-ingress-controller", metav1.GetOptions{})
Expect(err).NotTo(HaveOccurred(), "getting ingress controller cluster role")
Expect(role).NotTo(BeNil())
@ -56,7 +55,7 @@ var _ = framework.IngressNginxDescribe("Pod Security Policies with volumes", fun
Verbs: []string{"use"},
})
_, err = f.KubeClientSet.RbacV1().ClusterRoles().Update(role)
_, err = f.KubeClientSet.RbacV1().Roles(f.Namespace).Update(role)
Expect(err).NotTo(HaveOccurred(), "updating ingress controller cluster role to use a pod security policy")
err = framework.UpdateDeployment(f.KubeClientSet, f.Namespace, "nginx-ingress-controller", 1,