diff --git a/helm-chart/eoapi/CHANGELOG.md b/helm-chart/eoapi/CHANGELOG.md new file mode 100644 index 00000000..1e120d48 --- /dev/null +++ b/helm-chart/eoapi/CHANGELOG.md @@ -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 diff --git a/helm-chart/eoapi/Chart.yaml b/helm-chart/eoapi/Chart.yaml index 10fadc15..fddfa12f 100644 --- a/helm-chart/eoapi/Chart.yaml +++ b/helm-chart/eoapi/Chart.yaml @@ -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" diff --git a/helm-chart/eoapi/templates/services/ingress-nginx.yaml b/helm-chart/eoapi/templates/services/ingress-nginx.yaml index 3bc1fe94..bc4af9d4 100644 --- a/helm-chart/eoapi/templates/services/ingress-nginx.yaml +++ b/helm-chart/eoapi/templates/services/ingress-nginx.yaml @@ -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 }} \ No newline at end of file diff --git a/helm-chart/eoapi/templates/services/nginx-doc-server.yaml b/helm-chart/eoapi/templates/services/nginx-doc-server.yaml new file mode 100644 index 00000000..e13737ac --- /dev/null +++ b/helm-chart/eoapi/templates/services/nginx-doc-server.yaml @@ -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: | + +
+Your service configuration is using ingress-nginx with path rewrites. So use these paths for each service:
+ + + +--- +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 }} \ No newline at end of file