diff --git a/charts/navix-helm/templates/backend-ingress.yaml b/charts/navix-helm/templates/backend-ingress.yaml deleted file mode 100644 index 8634ea5..0000000 --- a/charts/navix-helm/templates/backend-ingress.yaml +++ /dev/null @@ -1,25 +0,0 @@ -{{- if .Values.backend.ingress.enabled }} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: navix-backend - annotations: - {{- range $key, $value := .Values.backend.ingress.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} -spec: - ingressClassName: {{ .Values.backend.ingress.className }} - rules: - {{- range .Values.backend.ingress.hosts }} - - host: {{ .host }} - http: - paths: - - path: /api - pathType: Prefix - backend: - service: - name: navix-backend - port: - number: {{ $.Values.backend.service.port }} - {{- end }} -{{- end }} diff --git a/charts/navix-helm/templates/env-configmap.yaml b/charts/navix-helm/templates/env-configmap.yaml new file mode 100644 index 0000000..afc939e --- /dev/null +++ b/charts/navix-helm/templates/env-configmap.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: navix-frontend-env +data: + env.js: | + window.ENV = { + API_BASE: "{{ .Values.frontend.env.API_BASE }}", + MINIO_ENDPOINT: "{{ .Values.frontend.env.MINIO_ENDPOINT }}", + MINIO_BUCKET: "{{ .Values.frontend.env.MINIO_BUCKET }}" + }; diff --git a/charts/navix-helm/templates/frontend-env-configmap.yaml b/charts/navix-helm/templates/frontend-env-configmap.yaml deleted file mode 100644 index a4faaf6..0000000 --- a/charts/navix-helm/templates/frontend-env-configmap.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: navix-frontend-env -data: - env.js: | - window.env = { - VITE_API_URL: "{{ .Values.frontend.env.VITE_API_URL }}" - }; diff --git a/charts/navix-helm/templates/frontend-ingress.yaml b/charts/navix-helm/templates/frontend-ingress.yaml deleted file mode 100644 index b1d61d4..0000000 --- a/charts/navix-helm/templates/frontend-ingress.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{{- if .Values.frontend.ingress.enabled }} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: navix-frontend - annotations: - {{- range $key, $value := .Values.frontend.ingress.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} -spec: - ingressClassName: {{ .Values.frontend.ingress.className }} - rules: - {{- range .Values.frontend.ingress.hosts }} - - host: {{ .host }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - pathType: {{ .pathType }} - backend: - service: - name: navix-frontend - port: - number: {{ $.Values.frontend.service.port }} - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/navix-helm/templates/ingress.yaml b/charts/navix-helm/templates/ingress.yaml new file mode 100644 index 0000000..6f721aa --- /dev/null +++ b/charts/navix-helm/templates/ingress.yaml @@ -0,0 +1,49 @@ +{{- if .Values.frontend.ingress.enabled }} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: navix-frontend + annotations: + {{- range $key, $value := .Values.frontend.ingress.annotations }} + {{ $key }}: {{ $value | quote }} + {{- end }} +spec: + ingressClassName: {{ .Values.frontend.ingress.className }} + rules: + - host: {{ .Values.frontend.ingress.hosts[0].host }} + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: navix-frontend + port: + number: {{ .Values.frontend.service.port }} +{{- end }} + +--- + +{{- if .Values.backend.ingress.enabled }} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: navix-backend + annotations: + {{- range $key, $value := .Values.backend.ingress.annotations }} + {{ $key }}: {{ $value | quote }} + {{- end }} +spec: + ingressClassName: {{ .Values.backend.ingress.className }} + rules: + - host: {{ .Values.backend.ingress.hosts[0].host }} + http: + paths: + - path: /api + pathType: Prefix + backend: + service: + name: navix-backend + port: + number: {{ .Values.backend.service.port }} +{{- end }} \ No newline at end of file diff --git a/charts/navix-helm/values.yaml b/charts/navix-helm/values.yaml index f97bd25..0e67780 100644 --- a/charts/navix-helm/values.yaml +++ b/charts/navix-helm/values.yaml @@ -18,7 +18,9 @@ frontend: - path: / pathType: Prefix env: - VITE_API_URL: "/api" + API_BASE: "https://navix.dvirlabs.com/api" + MINIO_ENDPOINT: "s3.dvirlabs.com" + MINIO_BUCKET: "navix-icons" backend: image: