8dd912114e
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.
85 lines
2.2 KiB
Bash
Executable file
85 lines
2.2 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
# Copyright 2017 The Kubernetes Authors.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
set -e
|
|
if ! [ -z $DEBUG ]; then
|
|
set -x
|
|
fi
|
|
|
|
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
|
|
|
export NAMESPACE=$1
|
|
export NAMESPACE_OVERLAY=$2
|
|
|
|
echo "deploying NGINX Ingress controller in namespace $NAMESPACE"
|
|
|
|
function on_exit {
|
|
local error_code="$?"
|
|
|
|
test $error_code == 0 && return;
|
|
|
|
echo "Obtaining ingress controller pod logs..."
|
|
kubectl logs -l app.kubernetes.io/name=ingress-nginx -n $NAMESPACE
|
|
}
|
|
trap on_exit EXIT
|
|
|
|
CLUSTER_WIDE="$DIR/cluster-wide-$NAMESPACE"
|
|
|
|
mkdir "$CLUSTER_WIDE"
|
|
|
|
cat << EOF > "$CLUSTER_WIDE/kustomization.yaml"
|
|
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
kind: Kustomization
|
|
bases:
|
|
- ../cluster-wide
|
|
nameSuffix: "-$NAMESPACE"
|
|
EOF
|
|
|
|
OVERLAY="$DIR/overlay-$NAMESPACE"
|
|
|
|
mkdir "$OVERLAY"
|
|
|
|
cat << EOF > "$OVERLAY/kustomization.yaml"
|
|
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
kind: Kustomization
|
|
namespace: $NAMESPACE
|
|
bases:
|
|
- ../overlay
|
|
- ../cluster-wide-$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"
|
|
OVERLAY="$DIR/namespace-overlays/$NAMESPACE"
|
|
mkdir "$OVERLAY"
|
|
cat << EOF > "$OVERLAY/kustomization.yaml"
|
|
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
kind: Kustomization
|
|
namespace: $NAMESPACE
|
|
bases:
|
|
- ../../namespace-overlays/$NAMESPACE_OVERLAY
|
|
- ../../cluster-wide-$NAMESPACE
|
|
EOF
|
|
fi
|
|
|
|
kubectl apply --kustomize "$OVERLAY"
|
|
|
|
# wait for the deployment and fail if there is an error before starting the execution of any test
|
|
kubectl rollout status \
|
|
--request-timeout=3m \
|
|
--namespace $NAMESPACE \
|
|
deployment nginx-ingress-controller
|