Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 37 additions & 0 deletions helm/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{{- define "app.labels" -}}
app: {{ .Chart.Name }}
component: gpt-app
{{- end -}}

{{- define "app.deploymentName" -}}
{{ .Release.Name }}-app-deployment
{{- end -}}

{{- define "app.serviceName" -}}
{{ .Release.Name }}-app-service
{{- end -}}

{{- define "app.secretName" -}}
{{ .Release.Name }}-app-secret
{{- end -}}

{{- define "app.ingressName" -}}
{{ .Release.Name }}-app-ingress
{{- end -}}

{{- define "web.labels" -}}
app: {{ .Chart.Name }}
component: gpt-web
{{- end -}}

{{- define "web.deploymentName" -}}
{{ .Release.Name }}-web-deployment
{{- end -}}

{{- define "web.serviceName" -}}
{{ .Release.Name }}-web-service
{{- end -}}

{{- define "web.ingressName" -}}
{{ .Release.Name }}-web-ingress
{{- end -}}
17 changes: 0 additions & 17 deletions helm/templates/app/_helpers.tpl

This file was deleted.

19 changes: 19 additions & 0 deletions helm/templates/app/ingress.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{{- if .Values.ingress.enabled }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ include "app.ingressName" . }}
spec:
ingressClassName: {{ .Values.ingress.ingressClassName }}
rules:
- host: {{ .Values.ingress.host }}
http:
paths:
- path: /api
pathType: Prefix
backend:
service:
name: {{ include "app.serviceName" . }}
port:
number: {{ .Values.app.service.port }}
{{- end }}
3 changes: 0 additions & 3 deletions helm/templates/app/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,5 @@ spec:
- port: {{ .Values.app.service.port }}
targetPort: {{ .Values.app.service.targetPort }}
protocol: {{ .Values.app.service.protocol }}
{{- if eq .Values.app.service.type "NodePort" }}
nodePort: {{ .Values.app.service.nodePort }}
{{- end }}
selector:
{{- include "app.labels" . | nindent 4 }}
28 changes: 28 additions & 0 deletions helm/templates/web/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "web.deploymentName" . }}
labels:
{{- include "web.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.web.replicaCount }}
selector:
matchLabels:
{{- include "web.labels" . | nindent 8 }}
template:
metadata:
labels:
{{- include "web.labels" . | nindent 8 }}
spec:
containers:
- name: {{ include "web.deploymentName" . }}
image: {{ .Values.web.image.repository }}:{{ .Values.web.image.tag }}
ports:
- containerPort: {{ .Values.web.service.targetPort }}
{{- if .Values.web.nodeSelector }}
nodeSelector: {{ .Values.web.nodeSelector | toYaml | nindent 8 }}
{{- end }}

{{- if .Values.web.affinity }}
affinity: {{ .Values.web.affinity | toYaml | nindent 8 }}
{{- end }}
19 changes: 19 additions & 0 deletions helm/templates/web/ingress.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{{- if .Values.ingress.enabled }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ include "web.ingressName" . }}
spec:
ingressClassName: {{ .Values.ingress.ingressClassName }}
rules:
- host: {{ .Values.ingress.host }}
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: {{ include "web.serviceName" . }}
port:
number: {{ .Values.web.service.port }}
{{- end }}
17 changes: 17 additions & 0 deletions helm/templates/web/service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "web.serviceName" . }}
labels:
{{- include "web.labels" . | nindent 4 }}
spec:
type: {{ .Values.web.service.type }}
ports:
- port: {{ .Values.web.service.port }}
targetPort: {{ .Values.web.service.targetPort }}
protocol: {{ .Values.web.service.protocol }}
{{- if eq .Values.web.service.type "NodePort" }}
nodePort: {{ .Values.web.service.nodePort }}
{{- end }}
selector:
{{- include "web.labels" . | nindent 4 }}
22 changes: 20 additions & 2 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,29 @@ app:
tag: latest
service:
type: ClusterIP
port: 80
port: 8080
targetPort: 8080
protocol: TCP
nodePort: 30080
environment:
OPENAI_API_KEY: ""
nodeSelector: {}
affinity: {}

web:
replicaCount: 1
image:
repository: 81318131/web_gpt
tag: kubernetes-local
service:
type: ClusterIP
port: 80
targetPort: 4173
protocol: TCP
nodePort: 30080
nodeSelector: {}
affinity: {}

ingress:
enabled: true
host: "devopsgpt.local"
ingressClassName: "nginx"
Loading