Skip to content

Commit

Permalink
Update nginx ingress chart
Browse files Browse the repository at this point in the history
* https://charts.helm.sh/stable/ is outdated
* Switch to https://github.com/kubernetes/ingress-nginx provided chart

Signed-off-by: Dinar Valeev <dinar.valeev@absa.africa>
  • Loading branch information
ytsarev authored and k0da committed Apr 9, 2021
1 parent 8b48d7d commit 40c5a58
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,10 @@ define deploy-local-cluster
$(call deploy-k8gb-with-helm,$1,$2,$3,$4)

@echo "\n$(YELLOW)Deploy Ingress $(NC)"
helm repo add --force-update stable https://charts.helm.sh/stable
helm repo add --force-update nginx-stable https://kubernetes.github.io/ingress-nginx
helm repo update
helm -n k8gb upgrade -i nginx-ingress stable/nginx-ingress \
--version 1.41.1 -f deploy/ingress/nginx-ingress-values.yaml
helm -n k8gb upgrade -i nginx-ingress nginx-stable/ingress-nginx \
--version 3.24.0 -f deploy/ingress/nginx-ingress-values.yaml

@echo "\n$(YELLOW)Deploy GSLB cr $(NC)"
kubectl apply -f deploy/crds/test-namespace.yaml
Expand Down Expand Up @@ -433,7 +433,7 @@ endef

# waits for NGINX, GSLB are ready
define wait-for-ingress
kubectl -n k8gb wait --for=condition=Ready pod -l app=nginx-ingress --timeout=600s
kubectl -n k8gb wait --for=condition=Ready pod -l app.kubernetes.io/name=ingress-nginx --timeout=600s
endef

define generate
Expand Down
6 changes: 5 additions & 1 deletion deploy/ingress/nginx-ingress-values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
## nginx configuration
## Ref: https://github.com/kubernetes/ingress/blob/master/controllers/nginx/configuration.md
## Ref: https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx
##
controller:
admissionWebhooks:
enabled: false
patch:
enabled: false
hostNetwork: true

## Use host ports 80 and 443
Expand Down

0 comments on commit 40c5a58

Please sign in to comment.