Skip to content

Commit 4cbc31f

Browse files
mbornemborne
authored
Merge pull request #83 from mborne/79-remove-nginx-ingress-controller
remove nginx-ingress-controller as retirement is announced
2 parents fe16bbd + 37873eb commit 4cbc31f

14 files changed

Lines changed: 18 additions & 1405 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ This is my playground to learn and illustrate how to deploy application with [do
2828
### Load balancer and reverse proxy
2929

3030
* [traefik](traefik/README.md) : A reverse proxy including **configuration discovery** mechanism.
31-
* [nginx-ingress-controller](nginx-ingress-controller/README.md) : A common alternative to [Traefik](traefik/README.md) (**K8S only**).
32-
* [whoami](whoami/README.md) : An helloworld app to test [traefik](traefik/README.md) or [nginx-ingress-controller](nginx-ingress-controller/README.md).
31+
* [whoami](whoami/README.md) : An helloworld app to test [traefik](traefik/README.md).
3332
* [cert-manager](cert-manager/README.md) : An helper to generate TLS certificates from various issuers including LetsEncrypt (**K8S only**)
3433

3534
### Container UI

‎cert-manager/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ metadata:
3030
annotations:
3131
cert-manager.io/cluster-issuer: "mkcert"
3232
spec:
33-
ingressClassName: nginx
33+
ingressClassName: traefik
3434
rules:
3535
- host: whoami.dev.localhost
3636
http:

‎docs/kubernetes.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ For each stack supporting K8S deployment, a `k8s-deploy.sh` helper script is pro
1919

2020
Stacks are created assuming the :
2121

22-
* [traefik](../traefik/README.md) or [nginx-ingress-controller](../nginx-ingress-controller/README.md) is deployed
22+
* [traefik](../traefik/README.md) is deployed
2323
* [cert-manager](../cert-manager/README.md) is deployed with a ClusterIssuer (see helper scripts to create "mkcert", "letsencrypt-http" or "letsencrypt-dns")
2424

2525
The following environment variables provides some option for [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) resources creation :

‎grafana/README.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ Prometheus & Kubernetes :
5858
* [315 - Kubernetes cluster monitoring (via Prometheus)](https://grafana.com/grafana/dashboards/315-kubernetes-cluster-monitoring-via-prometheus/)
5959
* [15758 - Kubernetes / Views / Namespaces](https://grafana.com/grafana/dashboards/15758-kubernetes-views-namespaces/)
6060

61-
Nginx Ingress Controller :
62-
63-
* [12575 - Kubernetes Ingress Controller Dashboard](https://grafana.com/grafana/dashboards/12575-kubernetes-ingress-controller-dashboard/)
64-
6561
Loki :
6662

6763
* [13639 - Logs App](https://grafana.com/grafana/dashboards/13639-logs-app/) for Docker

‎grafana/helm/values.yaml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,7 @@ dashboards:
104104
revision: 4
105105
datasource: Prometheus
106106
editable: true
107-
# https://grafana.com/grafana/dashboards/14314-kubernetes-nginx-ingress-controller-nextgen-devops-nirvana/
108-
nginx-ingress-controller:
109-
gnetId: 14314
110-
revision: 2
111-
datasource: Prometheus
112-
editable: true
107+
113108

114109
# downloadDashboards:
115110
# env:

‎kind/README.md‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@ Helper to create a local [Kubernetes in docker (kind)](https://kind.sigs.k8s.io/
2222
* Optionally install custom CNI (canal or calico)
2323
* Install [metric-server](kind/metric-server/kustomization.yaml)
2424
* Install [cert-manager](../cert-manager/README.md) with a mkcert cluster issuer (if locally available)
25-
* Install [traefik](../traefik/README.md#usage-with-kind) or [nginx-ingress-controller](../nginx-ingress-controller/README.md#usage-with-kind) with kind compatible config
25+
* Install [traefik](../traefik/README.md#usage-with-kind) with kind compatible config
2626
* Install [whoami](../whoami/README.md#usage-with-kubernetes) sample app
2727
* Install [kubernetes-dashboard](../kubernetes-dashboard/README.md#usage-with-kubernetes)
2828

2929
## Parameters
3030

31-
| Name | Description | Default value |
32-
| -------------------------- | ---------------------------------------------------------------------------------------------------------- | ------------------------------- |
33-
| `KIND_CLUSTER_NAME` | The name of the kind cluster | `devbox` |
34-
| `KIND_WORKER_COUNT` | The number of worker node | `3` |
35-
| `KIND_CNI` | Customize CNI using "default", "calico" or "canal" (note that default doesn't supports NetworkPolicies) | `default` |
36-
| `KIND_ADMISSION_PLUGINS` | Allows to customize admission plugins | `NodeRestriction,ResourceQuota` |
37-
| `DEVBOX_INGRESS` (1) | Allows to install either [traefik](../traefik/README.md) or [nginx](../nginx-ingress-controller/README.md) | `traefik` |
38-
| `KIND_INGRESS_READY` | Allows to disable `extraPortMappings` on ports 80 and 443 | `1` |
39-
| `DOCKERHUB_PROXY` | Allows to use a mirror for DockerHub. | `""` |
40-
| `KIND_OIDC_ISSUER_URL` (2) | Allows to enable OIDC authentication | `""` |
31+
| Name | Description | Default value |
32+
| -------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------- |
33+
| `KIND_CLUSTER_NAME` | The name of the kind cluster | `devbox` |
34+
| `KIND_WORKER_COUNT` | The number of worker node | `3` |
35+
| `KIND_CNI` | Customize CNI using "default", "calico" or "canal" (note that default doesn't supports NetworkPolicies) | `default` |
36+
| `KIND_ADMISSION_PLUGINS` | Allows to customize admission plugins | `NodeRestriction,ResourceQuota` |
37+
| `DEVBOX_INGRESS` (1) | Allows to install either [traefik](../traefik/README.md) | `traefik` |
38+
| `KIND_INGRESS_READY` | Allows to disable `extraPortMappings` on ports 80 and 443 | `1` |
39+
| `DOCKERHUB_PROXY` | Allows to use a mirror for DockerHub. | `""` |
40+
| `KIND_OIDC_ISSUER_URL` (2) | Allows to enable OIDC authentication | `""` |
4141

4242
> (1) Note that `k8s-install.sh` must use the same value.
4343
> (2) Do not add useless "/" (`${KIND_OIDC_ISSUER_URL}/.well-known/openid-configuration` must exists)
@@ -78,4 +78,3 @@ bash kind/config/generate.sh
7878
* [kind.sigs.k8s.io - Setting Up An Ingress Controller](https://kind.sigs.k8s.io/docs/user/ingress/#setting-up-an-ingress-controller)
7979
* [config/ingress-ready.yaml](config/ingress-ready.yaml)
8080
* [traefik - Usage with Kind](../traefik/README.md#usage-with-kind)
81-
* [nginx-ingress-controller - Usage with Kind](../nginx-ingress-controller/README.md#usage-with-kind)

‎kind/quickstart.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ bash "${DEVBOX_DIR}/cert-manager/k8s-install.sh"
6060
# Install ingress controller
6161
#----------------------------------------------------------------------------------
6262
export DEVBOX_INGRESS=${DEVBOX_INGRESS:-traefik}
63-
if [ "$DEVBOX_INGRESS" != "traefik" ];
63+
if [ "$DEVBOX_INGRESS" == "traefik" ];
6464
then
65-
NGINX_MODE=kind bash "${DEVBOX_DIR}/nginx-ingress-controller/k8s-install.sh"
66-
else
6765
TRAEFIK_MODE=kind bash "${DEVBOX_DIR}/traefik/k8s-install.sh"
66+
else
67+
echo "skip traefik installation (DEVBOX_INGRESS=${DEVBOX_INGRESS})"
6868
fi
6969

7070
#----------------------------------------------------------------------------------

‎kubernetes-dashboard/k8s-install.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ metadata:
4040
name: kubernetes-dashboard
4141
annotations:
4242
cert-manager.io/cluster-issuer: "${DEVBOX_ISSUER}"
43-
nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
4443
traefik.ingress.kubernetes.io/service.serversscheme: https
4544
traefik.ingress.kubernetes.io/router.tls: "true"
4645
spec:

‎nginx-ingress-controller/README.md‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎nginx-ingress-controller/helm/kind.yml‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)