Skip to content

Commit 24c508a

Browse files
committed
fix: update ingress to match desired structure
- Updated version and appVersion for the main chart, backend, and frontend charts. - Removed deprecated external PostgreSQL configuration from values.yaml. - Adjusted ingress templates to reference the new structure for values.
1 parent 0698f86 commit 24c508a

File tree

6 files changed

+23
-27
lines changed

6 files changed

+23
-27
lines changed

helm/Chart.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: amazee-ai
22
description: A Helm Chart for amazee.ai with independent frontend and backend services
3-
version: 0.0.8
3+
version: 0.0.9
44
apiVersion: v2
5-
appVersion: "0.0.8"
5+
appVersion: "0.0.9"
66
keywords:
77
- amazee.ai
88
- frontend
@@ -15,10 +15,10 @@ dependencies:
1515
repository: https://charts.bitnami.com/bitnami
1616
condition: postgresql.enabled
1717
- name: backend
18-
version: 0.0.8
18+
version: 0.0.9
1919
condition: backend.enabled
2020
dependsOn:
2121
- postgresql
2222
- name: frontend
23-
version: 0.0.8
23+
version: 0.0.9
2424
condition: frontend.enabled

helm/charts/backend/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: backend
22
description: Backend API service for amazee.ai
3-
version: 0.0.8
3+
version: 0.0.9
44
apiVersion: v2
5-
appVersion: "0.0.8"
5+
appVersion: "0.0.9"
66
keywords:
77
- api
88
- fastapi

helm/charts/frontend/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: frontend
22
description: Frontend web application for amazee.ai
3-
version: 0.0.8
3+
version: 0.0.9
44
apiVersion: v2
5-
appVersion: "0.0.8"
5+
appVersion: "0.0.9"
66
keywords:
77
- frontend
88
- nextjs

helm/templates/frontend-ingress.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
{{- if .Values.frontendIngress.enabled -}}
1+
{{- if .Values.amazee-ai.frontendIngress.enabled -}}
22
apiVersion: networking.k8s.io/v1
33
kind: Ingress
44
metadata:
55
name: {{ include "amazee-ai.fullname" . }}-frontend
66
namespace: {{ .Release.Namespace }}
77
labels:
88
{{- include "amazee-ai.labels" . | nindent 4 }}
9-
{{- with .Values.frontendIngress.annotations }}
9+
{{- with .Values.amazee-ai.frontendIngress.annotations }}
1010
annotations:
1111
{{- toYaml . | nindent 4 }}
1212
{{- end }}
1313
spec:
14-
{{- if .Values.frontendIngress.className }}
15-
ingressClassName: {{ .Values.frontendIngress.className }}
14+
{{- if .Values.amazee-ai.frontendIngress.className }}
15+
ingressClassName: {{ .Values.amazee-ai.frontendIngress.className }}
1616
{{- end }}
17-
{{- if .Values.frontendIngress.tls }}
17+
{{- if .Values.amazee-ai.frontendIngress.tls }}
1818
tls:
19-
{{- range .Values.frontendIngress.tls }}
19+
{{- range .Values.amazee-ai.frontendIngress.tls }}
2020
- hosts:
2121
{{- range .hosts }}
2222
- {{ . | quote }}
@@ -25,7 +25,7 @@ spec:
2525
{{- end }}
2626
{{- end }}
2727
rules:
28-
{{- range .Values.frontendIngress.hosts }}
28+
{{- range .Values.amazee-ai.frontendIngress.hosts }}
2929
- host: {{ .host | quote }}
3030
http:
3131
paths:

helm/templates/ingress.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
{{- if .Values.ingress.enabled -}}
1+
{{- if .Values.amazee-ai.ingress.enabled -}}
22
apiVersion: networking.k8s.io/v1
33
kind: Ingress
44
metadata:
55
name: {{ include "amazee-ai.fullname" . }}-backend
66
namespace: {{ .Release.Namespace }}
77
labels:
88
{{- include "amazee-ai.labels" . | nindent 4 }}
9-
{{- with .Values.ingress.annotations }}
9+
{{- with .Values.amazee-ai.ingress.annotations }}
1010
annotations:
1111
{{- toYaml . | nindent 4 }}
1212
{{- end }}
1313
spec:
14-
{{- if .Values.ingress.className }}
15-
ingressClassName: {{ .Values.ingress.className }}
14+
{{- if .Values.amazee-ai.ingress.className }}
15+
ingressClassName: {{ .Values.amazee-ai.ingress.className }}
1616
{{- end }}
17-
{{- if .Values.ingress.tls }}
17+
{{- if .Values.amazee-ai.ingress.tls }}
1818
tls:
19-
{{- range .Values.ingress.tls }}
19+
{{- range .Values.amazee-ai.ingress.tls }}
2020
- hosts:
2121
{{- range .hosts }}
2222
- {{ . | quote }}
@@ -25,7 +25,7 @@ spec:
2525
{{- end }}
2626
{{- end }}
2727
rules:
28-
{{- range .Values.ingress.hosts }}
28+
{{- range .Values.amazee-ai.ingress.hosts }}
2929
- host: {{ .host | quote }}
3030
http:
3131
paths:

helm/values.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@ global:
77

88
# PostgreSQL configuration (using Bitnami chart)
99
postgresql:
10+
# Set to false to use external managed PostgreSQL
1011
enabled: true
11-
# Set to true to use external managed PostgreSQL
12-
external:
13-
enabled: false
14-
url: "postgresql://user:password@host:port/database"
15-
# Self-hosted PostgreSQL configuration (used when external.enabled = false)
1612
auth:
1713
postgresPassword: "postgres"
1814
database: "postgres_service"

0 commit comments

Comments
 (0)