
Resolves issue #4038 where the X-Forwarded-Port header would be set to the value of the https listening port if all of the following settings were satisfied: - The ingress controller was started with a non-default HTTPS port set with the `--https-port` argument - An ingress is created having: - the `nginx.ingress.kubernetes.io/auth-url` annotation set - TLS enabled This commit solves this issue by moving the setting of the `pass_server_port` variable from the server, one level down to the location context.
26 lines
791 B
Docker
26 lines
791 B
Docker
FROM quay.io/kubernetes-ingress-controller/e2e:v06262019-ecce3fd7b AS BASE
|
|
|
|
FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1
|
|
|
|
RUN clean-install \
|
|
ca-certificates \
|
|
bash \
|
|
curl \
|
|
tzdata
|
|
|
|
RUN curl -Lo /usr/local/bin/kubectl \
|
|
https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/amd64/kubectl \
|
|
&& chmod +x /usr/local/bin/kubectl
|
|
|
|
COPY --from=BASE /go/bin/ginkgo /usr/local/bin/
|
|
|
|
COPY e2e.sh /e2e.sh
|
|
COPY cloud-generic /cloud-generic
|
|
COPY cluster-wide /cluster-wide
|
|
COPY overlay /overlay
|
|
COPY namespace-overlays /namespace-overlays
|
|
RUN sed -E -i 's|^- .*deploy/cloud-generic$|- ../cloud-generic|' /overlay/kustomization.yaml
|
|
COPY wait-for-nginx.sh /
|
|
COPY e2e.test /
|
|
|
|
CMD [ "/e2e.sh" ]
|