From fe7dc622eae0b019f513500b2c9e75548cc8cc01 Mon Sep 17 00:00:00 2001 From: ranchodeluxe Date: Tue, 18 Jul 2023 08:35:59 -0700 Subject: [PATCH 1/4] more explicit nginx docs --- README.md | 5 ++++- docs/aws-eks.md | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f317e2ce..a5d01671 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,10 @@ Once you have a k8s cluster set up you can `helm install` eoAPI as follows POSTGRES_PASSWORD: "password" # then run `helm install` with those overrides - helm install eoapi eoapi/eoapi --version 0.1.1 -f config.yaml + # NOTE: nginx in the default ingress so if you are using that make sure your nginx controller + # is in the same namespace beforehand or services won't be exposed + # https://github.com/developmentseed/eoapi-k8s/blob/main/docs/aws-eks.md#nginx-ingress + $ helm install eoapi --create-namespace eoapi/eoapi --version 0.1.2 -f config.yaml ``` diff --git a/docs/aws-eks.md b/docs/aws-eks.md index 2fba654b..e4103fe4 100644 --- a/docs/aws-eks.md +++ b/docs/aws-eks.md @@ -211,10 +211,10 @@ aws-load-balancer-controller 2/2 2 2 36d Please look through the [Nginx Docs](https://docs.nginx.com/nginx-ingress-controller/) to verify nothing has changed below. There are multiple ways to provision and configure. Below is the simplest we found: ```python -helm upgrade \ - --cleanup-on-fail \ - -i nginx \ - ingress-nginx/ingress-nginx \ +$ helm repo add nginx https://helm.nginx.com/stable +$ helm install \ + nginx \ + nginx/nginx-ingress \ --set controller.service.type=LoadBalancer \ # these next two annotations are the most important otherwise nginx controller will create an "internal" NLB --set controller.service.annotations."service\.beta\.kubernetes\.io/aws-load-balancer-type"="nlb" \ From d5908f80ee1429a39e82c7ce699ed7105d6b3916 Mon Sep 17 00:00:00 2001 From: ranchodeluxe Date: Tue, 18 Jul 2023 10:08:28 -0700 Subject: [PATCH 2/4] moar --- README.md | 2 +- docs/aws-eks.md | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a5d01671..4d7ad8b3 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ Once you have a k8s cluster set up you can `helm install` eoAPI as follows # NOTE: nginx in the default ingress so if you are using that make sure your nginx controller # is in the same namespace beforehand or services won't be exposed # https://github.com/developmentseed/eoapi-k8s/blob/main/docs/aws-eks.md#nginx-ingress - $ helm install eoapi --create-namespace eoapi/eoapi --version 0.1.2 -f config.yaml + $ helm install -n eoapi --create-namespace eoapi eoapi/eoapi --version 0.1.2 -f config.yaml ``` diff --git a/docs/aws-eks.md b/docs/aws-eks.md index e4103fe4..ce26adef 100644 --- a/docs/aws-eks.md +++ b/docs/aws-eks.md @@ -211,13 +211,13 @@ aws-load-balancer-controller 2/2 2 2 36d Please look through the [Nginx Docs](https://docs.nginx.com/nginx-ingress-controller/) to verify nothing has changed below. There are multiple ways to provision and configure. Below is the simplest we found: ```python -$ helm repo add nginx https://helm.nginx.com/stable -$ helm install \ - nginx \ - nginx/nginx-ingress \ - --set controller.service.type=LoadBalancer \ +$ helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx +$ helm upgrade \ + -i ingress-nginx \ + ingress-nginx/ingress-nginx \ + --set controller.service.type=LoadBalancer # these next two annotations are the most important otherwise nginx controller will create an "internal" NLB - --set controller.service.annotations."service\.beta\.kubernetes\.io/aws-load-balancer-type"="nlb" \ + --set controller.service.annotations."service\.beta\.kubernetes\.io/aws-load-balancer-type"="nlb" \ --set controller.service.annotations."service\.beta\.kubernetes\.io/aws-load-balancer-scheme"="internet-facing" \ --namespace ``` From 0747078dd220a07c150c8bc6ffbbbdab71e9a68c Mon Sep 17 00:00:00 2001 From: ranchodeluxe Date: Tue, 18 Jul 2023 10:12:50 -0700 Subject: [PATCH 3/4] update link --- docs/aws-eks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/aws-eks.md b/docs/aws-eks.md index ce26adef..75fd930e 100644 --- a/docs/aws-eks.md +++ b/docs/aws-eks.md @@ -208,7 +208,7 @@ aws-load-balancer-controller 2/2 2 2 36d ## Install Nginx Ingress Controller -Please look through the [Nginx Docs](https://docs.nginx.com/nginx-ingress-controller/) to verify nothing has changed below. There are multiple ways to provision and configure. Below is the simplest we found: +Please look through the [Nginx Docs](https://github.com/kubernetes/ingress-nginx) to verify nothing has changed below. There are multiple ways to provision and configure. Below is the simplest we found: ```python $ helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx From 7f396ce1b3eebb7127e4539764537105b83dfcd5 Mon Sep 17 00:00:00 2001 From: ranchodeluxe Date: Tue, 18 Jul 2023 10:17:59 -0700 Subject: [PATCH 4/4] update badge branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4d7ad8b3..d9636773 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

- Test + Test Downloads