Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/helm-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- run: |
cd helm-chart
helm unittest eoapi -f 'tests/*.yaml' -v eoapi/test-helm-values.yaml
unit-tests:
integration-tests:
if: github.event.pull_request.head.repo.full_name == github.repository
permissions:
contents: 'read'
Expand Down
13 changes: 0 additions & 13 deletions docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,6 @@ Here's a simplified high-level diagram to grok:

## Additional Options

### Key `ingress.className`

| **Values Key** | **Description** | **Default** | **Choices** |
|:-----------------|:-----------------------------------------------------------------------------------------------------------------------------------------------|:-----------|:--------------|
| `ingress.className` | used as switch in helm templates for specific<br>functionality regarding `kind: Ingress` and cloud-provider<br>specific load balancing options | nginx | nginx<br>alb<br>gce<br> |

#### Given `ingress.className=nginx`
![](./images/default_architecture.png)


#### Given `ingress.className=alb||gce`
![](./images/alb_architecture.png)

---

### Key `autoscaling`
Expand Down
6 changes: 5 additions & 1 deletion helm-chart/eoapi/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
version numbers below correspond to helm chart `appVersion`: see `./helm-chart/eoapi/Chart.yaml`
---
### 0.2.11 (2024-01-19)
### 0.3.1 (2024-01-19)

* removed support for having anything but `ingresss.className=='nginx'`

### 0.2.11 (2024-01-18)

* added `ingress.annotations` key to pass through to the nginx ingress -- thanks @ghelobytes
* upgraded titiler/pgstac/tipg images and integration tests -- thanks @vincentsarago
Expand Down
4 changes: 2 additions & 2 deletions helm-chart/eoapi/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ kubeVersion: ">=1.23.0-0"
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: "0.1.13"
version: "0.2.14"

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.2.11"
appVersion: "0.3.1"
44 changes: 0 additions & 44 deletions helm-chart/eoapi/templates/services/ingress-alb.yaml

This file was deleted.

42 changes: 0 additions & 42 deletions helm-chart/eoapi/templates/services/ingress-gce.yaml

This file was deleted.

4 changes: 1 addition & 3 deletions helm-chart/eoapi/templates/services/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ metadata:
name: {{ $serviceName }}
{{- end }}
spec:
{{- if (and ($.Values.ingress.className) (eq $.Values.ingress.className "alb")) }}
type: "NodePort"
{{- else if (and ($.Values.ingress.className) (eq $.Values.ingress.className "nginx")) }}
{{- if (and ($.Values.ingress.className) (eq $.Values.ingress.className "nginx")) }}
type: "ClusterIP"
{{- else }}
type: "NodePort"
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/eoapi/test-helm-values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# this file is used with `helm-tests` job in CI
providerContext: "aws"

ingress:
className: "nginx"
enabled: true

db:
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/eoapi/test-unittest-values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# used in GH Actions `.github/workflows/helm-tests.yml.jobs.unit-tests`
# used in GH Actions `.github/workflows/helm-tests.yml.jobs.integration-tests`
testing: true
ingress:
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/eoapi/tests/hpa_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ tests:
raster.enabled: false
stac.enabled: false
vector.enabled: true
ingress.className: "gce"
ingress.className: "testing123"
vector.autoscaling.enabled: true
asserts:
- failedTemplate:
Expand Down
64 changes: 0 additions & 64 deletions helm-chart/eoapi/tests/ingress_tests_alb.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion helm-chart/eoapi/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"properties": {
"className": {
"type": "string",
"pattern": "^(alb|nginx|gce|testing123)$"
"pattern": "^(nginx|testing123)$"
}
}
},
Expand Down
4 changes: 1 addition & 3 deletions helm-chart/eoapi/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ service:
port: 8080

ingress:
# `ingress.className`: "alb" || "gce" || "nginx"
# `"alb || gce"` will create a `kind:Service` with `spec.port:'NodePort'` and ALBs for each service
# `"nginx"` will create a `kind:Service` with a `spec.port:ClusterIP` and a single NLB and path rewrites for /vector, /stac, /raster
# `"nginx"` will create a `kind:Service` with a `spec.port:ClusterIP` and a single (A||N)LB and path rewrites for /vector, /stac, /raster
enabled: true
className: "nginx"
host: ""
Expand Down