fixed some name issues

charts/lightcurve/templates/configmap.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "service.fullname" . }}
+  name: {{ include "service.name" . }}
   namespace: {{ .Values.namespace }}
 data:
   port: '{{ .Values.configmap.port }}'
@@ -11,25 +11,26 @@ data:
 ---
 apiVersion: v1
 metadata:
-  name: lightcurve-nginx-conf
+  name: {{ include "service.name" . }}-nginx-conf
   namespace: {{ .Values.namespace }}
 data:
+  default.conf: '{{ .Values.configmap.nginxConf }}'
   default.conf: |
     server {
       listen 80;
 
-      location /v2/lightcurve/ {
+      location {{ .Values.ingress.path }}/ {
         proxy_pass http://localhost:8000/;
         proxy_redirect off;
-        proxy_set_header X-Forwarded-Prefix /v2/lightcurve/;
+        proxy_set_header X-Forwarded-Prefix {{ .Values.ingress.path }}/;
         proxy_set_header Host $http_host;
         proxy_set_header X-Forwarded-Host $http_host;
       }
 
-      location /v2/lightcurve {
+      location {{ .Values.ingress.path }} {
         proxy_pass http://localhost:8000/;
         proxy_redirect off;
-        proxy_set_header X-Forwarded-Prefix /v2/lightcurve;
+        proxy_set_header X-Forwarded-Prefix {{ .Values.ingress.path }};
         proxy_set_header Host $http_host;
         proxy_set_header X-Forwarded-Host $http_host;
       }

charts/lightcurve/templates/deployment.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "service.fullname" . }}
+  name: {{ include "service.name" . }}
   namespace: {{ .Values.namespace }}
   labels:
     {{- include "service.labels" . | nindent 4 }}
@@ -35,17 +35,17 @@ spec:
             - name: PORT
               valueFrom:
                 configMapKeyRef:
-                  name: {{ include "service.fullname" . }}
+                  name: {{ include "service.name" . }}
                   key: port
             - name: API_URL
               valueFrom:
                 configMapKeyRef:
-                  name: {{ include "service.fullname" . }}
+                  name: {{ include "service.name" . }}
                   key: api-url
             - name: SERVICE
               valueFrom:
                 configMapKeyRef:
-                  name: {{ include "service.fullname" . }}
+                  name: {{ include "service.name" . }}
                   key: service
             - name: PSQL_HOST
               valueFrom:
@@ -122,7 +122,7 @@ spec:
       volumes:
         - name: nginx-conf
           configMap:
-            name: lightcurve-nginx-conf
+            name: {{ include "service.name" . }}-nginx-conf
             items:
               - key: "default.conf"
                 path: "default.conf"

charts/lightcurve/templates/hpa.yaml

@@ -2,15 +2,15 @@
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ include "service.fullname" . }}
+  name: {{ include "service.name" . }}
   namespace: {{ .Values.namespace }}
   labels:
     {{- include "service.labels" . | nindent 4 }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: {{ include "service.fullname" . }}
+    name: {{ include "service.name" . }}
   minReplicas: {{ .Values.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}
   metrics:

charts/lightcurve/templates/ingress.yaml

@@ -16,10 +16,10 @@ spec:
     - host: {{ .Values.ingress.host }}
       http:
         paths:
-          - path: /v2/lightcurve
+          - path: {{ .Values.ingress.path }}
             pathType: Prefix
             backend:
               service:
-                name: lightcurve
+                name: {{ include "service.name" . }}
                 port:
                   number: {{ .Values.service.port }}

charts/lightcurve/templates/service.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "service.fullname" . }}
+  name: {{ include "service.name" . }}
   namespace: {{ .Values.namespace }}
   labels:
     {{- include "service.labels" . | nindent 4 }}

charts/lightcurve/values.yaml

@@ -54,6 +54,7 @@ ingress:
   host: ""
   k8sGroupName: ""
   k8sTags: ""
+  path: "" # path without end /
 
 secrets:
   secretKey: ""