epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-25 19:15:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved wait for Nginx Ingress - this was causing some test flakes

Browse source 
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
This commit is contained in:
Josh Kneubuhl 2022-03-31 10:12:44 -04:00
parent 9df4cdde93
commit 5db297db60
1 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
test-network-k8s/scripts/kind.sh
View file

@ -31,7 +31,7 @@ function load_docker_images() {
} }
function apply_nginx_ingress() { function apply_nginx_ingress() {
push_fn "Launching Nginx ingress controller" push_fn "Launching ingress controller"
# This ingress-nginx.yaml was generated 9/24 from https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml # This ingress-nginx.yaml was generated 9/24 from https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
# with modifications for ssl-passthrough required to launch IBP-support with the nginx ingress. # with modifications for ssl-passthrough required to launch IBP-support with the nginx ingress.
@ -42,12 +42,29 @@ function apply_nginx_ingress() {
pop_fn pop_fn
} }
function install_cert_manager() { function wait_for_nginx_ingress() {
push_fn "Installing cert-manager" push_fn "Waiting for ingress controller"
kubectl wait --namespace ingress-nginx \
--for=condition=ready pod \
--selector=app.kubernetes.io/component=controller \
--timeout=90s
pop_fn
}
function apply_cert_manager() {
push_fn "Launching cert-manager"
# Install cert-manager to manage TLS certificates # Install cert-manager to manage TLS certificates
kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.6.1/cert-manager.yaml kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.6.1/cert-manager.yaml
pop_fn
}
function wait_for_cert_manager() {
push_fn "Waiting for cert-manager"
kubectl -n cert-manager rollout status deploy/cert-manager kubectl -n cert-manager rollout status deploy/cert-manager
kubectl -n cert-manager rollout status deploy/cert-manager-cainjector kubectl -n cert-manager rollout status deploy/cert-manager-cainjector
kubectl -n cert-manager rollout status deploy/cert-manager-webhook kubectl -n cert-manager rollout status deploy/cert-manager-webhook
@ -58,6 +75,9 @@ function install_cert_manager() {
function kind_create() { function kind_create() {
push_fn "Creating cluster \"${CLUSTER_NAME}\"" push_fn "Creating cluster \"${CLUSTER_NAME}\""
# prevent the next kind cluster from using the previous Fabric network's enrollments.
rm -rf $PWD/build
# todo: always delete? Maybe return no-op if the cluster already exists? # todo: always delete? Maybe return no-op if the cluster already exists?
kind delete cluster --name $CLUSTER_NAME kind delete cluster --name $CLUSTER_NAME
@ -157,13 +177,16 @@ function kind_init() {
kind_create kind_create
apply_nginx_ingress apply_nginx_ingress
install_cert_manager apply_cert_manager
launch_docker_registry launch_docker_registry
if [ "${STAGE_DOCKER_IMAGES}" == true ]; then if [ "${STAGE_DOCKER_IMAGES}" == true ]; then
pull_docker_images pull_docker_images
load_docker_images load_docker_images
fi fi
wait_for_cert_manager
wait_for_nginx_ingress
} }
function kind_unkind() { function kind_unkind() {