Skip to content

root path HTML #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 22, 2023
Merged

root path HTML #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f57bed
root path HTML
Jul 22, 2023
9c47c9f
break out separately so tests don't fail
Jul 22, 2023
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
9 changes: 9 additions & 0 deletions helm-chart/eoapi/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version numbers below correspond to helm chart `appVersion`: see ./helm-chart/eoapi/Chart.yaml
---
# 0.1.1 (2023-07-21)

* For the shared-nginx ingress option [add root path with docs](https://github.com/developmentseed/eoapi-k8s/issues/18) pointing to path rewrites

# 0.1.0 (2023-07-01)

* Adds basic AWS EKS services with ALB and NLB options
4 changes: 2 additions & 2 deletions helm-chart/eoapi/Chart.yaml
View file
Open in desktop
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.2"
version: "0.1.3"

# 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.1.0"
appVersion: "0.1.1"
9 changes: 8 additions & 1 deletion helm-chart/eoapi/templates/services/ingress-nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ spec:
{{- end }}{{/* END: if index $v "enabled" */}}
{{- end }}{{/* END: if (or (eq $serviceName "raster") (eq $serviceName "stac") (eq $serviceName "vector")) */}}
{{- end }}{{/* END: range $serviceName, $v := .Values*/}}
- pathType: Prefix
path: /(/|$)
backend:
service:
name: doc-server
port:
number: 80
---
{{/* END: if .Values.ingress.className "alb" */}}
{{/* END: if .Values.ingress.className "nginx" */}}
{{- end }}
62 changes: 62 additions & 0 deletions helm-chart/eoapi/templates/services/nginx-doc-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{{- if (and (.Values.ingress.className) (eq .Values.ingress.className "nginx")) }}
apiVersion: v1
kind: ConfigMap
metadata:
name: nginx-root-html
data:
index.html: |
<html>
<head>
<title>eoAPI</title>
</head>
<body>
<h2>This is the root path /</h2>
<p>Your service configuration is using ingress-nginx with path rewrites. So use these paths for each service:</p>
<ul>
<li><a href="/raster" target="_blank" rel="noopener noreferrer">/raster</a></li>
<li><a href="/vector" target="_blank" rel="noopener noreferrer">/vector</a></li>
<li><a href="/stac" target="_blank" rel="noopener noreferrer">/stac</a></li>
</ul>
</body>
</html>
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: doc-server
spec:
replicas: 1
selector:
matchLabels:
app: doc-server
template:
metadata:
labels:
app: doc-server
spec:
containers:
- name: doc-server
image: nginx:alpine
volumeMounts:
- name: doc-html
mountPath: /usr/share/nginx/html
ports:
- containerPort: 80
volumes:
- name: doc-html
configMap:
name: nginx-root-html
---
apiVersion: v1
kind: Service
metadata:
name: doc-server
spec:
selector:
app: doc-server
ports:
- protocol: TCP
port: 80
targetPort: 80
---
{{- end }}