diff --git a/build/dev-env.sh b/build/dev-env.sh index 774e3c0b2..48e59b38b 100755 --- a/build/dev-env.sh +++ b/build/dev-env.sh @@ -107,13 +107,7 @@ controller: config: worker-processes: "1" podLabels: - app.kubernetes.io/name: ingress-nginx - app.kubernetes.io/part-of: ingress-nginx deploy-date: "$(date +%s)" - service: - labels: - app.kubernetes.io/name: ingress-nginx - app.kubernetes.io/part-of: ingress-nginx updateStrategy: type: RollingUpdate rollingUpdate: diff --git a/go.sum b/go.sum index 311d901ae..b4b8bde5f 100644 --- a/go.sum +++ b/go.sum @@ -181,6 +181,7 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/zapr v0.1.0 h1:h+WVe9j6HAA01niTJPA/kKH0i7e0rLZBCwauQFcRE54= github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= @@ -694,6 +695,7 @@ go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qL go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= diff --git a/test/e2e-image/namespace-overlays/custom-health-check-path/values.yaml b/test/e2e-image/namespace-overlays/custom-health-check-path/values.yaml index d2f7b9d8f..8e1897013 100644 --- a/test/e2e-image/namespace-overlays/custom-health-check-path/values.yaml +++ b/test/e2e-image/namespace-overlays/custom-health-check-path/values.yaml @@ -1,3 +1,5 @@ +# TODO: remove the need to use fullnameOverride +fullnameOverride: nginx-ingress controller: image: repository: ingress-controller/nginx-ingress-controller @@ -17,17 +19,14 @@ controller: livenessProbe: port: 9090 initialDelaySeconds: 1 - podLabels: - app.kubernetes.io/name: ingress-nginx - app.kubernetes.io/part-of: ingress-nginx service: type: NodePort - labels: - app.kubernetes.io/name: ingress-nginx - app.kubernetes.io/part-of: ingress-nginx + admissionWebhooks: + enabled: false defaultBackend: enabled: false rbac: - create: false + create: true + scope: true diff --git a/test/e2e-image/namespace-overlays/forwarded-port-headers/values.yaml b/test/e2e-image/namespace-overlays/forwarded-port-headers/values.yaml index c83e17287..bea73f316 100644 --- a/test/e2e-image/namespace-overlays/forwarded-port-headers/values.yaml +++ b/test/e2e-image/namespace-overlays/forwarded-port-headers/values.yaml @@ -1,3 +1,5 @@ +# TODO: remove the need to use fullnameOverride +fullnameOverride: nginx-ingress controller: image: repository: ingress-controller/nginx-ingress-controller @@ -17,18 +19,14 @@ controller: config: worker-processes: "1" - podLabels: - app.kubernetes.io/name: ingress-nginx - app.kubernetes.io/part-of: ingress-nginx service: - name: ingress-nginx type: NodePort - labels: - app.kubernetes.io/name: ingress-nginx - app.kubernetes.io/part-of: ingress-nginx + admissionWebhooks: + enabled: false defaultBackend: enabled: false rbac: - create: false + create: true + scope: true diff --git a/test/e2e/framework/exec.go b/test/e2e/framework/exec.go index ee6bfbed0..1e7bedbb1 100644 --- a/test/e2e/framework/exec.go +++ b/test/e2e/framework/exec.go @@ -70,7 +70,7 @@ func (f *Framework) ExecCommand(pod *corev1.Pod, command string) (string, error) execErr bytes.Buffer ) - cmd := exec.Command("/bin/bash", "-c", fmt.Sprintf("%v exec --namespace %s %s --container nginx-ingress-controller -- %s", KubectlPath, pod.Namespace, pod.Name, command)) + cmd := exec.Command("/bin/bash", "-c", fmt.Sprintf("%v exec --namespace %s %s --container controller -- %s", KubectlPath, pod.Namespace, pod.Name, command)) cmd.Stdout = &execOut cmd.Stderr = &execErr diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 228eaaa5c..f4ead58f9 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -72,7 +72,7 @@ func NewDefaultFramework(baseName string) *Framework { if err != nil { panic(err.Error()) } - assert.Nil(ginkgo.GinkgoT(), err, "creting kubernetes API client configuration") + assert.Nil(ginkgo.GinkgoT(), err, "creating kubernetes API client configuration") kubeClient, err := kubernetes.NewForConfig(kubeConfig) assert.Nil(ginkgo.GinkgoT(), err, "creating Kubernetes API client") diff --git a/test/e2e/settings/pod_security_policy.go b/test/e2e/settings/pod_security_policy.go index be7689088..9fabe456f 100644 --- a/test/e2e/settings/pod_security_policy.go +++ b/test/e2e/settings/pod_security_policy.go @@ -46,7 +46,7 @@ var _ = framework.IngressNginxDescribe("[Security] Pod Security Policies", func( assert.Nil(ginkgo.GinkgoT(), err, "creating Pod Security Policy") } - role, err := f.KubeClientSet.RbacV1().Roles(f.Namespace).Get("nginx-ingress-controller", metav1.GetOptions{}) + role, err := f.KubeClientSet.RbacV1().Roles(f.Namespace).Get("nginx-ingress", metav1.GetOptions{}) assert.Nil(ginkgo.GinkgoT(), err, "getting ingress controller cluster role") assert.NotNil(ginkgo.GinkgoT(), role) diff --git a/test/e2e/settings/pod_security_policy_volumes.go b/test/e2e/settings/pod_security_policy_volumes.go index 37e66f75d..ac2d66d4a 100644 --- a/test/e2e/settings/pod_security_policy_volumes.go +++ b/test/e2e/settings/pod_security_policy_volumes.go @@ -42,7 +42,7 @@ var _ = framework.IngressNginxDescribe("[Security] Pod Security Policies with vo assert.Nil(ginkgo.GinkgoT(), err, "creating Pod Security Policy") } - role, err := f.KubeClientSet.RbacV1().Roles(f.Namespace).Get("nginx-ingress-controller", metav1.GetOptions{}) + role, err := f.KubeClientSet.RbacV1().Roles(f.Namespace).Get("nginx-ingress", metav1.GetOptions{}) assert.Nil(ginkgo.GinkgoT(), err, "getting ingress controller cluster role") assert.NotNil(ginkgo.GinkgoT(), role) diff --git a/test/e2e/wait-for-nginx.sh b/test/e2e/wait-for-nginx.sh index 8494ebc2c..c4dff637b 100755 --- a/test/e2e/wait-for-nginx.sh +++ b/test/e2e/wait-for-nginx.sh @@ -36,15 +36,27 @@ function on_exit { } trap on_exit EXIT +cat << EOF | kubectl apply --namespace=$NAMESPACE -f - +# Required for e2e tcp tests +kind: ConfigMap +apiVersion: v1 +metadata: + name: tcp-services + namespace: $NAMESPACE + +EOF + # Use the namespace overlay if it was requested if [[ ! -z "$NAMESPACE_OVERLAY" && -d "$DIR/namespace-overlays/$NAMESPACE_OVERLAY" ]]; then echo "Namespace overlay $NAMESPACE_OVERLAY is being used for namespace $NAMESPACE" - helm install nginx-ingress stable/nginx-ingress \ + helm install nginx-ingress ${DIR}/charts/ingress-nginx \ --namespace=$NAMESPACE \ --wait \ --values "$DIR/namespace-overlays/$NAMESPACE_OVERLAY/values.yaml" else - cat << EOF | helm install nginx-ingress stable/nginx-ingress --namespace=$NAMESPACE --wait --values - + cat << EOF | helm install nginx-ingress ${DIR}/charts/ingress-nginx --namespace=$NAMESPACE --wait --values - +# TODO: remove the need to use fullnameOverride +fullnameOverride: nginx-ingress controller: image: repository: ingress-controller/nginx-ingress-controller @@ -59,14 +71,8 @@ controller: livenessProbe: initialDelaySeconds: 3 periodSeconds: 1 - podLabels: - app.kubernetes.io/name: ingress-nginx - app.kubernetes.io/part-of: ingress-nginx service: type: NodePort - labels: - app.kubernetes.io/name: ingress-nginx - app.kubernetes.io/part-of: ingress-nginx extraArgs: tcp-services-configmap: $NAMESPACE/tcp-services # e2e tests do not require information about ingress status